diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-21 14:44:37 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-21 14:44:37 -0300 |
| commit | 9d6dd0a34cb8bd599c4d06c54dbd247ede60267f (patch) | |
| tree | cc7662c9e2eda6f7e3b3b0fb3b7c094e4fa54d0b | |
| parent | fe0996f2e8716b772785a0bf93c6a3f2d5dc22ff (diff) | |
| parent | 70b4878648fd376433739bd5c835503f6301a5b2 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/avifile/PKGBUILD
community/blackbox/PKGBUILD
community/blobby2/PKGBUILD
community/chmsee/PKGBUILD
community/extrema/PKGBUILD
community/floyd/PKGBUILD
community/gnash/PKGBUILD
community/gq/PKGBUILD
community/gsql/PKGBUILD
community/haddock/PKGBUILD
community/hashcash/PKGBUILD
community/kvpnc/PKGBUILD
community/uptimed/PKGBUILD
community/wol/PKGBUILD
core/jfsutils/PKGBUILD
core/reiserfsprogs/PKGBUILD
extra/gtk2/PKGBUILD
extra/libcroco/PKGBUILD
extra/libffado/PKGBUILD
extra/librsvg/PKGBUILD
extra/lua/PKGBUILD
extra/mesa/PKGBUILD
extra/valgrind/PKGBUILD
extra/xorg-server/PKGBUILD
libre/audacious-plugins-libre/PKGBUILD
libre/texlive-bin-libre/PKGBUILD
multilib/lib32-gtk2/PKGBUILD
multilib/lib32-mesa/PKGBUILD
multilib/wine/PKGBUILD
multilib/wine_gecko/PKGBUILD
282 files changed, 9373 insertions, 1031 deletions
diff --git a/community-staging/sage-mathematics/PKGBUILD b/community-staging/sage-mathematics/PKGBUILD new file mode 100644 index 000000000..d240ce248 --- /dev/null +++ b/community-staging/sage-mathematics/PKGBUILD @@ -0,0 +1,105 @@ +# Maintainer: Thomas Dziedzic < gostrc at gmail > +# Contributor: Osman Ugus <ugus11@yahoo.com> +# Contributor: Stefan Husmann <stefan-husmann@t-online.de> +# Special thanks to Nareto for moving the compile from the .install to the PKGBUILD + +pkgname=sage-mathematics +pkgver=4.7.2 +pkgrel=2 +pkgdesc='SAGE: Open Source Mathematics Software, a viable free alternative to Magma, Maple, Mathematica, and Matlab.' +url='http://www.sagemath.org' +arch=('i686' 'x86_64') +license=('GPL') +#depends=('readline') +depends=('ppl') +makedepends=('gcc-fortran' 'gcc-libs' 'desktop-file-utils' 'imagemagick' 'texlive-core') +optdepends=('imagemagick: some plotting functionality benefits from it' + 'texlive-core: some plotting functionality benefits from it, also to use SageTeX' + 'sage-mathematics-spkgs: original packages used to build additional packages') +options=('!makeflags') +install="${pkgname}.install" +source=("http://sage.math.washington.edu/home/release/sage-${pkgver}/sage-${pkgver}.tar" + 'SAGE-notebook.desktop') +md5sums=('b3073997e6c7ec00a269f84ff2e54973' + 'dc391f12b7d17dd37326343ec0e99bbd') + +build() { + cd sage-${pkgver} + + # modularization of sage, sort of :) + # fixes the following error: + # bash: symbol lookup error: bash: undefined symbol: rl_filename_rewrite_hook + # remove this hack when sage uses a readline 6.1 or greater, or when sage uses its own internal bash + # this is for people who have custom kernels (sage works this around by checking uname -r) + #mkdir -p spkg/installed + #touch spkg/installed/readline-6.1 + mkdir -p spkg/installed + touch spkg/installed/ppl-0.11.2 + + # fix "missing sage.all error" during build + unset CFLAGS + unset CXXFLAGS + + # fix build errors + unset LDFLAGS + + # enable multiple threads while building, is this really needed? check if uses MAKEFLAGS + export SAGE_BUILD_THREADS=$(lscpu | awk '/^CPU\(s\):/ { print $2 }') + export MAKE="make -j${SAGE_BUILD_THREADS}" + + # use archlinux's fortran rather then the one that ships with sage to compile sage's fortran + export SAGE_FORTRAN='/usr/bin/gfortran' + export SAGE_FORTRAN_LIB='/usr/lib/libgfortran.so' + + # disable building with debugging support + export SAGE_DEBUG='no' + + # enable fat binaries (disables processor specific optimizations) + # comment out if you're only building it for yourself + export SAGE_FAT_BINARY='yes' + + # can't write to root in a clean chroot + export DOT_SAGE='/build/src/' + + # only build sage, no documents + #make build + make +} + +<< COMMENT +check() { + cd sage-${pkgver} + + # uncomment if we want to run all the tests (warning: very long) + #make ptestlong +} +COMMENT + +package() { + cd sage-${pkgver} + + # cp because make install is experimental and will corrupt the install + install -d ${pkgdir}/opt/sage + cp -r * ${pkgdir}/opt/sage + + # move SageTeX files to more appropriate directory + install -d ${pkgdir}/usr/share + mv ${pkgdir}/opt/sage/local/share/texmf \ + ${pkgdir}/usr/share + + desktop-file-install ${srcdir}/SAGE-notebook.desktop \ + --dir ${pkgdir}/usr/share/applications + + # create link to main binary + install -d ${pkgdir}/usr/bin + ln -s /opt/sage/sage ${pkgdir}/usr/bin/sage + + # remove build logs + rm -f ${pkgdir}/opt/sage/install.log + rm -rf ${pkgdir}/opt/sage/spkg/logs + + # remove source packages, since they are rarely needed, they are 300mb in size (compressed) + # no need to package them together, put into sage-mathematics-spkgs + rm -f ${pkgdir}/opt/sage/spkg/base/*spkg + rm -f ${pkgdir}/opt/sage/spkg/standard/*spkg +} diff --git a/community-staging/sage-mathematics/SAGE-notebook.desktop b/community-staging/sage-mathematics/SAGE-notebook.desktop new file mode 100644 index 000000000..26a35d3ac --- /dev/null +++ b/community-staging/sage-mathematics/SAGE-notebook.desktop @@ -0,0 +1,19 @@ +[Desktop Entry] +Version=1.0 +Name=SAGE +Comment=SAGE NOTEBOOK +Comment[en_US]=SAGE NOTEBOOK +Exec=/opt/sage/sage -notebook +GenericName= +GenericName[de]= +Icon=/opt/sage/data/extcode/notebook/images/sageicon.png +MimeType= +Name[de]=SAGE +StartupNotify=true +Terminal=true +Type=Application +Categories=Science;Math; +X-DCOP-ServiceType= +X-KDE-SubstituteUID=false +X-KDE-Username= +GenericName[en_US]= diff --git a/community-staging/sage-mathematics/sage-mathematics.install b/community-staging/sage-mathematics/sage-mathematics.install new file mode 100644 index 000000000..6caa5299e --- /dev/null +++ b/community-staging/sage-mathematics/sage-mathematics.install @@ -0,0 +1,56 @@ +post_install() { + cd /opt/sage + + # set HOME because when sage updates its sage_root (after being moved) it will write files to ~/.sage with root ownership + # the files it writes to ~/.sage can be safely ignored + HOME=/tmp ./sage -c + + # add sagemath user for the daemon + useradd -r -c 'Sage daemon' -d /opt/sage -s /bin/false sagemath + + # Update LaTeX db to point to SageTeX + if [ -f /usr/bin/texhash ]; then + /usr/bin/texhash /usr/share/texmf + else + echo 'Warning: could not find /usr/bin/texhash' + echo 'SageTeX has been installed but you need to run:' + echo '# texhash /usr/share/texmf' + echo 'So that LaTeX will be able to find it.' + fi + +echo ' + ___ +/ (_) o | +\__ _ _ __ | +/ / |/ | | / \_| | | +\___/ | |_/|/\__/ \_/|/o + /| /| + \| \| + ________________________________ +< sage-mathematics, I mean, MOO! > + -------------------------------- + \ ^__^ + \ (oo)\_______ + (__)\ )\/\ + ||----w | + || || +' + +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + # Update LaTeX db to remove SageTeX entries + if [ -f /usr/bin/texhash ]; then + /usr/bin/texhash /usr/share/texmf + fi + + # remove the sagemath daemon user + userdel sagemath + + # clean up left overs + rm -rf /opt/sage +} diff --git a/community-testing/qtcreator/PKGBUILD b/community-testing/qtcreator/PKGBUILD new file mode 100644 index 000000000..1c0271947 --- /dev/null +++ b/community-testing/qtcreator/PKGBUILD @@ -0,0 +1,52 @@ +# $Id: PKGBUILD 58646 2011-11-17 02:49:13Z svenstaro $ +# Maintainer: Imanol Celaya <ornitorrincos@archlinux-es.org> +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com> +# Contributor: Dan Vratil <progdan@progdansoft.com> +# Contributor: thotypous <matiasΘarchlinux-br·org> +# Contributor: delor <bartekpiech gmail com> + +pkgname="qtcreator" +pkgver=2.4.0rc +_pkgver=2.4.0-rc +pkgrel=1 +pkgdesc='Lightweight, cross-platform integrated development environment' +arch=('i686' 'x86_64') +url='http://qt.nokia.com/products/developer-tools' +license=('LGPL') +depends=('qt>=4.7.4') +makedepends=('qt-private-headers>=4.7.4' 'git') +options=('docs') +install=qtcreator.install +source=("http://get.qt.nokia.com/qtcreator/qt-creator-${_pkgver}-src.tar.gz" + 'qtcreator.desktop') +md5sums=('1967144101796674ce6e994e66213f81' + 'f1f4680b9838ff0b8f4cf11eb850d662') + +build() { + cd ${srcdir} + [[ -d build ]] && rm -r build + mkdir build && cd build + + qmake ${srcdir}/qt-creator-${_pkgver}-src/qtcreator.pro + make +} + +package() { + optdepends=('qt-doc: for the integrated Qt documentation' + 'gdb: for the debugger' + 'cmake: for cmake project suppport' + 'openssh-askpass: for ssh support' + 'git: for git support' + 'mercurial: for mercurial support' + 'bzr: for bazaar support') + + cd ${srcdir}/build + + make INSTALL_ROOT="${pkgdir}/usr/" install + + install -Dm644 ${srcdir}/qtcreator.desktop \ + ${pkgdir}/usr/share/applications/qtcreator.desktop + install -Dm644 ${srcdir}/qt-creator-${_pkgver}-src/LGPL_EXCEPTION.TXT \ + ${pkgdir}/usr/share/licenses/qtcreator/LGPL_EXCEPTION.TXT +} diff --git a/community-testing/qtcreator/qtcreator.desktop b/community-testing/qtcreator/qtcreator.desktop new file mode 100644 index 000000000..0fd562bd9 --- /dev/null +++ b/community-testing/qtcreator/qtcreator.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Encoding=UTF-8 +Exec=/usr/bin/qtcreator +Name=Qt-Creator +GenericName=C++ IDE +X-KDE-StartupNotify=true +Icon=/usr/share/icons/hicolor/128x128/apps/qtcreator.png +Terminal=false +Type=Application +Categories=Qt;Development diff --git a/community-testing/qtcreator/qtcreator.install b/community-testing/qtcreator/qtcreator.install new file mode 100644 index 000000000..4d4a283db --- /dev/null +++ b/community-testing/qtcreator/qtcreator.install @@ -0,0 +1,12 @@ +post_install() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/aspell-pl/PKGBUILD b/community/aspell-pl/PKGBUILD index 35b2fd534..b46e38cd8 100644 --- a/community/aspell-pl/PKGBUILD +++ b/community/aspell-pl/PKGBUILD @@ -1,17 +1,19 @@ -# $Id: PKGBUILD 57128 2011-10-22 10:35:07Z bpiotrowski $ -# Maintainer: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> +# $Id: PKGBUILD 58727 2011-11-18 05:20:53Z bpiotrowski $ +# Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com> +# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> # Contributor: Arkadiusz Laczynski <alaczynski@gmail.com> pkgname=aspell-pl -pkgver=20111022 +pkgver=20111117 pkgrel=1 pkgdesc="Polish dictionary for aspell" arch=('i686' 'x86_64' 'mips64el') url="http://www.sjp.pl/slownik/en/" license=('GPL' 'LGPL' 'MPL') depends=('aspell') -source=(http://sjp.pl/slownik/ort/sjp-aspell6-pl-6.0_$pkgver-0.tar.bz2) -md5sums=('7f14136d18152bde46bfef34e5088349') +#source=(http://sjp.pl/slownik/ort/sjp-aspell6-pl-6.0_$pkgver-0.tar.bz2) +source=(ftp://ftp.archlinux.org/other/community/$pkgname/sjp-aspell6-pl-6.0_$pkgver-0.tar.bz2) +md5sums=('27aa9ca734d7049238399c279c5417fb') build() { cd "$srcdir/aspell6-pl-6.0_$pkgver-0" diff --git a/community/aumix/PKGBUILD b/community/aumix/PKGBUILD index 023533364..d7a2d697d 100644 --- a/community/aumix/PKGBUILD +++ b/community/aumix/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 42325 2011-03-16 11:08:26Z spupykin $ +# $Id: PKGBUILD 58670 2011-11-17 13:07:03Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=aumix @@ -8,6 +8,7 @@ pkgdesc="A color text mode sound mixer with GPM support" arch=('i686' 'x86_64' 'mips64el') license=('GPL') depends=() +makedepends=('gtk2' 'gpm' 'ncurses') optdepends=('gtk2: aumix' 'ncurses: aumix-nox' 'gpm: aumix-nox') diff --git a/community/avifile/PKGBUILD b/community/avifile/PKGBUILD index c8ffc89c3..01a3fb809 100644 --- a/community/avifile/PKGBUILD +++ b/community/avifile/PKGBUILD @@ -1,27 +1,31 @@ -# $Id: PKGBUILD 20207 2010-07-03 15:40:47Z tdziedzic $ +# $Id: PKGBUILD 58655 2011-11-17 10:01:32Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: tobias <tobias@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=avifile pkgver=0.7.45 -pkgrel=7 +pkgrel=8 pkgdesc="A library that allows you to read and write compressed AVI files" arch=('i686' 'x86_64' 'mips64el') -depends=('qt' 'sdl' 'freetype2' 'libpng' 'libjpeg' \ +depends=('qt' 'sdl' 'freetype2' 'libpng' 'libjpeg' 'libvorbis' 'xvidcore' 'libxxf86dga' 'libxi' 'libxv') -makedepends=('lame' 'qt3') +makedepends=('lame' 'qt3' 'v4l-utils' 'chrpath') url="http://avifile.sourceforge.net" license=('GPL') +options=('!libtool') source=("http://downloads.sourceforge.net/sourceforge/avifile/$pkgname-0.7-$pkgver.tar.bz2" - 'gcc.patch') + 'gcc.patch' + 'videodev.patch') md5sums=('7da94802f120d1b69e04a13170dcd21d' - '588c3ce7bdebc1244f46ba56d8ef8a42') + '588c3ce7bdebc1244f46ba56d8ef8a42' + '6cca050885afe85c2d98982f75f5e3b0') build() { cd $pkgname-0.7-$pkgver - patch -Np1 <../gcc.patch + patch -Np1 <$srcdir/gcc.patch + patch -Np1 <$srcdir/videodev.patch ./configure \ --prefix=/usr \ @@ -36,8 +40,8 @@ build() { package() { cd $pkgname-0.7-$pkgver - make prefix=$pkgdir/usr install - find $pkgdir -name '*.la' -exec rm {} \; + cd $pkgdir/usr/bin + chrpath -d avibench avicap avicat avirec kv4lsetup avimake aviplay avitype avirecompress } diff --git a/community/avifile/videodev.patch b/community/avifile/videodev.patch new file mode 100644 index 000000000..0729c8ab9 --- /dev/null +++ b/community/avifile/videodev.patch @@ -0,0 +1,180 @@ +diff -wbBur avifile-0.7-0.7.45/acinclude.m4 avifile-0.7-0.7.45.my/acinclude.m4 +--- avifile-0.7-0.7.45/acinclude.m4 2006-03-06 12:11:19.000000000 +0300 ++++ avifile-0.7-0.7.45.my/acinclude.m4 2011-11-17 13:20:52.000000000 +0400 +@@ -1158,7 +1158,7 @@ + AC_ARG_ENABLE(v4l, [ --enable-v4l support v4l video interface. (autodetect)], + [], enable_v4l=yes) + if test x$enable_v4l = xyes; then +- AC_CHECK_HEADER([linux/videodev.h], [], [ enable_v4l=no; ]) ++ AC_CHECK_HEADER([libv4l1-videodev.h], [], [ enable_v4l=no; ]) + fi + + if test x$enable_v4l = xyes; then +diff -wbBur avifile-0.7-0.7.45/configure avifile-0.7-0.7.45.my/configure +--- avifile-0.7-0.7.45/configure 2006-03-06 12:11:32.000000000 +0300 ++++ avifile-0.7-0.7.45.my/configure 2011-11-17 13:20:47.000000000 +0400 +@@ -27667,8 +27667,8 @@ + fi; + if test x$enable_v4l = xyes; then + if test "${ac_cv_header_linux_videodev_h+set}" = set; then +- echo "$as_me:$LINENO: checking for linux/videodev.h" >&5 +-echo $ECHO_N "checking for linux/videodev.h... $ECHO_C" >&6 ++ echo "$as_me:$LINENO: checking for libv4l1-videodev.h" >&5 ++echo $ECHO_N "checking for libv4l1-videodev.h... $ECHO_C" >&6 + if test "${ac_cv_header_linux_videodev_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + fi +@@ -27676,8 +27676,8 @@ + echo "${ECHO_T}$ac_cv_header_linux_videodev_h" >&6 + else + # Is the header compilable? +-echo "$as_me:$LINENO: checking linux/videodev.h usability" >&5 +-echo $ECHO_N "checking linux/videodev.h usability... $ECHO_C" >&6 ++echo "$as_me:$LINENO: checking libv4l1-videodev.h usability" >&5 ++echo $ECHO_N "checking libv4l1-videodev.h usability... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -27685,7 +27685,7 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + $ac_includes_default +-#include <linux/videodev.h> ++#include <libv4l1-videodev.h> + _ACEOF + rm -f conftest.$ac_objext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +@@ -27720,15 +27720,15 @@ + echo "${ECHO_T}$ac_header_compiler" >&6 + + # Is the header present? +-echo "$as_me:$LINENO: checking linux/videodev.h presence" >&5 +-echo $ECHO_N "checking linux/videodev.h presence... $ECHO_C" >&6 ++echo "$as_me:$LINENO: checking libv4l1-videodev.h presence" >&5 ++echo $ECHO_N "checking libv4l1-videodev.h presence... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include <linux/videodev.h> ++#include <libv4l1-videodev.h> + _ACEOF + if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +@@ -27762,25 +27762,25 @@ + # So? What about this header? + case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) +- { echo "$as_me:$LINENO: WARNING: linux/videodev.h: accepted by the compiler, rejected by the preprocessor!" >&5 +-echo "$as_me: WARNING: linux/videodev.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { echo "$as_me:$LINENO: WARNING: linux/videodev.h: proceeding with the compiler's result" >&5 +-echo "$as_me: WARNING: linux/videodev.h: proceeding with the compiler's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: libv4l1-videodev.h: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: libv4l1-videodev.h: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: libv4l1-videodev.h: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: libv4l1-videodev.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) +- { echo "$as_me:$LINENO: WARNING: linux/videodev.h: present but cannot be compiled" >&5 +-echo "$as_me: WARNING: linux/videodev.h: present but cannot be compiled" >&2;} +- { echo "$as_me:$LINENO: WARNING: linux/videodev.h: check for missing prerequisite headers?" >&5 +-echo "$as_me: WARNING: linux/videodev.h: check for missing prerequisite headers?" >&2;} +- { echo "$as_me:$LINENO: WARNING: linux/videodev.h: see the Autoconf documentation" >&5 +-echo "$as_me: WARNING: linux/videodev.h: see the Autoconf documentation" >&2;} +- { echo "$as_me:$LINENO: WARNING: linux/videodev.h: section \"Present But Cannot Be Compiled\"" >&5 +-echo "$as_me: WARNING: linux/videodev.h: section \"Present But Cannot Be Compiled\"" >&2;} +- { echo "$as_me:$LINENO: WARNING: linux/videodev.h: proceeding with the preprocessor's result" >&5 +-echo "$as_me: WARNING: linux/videodev.h: proceeding with the preprocessor's result" >&2;} +- { echo "$as_me:$LINENO: WARNING: linux/videodev.h: in the future, the compiler will take precedence" >&5 +-echo "$as_me: WARNING: linux/videodev.h: in the future, the compiler will take precedence" >&2;} ++ { echo "$as_me:$LINENO: WARNING: libv4l1-videodev.h: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: libv4l1-videodev.h: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: libv4l1-videodev.h: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: libv4l1-videodev.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: libv4l1-videodev.h: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: libv4l1-videodev.h: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: libv4l1-videodev.h: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: libv4l1-videodev.h: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: libv4l1-videodev.h: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: libv4l1-videodev.h: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: libv4l1-videodev.h: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: libv4l1-videodev.h: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX + ## ------------------------------------------ ## +@@ -27791,8 +27791,8 @@ + sed "s/^/$as_me: WARNING: /" >&2 + ;; + esac +-echo "$as_me:$LINENO: checking for linux/videodev.h" >&5 +-echo $ECHO_N "checking for linux/videodev.h... $ECHO_C" >&6 ++echo "$as_me:$LINENO: checking for libv4l1-videodev.h" >&5 ++echo $ECHO_N "checking for libv4l1-videodev.h... $ECHO_C" >&6 + if test "${ac_cv_header_linux_videodev_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +diff -wbBur avifile-0.7-0.7.45/ffmpeg/libavformat/grab.c avifile-0.7-0.7.45.my/ffmpeg/libavformat/grab.c +--- avifile-0.7-0.7.45/ffmpeg/libavformat/grab.c 2006-02-04 11:57:34.000000000 +0300 ++++ avifile-0.7-0.7.45.my/ffmpeg/libavformat/grab.c 2011-11-17 13:21:12.000000000 +0400 +@@ -23,7 +23,7 @@ + #include <sys/mman.h> + #include <sys/time.h> + #define _LINUX_TIME_H 1 +-#include <linux/videodev.h> ++#include <libv4l1-videodev.h> + #include <time.h> + + typedef struct { +diff -wbBur avifile-0.7-0.7.45/ffmpeg/libavformat/v4l2.c avifile-0.7-0.7.45.my/ffmpeg/libavformat/v4l2.c +--- avifile-0.7-0.7.45/ffmpeg/libavformat/v4l2.c 2006-03-02 00:36:52.000000000 +0300 ++++ avifile-0.7-0.7.45.my/ffmpeg/libavformat/v4l2.c 2011-11-17 13:29:40.000000000 +0400 +@@ -31,7 +31,8 @@ + #include <sys/mman.h> + #include <sys/time.h> + #define _LINUX_TIME_H 1 +-#include <linux/videodev.h> ++#include <libv4l1-videodev.h> ++#include <linux/videodev2.h> + #include <time.h> + + static const int desired_video_buffers = 256; +diff -wbBur avifile-0.7-0.7.45/m4/v4l.m4 avifile-0.7-0.7.45.my/m4/v4l.m4 +--- avifile-0.7-0.7.45/m4/v4l.m4 2004-02-18 23:53:58.000000000 +0300 ++++ avifile-0.7-0.7.45.my/m4/v4l.m4 2011-11-17 13:20:56.000000000 +0400 +@@ -10,7 +10,7 @@ + AC_ARG_ENABLE(v4l, [ --enable-v4l support v4l video interface. (autodetect)], + [], enable_v4l=yes) + if test x$enable_v4l = xyes; then +- AC_CHECK_HEADER([linux/videodev.h], [], [ enable_v4l=no; ]) ++ AC_CHECK_HEADER([libv4l1-videodev.h], [], [ enable_v4l=no; ]) + fi + + if test x$enable_v4l = xyes; then +diff -wbBur avifile-0.7-0.7.45/samples/qtvidcap/kv4lsetup.cpp avifile-0.7-0.7.45.my/samples/qtvidcap/kv4lsetup.cpp +--- avifile-0.7-0.7.45/samples/qtvidcap/kv4lsetup.cpp 2005-03-23 18:18:21.000000000 +0300 ++++ avifile-0.7-0.7.45.my/samples/qtvidcap/kv4lsetup.cpp 2011-11-17 13:29:34.000000000 +0400 +@@ -39,7 +39,7 @@ + + /* Necessary to prevent collisions between <linux/time.h> and <sys/time.h> when V4L2 is installed. */ + #define _LINUX_TIME_H +-#include <linux/videodev.h> ++#include <libv4l1-videodev.h> + + #ifndef X_DISPLAY_MISSING + #include <X11/Xlib.h> +diff -wbBur avifile-0.7-0.7.45/samples/qtvidcap/v4lxif.h avifile-0.7-0.7.45.my/samples/qtvidcap/v4lxif.h +--- avifile-0.7-0.7.45/samples/qtvidcap/v4lxif.h 2003-11-14 19:42:04.000000000 +0300 ++++ avifile-0.7-0.7.45.my/samples/qtvidcap/v4lxif.h 2011-11-17 13:35:57.000000000 +0400 +@@ -32,7 +32,8 @@ + + /* Necessary to prevent collisions between <linux/time.h> and <sys/time.h> when V4L2 is installed. */ + #define _LINUX_TIME_H +-#include <linux/videodev.h> ++#include <libv4l1-videodev.h> ++#define BASE_VIDIOCPRIVATE 192 /* 192-255 are private */ + + #define V4L_DEVICE "/dev/video" + #define V4L_VBI_DEVICE "/dev/vbi" diff --git a/community/beye/PKGBUILD b/community/beye/PKGBUILD index 9272f8eb6..5d5187d25 100644 --- a/community/beye/PKGBUILD +++ b/community/beye/PKGBUILD @@ -1,41 +1,29 @@ -# $Id: PKGBUILD 6531 2009-12-15 08:58:26Z spupykin $ +# $Id: PKGBUILD 58672 2011-11-17 13:41:21Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=beye pkgver=6.1.0 _lver=610 -pkgrel=1 +pkgrel=2 pkgdesc="Binary viewer" arch=(i686 x86_64 'mips64el') license=('GPL') -depends=(slang gpm) -replaces=(biew) +depends=('slang' 'gpm') +replaces=('biew') url="http://beye.sourceforge.net/" options=(zipman) source=(http://downloads.sourceforge.net/project/beye/biew/$pkgver/biew-${_lver}-src.tar.bz2) md5sums=('1b6477defaa61b8ca0f2ae1254978e94') build() { - cd $startdir/src/biew-${_lver} - + cd $srcdir/biew-${_lver} CFLAGS="$CFLAGS -mmmx -msse" ./configure --prefix=/usr + make +} - make || return 1 - - sed -i "s|PREFIX=/usr|PREFIX=$startdir/pkg/usr|" config.mak - sed -i "s|DATADIR=/usr/share/biew|DATADIR=$startdir/pkg/usr/share/biew|" config.mak - sed -i "s|LIBDIR=/usr/lib/biew|LIBDIR=$startdir/pkg/usr/lib/biew|" config.mak - - patch makefile <<EOF -266,267c266,266 -< \$(INSTALL) -D -c -m 644 bin_rc/xlt/* \$(DATADIR)/xlt -< \$(INSTALL) -D -c -m 644 bin_rc/xlt/russian/* \$(DATADIR)/xlt/russian ---- -> cp -r bin_rc/xlt/* \${DATADIR}/xlt -EOF - - make prefix=$startdir/pkg/usr install || return 1 - +package() { + cd $srcdir/biew-${_lver} + make DESTDIR=$pkgdir install mv $pkgdir/usr/man $pkgdir/usr/share/ } diff --git a/community/binutils-avr/PKGBUILD b/community/binutils-avr/PKGBUILD index 4f8edf09c..e7cdafe4b 100644 --- a/community/binutils-avr/PKGBUILD +++ b/community/binutils-avr/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 54281 2011-08-16 06:29:48Z bfanella $ +# $Id: PKGBUILD 58711 2011-11-17 21:06:00Z jelle $ # Maintainer: Brad Fanella <bradfanella@archlinux.us> # Contributor: Corrado Primier <bardo@aur.archlinux.org> # Contributor: danst0 <danst0@west.de> pkgname=binutils-avr pkgver=2.21.1 -pkgrel=1 +pkgrel=2 pkgdesc="A set of programs to assemble and manipulate binary and object files for the avr architecture" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/binutils/" @@ -13,7 +13,7 @@ license=('GPL') depends=('glibc>=2.12-5' 'zlib') options=('!libtool' '!distcc' '!ccache') source=(http://ftp.gnu.org/gnu/${pkgname/-avr}/${pkgname/-avr}-${pkgver}.tar.bz2) -md5sums=('a22801a9cad45c85e9ff6afc10537d72') +md5sums=('bde820eac53fa3a8d8696667418557ad') build() { cd ${srcdir}/${pkgname/-avr}-${pkgver} diff --git a/community/blackbox/PKGBUILD b/community/blackbox/PKGBUILD index 36179c8f8..036a2ffff 100644 --- a/community/blackbox/PKGBUILD +++ b/community/blackbox/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 44299 2011-04-05 08:55:32Z spupykin $ +# $Id: PKGBUILD 58674 2011-11-17 13:44:24Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: durbatuluk <dvdscripter@gmail.org> # Contributor: Steve Ponsford <sp4d@lavabit.com> pkgname=blackbox pkgver=0.70.1 -pkgrel=9 +pkgrel=10 pkgdesc="A window manager for X11" url="http://blackboxwm.sourceforge.net/" arch=('i686' 'x86_64' 'mips64el') -depends=('gcc-libs' 'libxft' 'libxext' 'libx11') +depends=('gcc-libs' 'libxft' 'libxext' 'libx11' 'libxt') license=('MIT') options=('!libtool') source=(http://downloads.sourceforge.net/blackboxwm/$pkgname-$pkgver.tar.gz diff --git a/community/blobby2/PKGBUILD b/community/blobby2/PKGBUILD index be9eaf157..794a9dd94 100644 --- a/community/blobby2/PKGBUILD +++ b/community/blobby2/PKGBUILD @@ -3,17 +3,18 @@ # Contributor: Urs Wolfer <uwolfer @ fwo.ch> pkgname=blobby2 -pkgver=0.9b +====== +pkgver=0.9c arch=('x86_64' 'i686' 'mips64el') pkgrel=1 pkgdesc="A beach ball game with blobs of goo" url="http://sourceforge.net/projects/blobby/" license=('GPL') -depends=('sdl' 'physfs') +depends=('sdl' 'physfs' 'libgl') makedepends=('cmake' 'boost' 'mesa' 'zip') source=(http://downloads.sourceforge.net/project/blobby/Blobby%20Volley%202%20%28Linux%29/Beta%20$pkgver/$pkgname-linux-$pkgver.tar.gz $pkgname.desktop $pkgname.png) -md5sums=('40ee9f34ee8187c6910f489e4fa4a76d' +md5sums=('d3a6d185c4acd1c5eddf0ce46b3f55bb' 'ab05bed794ee78db693fd3036393275a' 'c1bc427b41a0a3facd771ac83c7fb412') diff --git a/community/bwm-ng/PKGBUILD b/community/bwm-ng/PKGBUILD index 5a8495dd5..bfd69190f 100644 --- a/community/bwm-ng/PKGBUILD +++ b/community/bwm-ng/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 11336 2010-02-09 22:40:01Z dgriffiths $ +# $Id: PKGBUILD 58638 2011-11-16 22:54:07Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sven Kauber <celeon@gmail.com> @@ -10,19 +10,21 @@ arch=(i686 x86_64 'mips64el') url="http://www.gropp.org/" license=('GPL') depends=('ncurses') -options=('!emptydirs') -source=(http://www.gropp.org/bwm-ng/${pkgname}-${pkgver}.tar.gz) +options=('!libtool') +source=("http://www.gropp.org/bwm-ng/${pkgname}-${pkgver}.tar.gz") md5sums=('d3a02484fb7946371bfb4e10927cebfb') -build() -{ +build() { cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr --mandir=${pkgdir}/usr/share/man - make || return 1 - make prefix=${pkgdir} install || return 1 + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make prefix=${pkgdir} install - mkdir -p ${pkgdir}/usr && \ - mv ${pkgdir}/bin ${pkgdir}/usr/ && \ - #mv ${pkgdir}/share ${pkgdir}/usr/ && \ - find ${pkgdir} -name '*.la' -exec rm {} \; + install -d ${pkgdir}/usr + mv ${pkgdir}/bin ${pkgdir}/usr/ + #mv ${pkgdir}/share ${pkgdir}/usr/ } diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD index 6c537d876..ef2a710c6 100644 --- a/community/calibre/PKGBUILD +++ b/community/calibre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 58435 2011-11-12 17:24:25Z ibiru $ +# $Id: PKGBUILD 58842 2011-11-18 20:05:26Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Petrov Roman <nwhisper@gmail.com> # Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com> pkgname=calibre -pkgver=0.8.26 -pkgrel=3 +pkgver=0.8.27 +pkgrel=1 pkgdesc="Ebook management application" arch=('i686' 'x86_64' 'mips64el') url="http://calibre-ebook.com/" @@ -21,7 +21,7 @@ install=calibre.install source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz" 'desktop_integration.patch' 'calibre-mount-helper') -md5sums=('269662b0af1aac2dea8add6b8d6055dc' +md5sums=('6a56538249fd7ddb63d1f72d1b601272' '253ce4fe5d01f8ff76b63cd3825755ea' '675cd87d41342119827ef706055491e7') diff --git a/community/cdcover/PKGBUILD b/community/cdcover/PKGBUILD index 30d6e9780..255d1136f 100644 --- a/community/cdcover/PKGBUILD +++ b/community/cdcover/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 26144 2010-09-13 19:36:37Z schuay $ +# $Id: PKGBUILD 58600 2011-11-16 15:26:59Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Roland Schaeuble <rschaeuble@gmx.ch> @@ -10,7 +10,7 @@ arch=('i686' 'x86_64' 'mips64el') url="http://cdcover.sourceforge.net" license=('GPL') depends=('python2' 'tk') -install=('cdcover.install') +install='cdcover.install' source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz") md5sums=('ab54e927e1c2f9210062ae9425cea669') diff --git a/community/centerim/PKGBUILD b/community/centerim/PKGBUILD index 6fc3f9646..f206f6f19 100644 --- a/community/centerim/PKGBUILD +++ b/community/centerim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 33529 2010-11-25 14:53:25Z spupykin $ +# $Id: PKGBUILD 58739 2011-11-18 12:12:26Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: # Contributor: Aaron Griffin <aaron@archlinux.org> @@ -19,11 +19,11 @@ md5sums=('7565c3c8cac98a4e2d8524076a44676f') build() { cd "${srcdir}/${pkgname}-${pkgver}" sed -i 's#python#python2#' misc/CenterIMLog2HTML.py + sed -i '1,1i#include <stdio.h>' libicq2000/libicq2000/sigslot.h ./configure --prefix=/usr \ --with-ssl \ --with-openssl \ --enable-locales-fix - make } diff --git a/community/chmsee/PKGBUILD b/community/chmsee/PKGBUILD index 63b548ca5..132257dde 100644 --- a/community/chmsee/PKGBUILD +++ b/community/chmsee/PKGBUILD @@ -1,16 +1,16 @@ -# $Id$ +# $Id: PKGBUILD 58590 2011-11-16 07:31:56Z lcarlier $ # Maintainer : Laurent Carlier <lordheavym@gmail.com> # Contributor: dionydonny <dionydonny@gmail.com> # Contributor: Ermanno <erm67@yahoo.it> pkgname=chmsee pkgver=1.99.05 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64' 'mips64el') pkgdesc="A chm (MS HTML help file format) viewer based on xulrunner." url="http://chmsee.googlecode.com/" -license="GPL" -depends=('xulrunner>=7.0' 'chmlib' 'desktop-file-utils') +license=('GPL') +depends=('xulrunner>=8.0' 'chmlib' 'desktop-file-utils') makedepends=('python2') source=(chmsee-$pkgver.tar.gz::https://github.com/jungleji/chmsee/tarball/v$pkgver chmsee) @@ -22,7 +22,7 @@ build() { cd ${srcdir}/jungleji-chmsee-370f906/src cp Makefile.arch Makefile - sed -i -e 's/5.0/7.0/g' Makefile + sed -i -e 's/5.0/8.0/g' Makefile make } diff --git a/community/couchdb/PKGBUILD b/community/couchdb/PKGBUILD index 7b6b4faaa..2722803ac 100644 --- a/community/couchdb/PKGBUILD +++ b/community/couchdb/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 54987 2011-08-29 12:53:53Z spupykin $ +# $Id: PKGBUILD 58574 2011-11-15 15:35:36Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Vitaliy Berdinskikh ur6lad[at]i.ua # Previous Contributor: Michael Fellinger <m.fellinger@gmail.com> pkgname=couchdb -pkgver=1.1.0 -pkgrel=1.svn20110829 +pkgver=1.2.0 +pkgrel=1git20111115 pkgdesc="A document-oriented database that can be queried and indexed in a MapReduce fashion using JSON" arch=('i686' 'x86_64' 'mips64el') url="http://couchdb.apache.org" @@ -18,10 +18,10 @@ backup=('etc/couchdb/local.ini' 'etc/conf.d/couchdb' 'etc/logrotate.d/couchdb') #source=("http://www.apache.org/dist/$pkgname/$pkgver/apache-$pkgname-$pkgver.tar.gz" -source=("http://arch.p5n.pp.ru/~sergej/dl/apache-couchdb-$pkgver.svn20110823.tar.gz" +source=("http://arch.p5n.pp.ru/~sergej/dl/apache-couchdb-$pkgver.git20111115.tar.gz" "rc-script.patch") -md5sums=('b5a6e2dab45f19ef39f04a46ac146a0a' - '12171b097d2f98f4874e002bc1eabfc5') +md5sums=('b4236a36a473e3a1c81e7548de194c47' + '559b5e1483c3fb3e4327a9c58181a46c') build() { cd "$srcdir/apache-$pkgname-$pkgver" diff --git a/community/couchdb/rc-script.patch b/community/couchdb/rc-script.patch index d7fd105c4..ef7be39df 100644 --- a/community/couchdb/rc-script.patch +++ b/community/couchdb/rc-script.patch @@ -1,5 +1,5 @@ ---- couchdb.orig 2011-08-23 13:13:45.000000000 +0400 -+++ couchdb 2011-08-23 13:34:20.000000000 +0400 +--- couchdb.orig 2011-11-15 19:06:16.000000000 +0400 ++++ couchdb 2011-11-15 19:08:24.000000000 +0400 @@ -1,4 +1,6 @@ -#!/bin/sh -e +#!/bin/bash diff --git a/community/darktable/PKGBUILD b/community/darktable/PKGBUILD index dfae03e72..783380f4a 100644 --- a/community/darktable/PKGBUILD +++ b/community/darktable/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 58181 2011-11-08 11:48:47Z spupykin $ +# $Id: PKGBUILD 58700 2011-11-17 16:33:28Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Christian Himpel <chressie at gmail dot com> # Contributor: Johannes Hanika <hanatos at gmail dot com> @@ -6,14 +6,15 @@ pkgname=darktable pkgver=0.9.3 _pkgver=0.9 -pkgrel=1 +pkgrel=2 pkgdesc="Utility to organize and develop raw images" arch=('i686' 'x86_64' 'mips64el') url=http://darktable.sf.net/ license=('GPL3') -depends=('exiv2>=0.18' 'gconf>=2.26' 'intltool>=0.40' 'lcms2' 'lensfun>=0.2.3' 'libglade' +depends=('exiv2>=0.18' 'intltool>=0.40' 'lcms2' 'lensfun>=0.2.3' 'libglade' 'dbus-glib' 'curl' 'libgnome-keyring' 'libgphoto2' 'libusb-compat' 'openexr' 'sqlite3') -makedepends=('intltool>=0.40' 'cmake' 'sqlite3') +makedepends=('intltool>=0.40' 'cmake') +# 'gnome-doc-utils' 'libxslt' 'fop') optdepends=( 'librsvg') install=darktable.install options=(!libtool) @@ -22,14 +23,16 @@ md5sums=('49253a3a2990a4bf8e0b0a19295f19bd') build() { cd $srcdir/$pkgname-$pkgver +# mv doc/usermanual/CMakeLists.tx doc/usermanual/CMakeLists.txt mkdir -p build cd build cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release \ - -DBUILD_USERMANUAL=False \ -DDONT_INSTALL_GCONF_SCHEMAS=True \ -DBINARY_PACKAGE_BUILD=1 \ + -DUSE_GCONF_BACKEND=Off \ + -DBUILD_USERMANUAL=False \ .. make } @@ -38,6 +41,6 @@ package() { cd $srcdir/$pkgname-$pkgver/build make DESTDIR=$pkgdir install mv "${pkgdir}/usr/share/doc/darktable" "${pkgdir}/usr/share/doc/${pkgname}-${pkgver}" - mkdir -p "${pkgdir}/usr/share/gconf/schemas/" - mv "${pkgdir}/etc/gconf/schemas/darktable.schemas" "${pkgdir}/usr/share/gconf/schemas/" +# mkdir -p "${pkgdir}/usr/share/gconf/schemas/" +# mv "${pkgdir}/etc/gconf/schemas/darktable.schemas" "${pkgdir}/usr/share/gconf/schemas/" } diff --git a/community/dosbox/PKGBUILD b/community/dosbox/PKGBUILD new file mode 100644 index 000000000..1f88ecec8 --- /dev/null +++ b/community/dosbox/PKGBUILD @@ -0,0 +1,46 @@ +# $Id: PKGBUILD 49481 2011-06-17 21:30:52Z jelle $ +# Maintainer : +# Contribute : Jelle van der Waa <jelle@vdwaa.nl> +# Contributor: James Rayner <james@archlinux.org> +# Contributor: Ben <ben@benmazer.net> + +pkgname=dosbox +pkgver=0.74 +pkgrel=2 +pkgdesc="An emulator with builtin DOS for running DOS Games" +arch=('i686' 'x86_64') +url="http://dosbox.sourceforge.net/" +license=('GPL') +depends=('sdl_net' 'zlib' 'sdl_sound' 'libgl' 'libpng' 'alsa-lib' 'gcc-libs') +makedepends=('mesa') +source=("http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz" + 'dosbox.png' 'dosbox.desktop' 'gcc46.patch') + +build(){ + cd ${srcdir}/${pkgname}-${pkgver} + patch -Np1 -i $srcdir/gcc46.patch + sed -i 's/png_check_sig/png_sig_cmp/' configure + ./configure --prefix=/usr \ + --sysconfdir=/etc/dosbox + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install + + + # install docs, make does not install them + install -d $pkgdir/usr/share/doc/$pkgname + install -Dm644 $srcdir/$pkgname-$pkgver/README $pkgdir/usr/share/doc/$pkgname/README + install -Dm644 $srcdir/$pkgname-$pkgver/docs/README.video $pkgdir/usr/share/doc/$pkgname/README.video + + install -Dm644 ${srcdir}/${pkgname}.png \ + ${pkgdir}/usr/share/pixmaps/${pkgname}.png + install -Dm644 ${srcdir}/${pkgname}.desktop \ + ${pkgdir}/usr/share/applications/${pkgname}.desktop +} +md5sums=('b9b240fa87104421962d14eee71351e8' + '2aac25fc06979e375953fcc36824dc5e' + '85169ca599028bee8e29e0b3b7b34dd8' + '3fba2e3c7c43290319b2928f40ed30e5') diff --git a/community/dosbox/dosbox.desktop b/community/dosbox/dosbox.desktop new file mode 100644 index 000000000..dbaf05ced --- /dev/null +++ b/community/dosbox/dosbox.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Type=Application +Encoding=UTF-8 +Name=dosbox Emulator +GenericName=Emulator +Comment=An emulator to run old DOS games +Icon=dosbox +Exec=dosbox +Terminal=false +Categories=Emulator;Application; diff --git a/community/dosbox/dosbox.png b/community/dosbox/dosbox.png Binary files differnew file mode 100644 index 000000000..b8a917986 --- /dev/null +++ b/community/dosbox/dosbox.png diff --git a/community/dosbox/gcc46.patch b/community/dosbox/gcc46.patch new file mode 100644 index 000000000..eae9ae63e --- /dev/null +++ b/community/dosbox/gcc46.patch @@ -0,0 +1,12 @@ +diff -aur dosbox-0.74/include/dos_inc.h dosbox-0.74.new//include/dos_inc.h +--- dosbox-0.74/include/dos_inc.h 2010-05-10 17:43:54.000000000 +0000 ++++ dosbox-0.74.new//include/dos_inc.h 2011-06-17 20:42:43.982548979 +0000 +@@ -28,6 +28,8 @@ + #include "mem.h" + #endif + ++#include <stddef.h> //for offsetof ++ + #ifdef _MSC_VER + #pragma pack (1) + #endif diff --git a/community/duplicity/PKGBUILD b/community/duplicity/PKGBUILD index 4cc7fc406..665f7cae4 100644 --- a/community/duplicity/PKGBUILD +++ b/community/duplicity/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 55816 2011-09-22 11:26:50Z lfleischer $ +# $Id: PKGBUILD 58556 2011-11-14 12:40:26Z lfleischer $ # Maintainer: Kaiting Chen <kaitocracy@gmail.com> # Contributor: Aaron Schaefer <aaron@elasticdog.com> pkgname=duplicity -pkgver=0.6.15 +pkgver=0.6.16 pkgrel=1 pkgdesc='A utility for encrypted, bandwidth-efficient backups using the rsync algorithm' arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ url='http://www.nongnu.org/duplicity/' license=('GPL') depends=('librsync' 'ncftp' 'python2' 'python-boto' 'python-gnupginterface') source=("http://savannah.nongnu.org/download/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('88f3c990f41fde86cd7d5af5a1bc7b81') +md5sums=('55996756a5bc9743add738cfcba2dda2') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/dxpc/PKGBUILD b/community/dxpc/PKGBUILD index bf290ae13..d689b83e2 100644 --- a/community/dxpc/PKGBUILD +++ b/community/dxpc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 23155 2010-08-07 10:04:09Z spupykin $ +# $Id: PKGBUILD 58798 2011-11-18 14:38:36Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> @@ -10,12 +10,13 @@ arch=('i686' 'x86_64' 'mips64el') url="http://www.vigor.nu/dxpc/" license=('GPL') depends=('lzo2' 'gcc-libs') +makedepends=('xproto') source=(http://www.vigor.nu/dxpc/dxpc-$pkgver.tgz) md5sums=('e69f58c4acc34c6746a0e5ab17bf8d0f') build() { cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr --mandir='${prefix}/share/man' - make || return 1 + make make prefix="$pkgdir/usr" install } diff --git a/community/eiciel/PKGBUILD b/community/eiciel/PKGBUILD index 0c3556667..d8baea971 100644 --- a/community/eiciel/PKGBUILD +++ b/community/eiciel/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 49658 2011-06-18 21:23:03Z ebelanger $ +# $Id: PKGBUILD 58840 2011-11-18 19:58:05Z ebelanger $ # Contributor: Roman Kyrylych <roman@gmail.com> # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> @@ -12,7 +12,9 @@ license=('GPL') depends=('acl' 'gtkmm3' 'nautilus' 'desktop-file-utils' 'gnome-vfs') options=('!libtool') install=eiciel.install -source=(http://rofi.roger-ferrer.org/eiciel/download/${pkgname}-${pkgver}.tar.bz2) +# the source for 0.9.8.1 is no longer found upstream +#source=(http://rofi.roger-ferrer.org/eiciel/download/${pkgname}-${pkgver}.tar.bz2) +source=(https://launchpad.net/ubuntu/+archive/primary/+files/eiciel_0.9.8.1.orig.tar.bz2) md5sums=('2c9c459f0604ce03ec49bb425cc42681') build() { diff --git a/community/extrema/PKGBUILD b/community/extrema/PKGBUILD index ad0e8a6b1..35f884b60 100644 --- a/community/extrema/PKGBUILD +++ b/community/extrema/PKGBUILD @@ -1,34 +1,40 @@ -# Maintainer: Thomas Dziedzic < gostrc at gmail > +# $Id: PKGBUILD 58786 2011-11-18 14:18:33Z andrea $ +# Maintainer: +# Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Marcelo Avalos Tejeda <marcelo.avalos@gmail.com> pkgname=extrema pkgver=4.4.5 -pkgrel=1 -pkgdesc='Extrema is a powerful visualization and data analysis tool.' +pkgrel=2 +pkgdesc='A powerful visualization and data analysis tool' arch=('i686' 'x86_64' 'mips64el') url='http://exsitewebware.com/extrema/index.html' license=('GPL') -depends=('wxgtk' 'zlib' 'libxml2' 'libpng') -source=("http://downloads.sourceforge.net/project/extrema/extrema/extrema-linux%20v${pkgver}/extrema-${pkgver}.tar.gz" - 'extrema.desktop') +depends=('wxgtk') +options=('!libtool') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz" + 'extrema.desktop' + 'gcc46.patch') md5sums=('8a1e82b34874db2bfa64d9a2956677b1' - '0f4d310d230e28436dff20e77aed71bb') + '0f4d310d230e28436dff20e77aed71bb' + 'be85114cee4c677d33f1522d958e76db') build() { - cd ${pkgname}-${pkgver} + cd "${srcdir}"/${pkgname}-${pkgver} - ./configure \ - --prefix=/usr + patch -p1 -i "${srcdir}"/gcc46.patch + ./configure --prefix=/usr make + + tar xf extrema_icons.tar.bz2 } package() { - cd ${pkgname}-${pkgver} + cd "${srcdir}"/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install - tar xf extrema_icons.tar.bz2 install -D -m644 32x32/apps/extrema.png \ ${pkgdir}/usr/share/pixmaps/extrema.png diff --git a/community/extrema/gcc46.patch b/community/extrema/gcc46.patch new file mode 100644 index 000000000..45a804292 --- /dev/null +++ b/community/extrema/gcc46.patch @@ -0,0 +1,15 @@ +Fix building with gcc-4.6 + +https://bugs.gentoo.org/show_bug.cgi?id=363467 + +Patch written by Kacper Kowalik <xarthisius@gentoo.org> +--- a/src/Graphics/GRA_thiessenTriangulation.h ++++ b/src/Graphics/GRA_thiessenTriangulation.h +@@ -19,6 +19,7 @@ + #define GRA_THIESSENTRIANGULATION + + #include <vector> ++#include <cstddef> + + class GRA_thiessenTriangulation + { diff --git a/community/fbreader/PKGBUILD b/community/fbreader/PKGBUILD index 7ce430482..65d1d9894 100644 --- a/community/fbreader/PKGBUILD +++ b/community/fbreader/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 32017 2010-11-09 12:39:54Z spupykin $ +# $Id: PKGBUILD 58784 2011-11-18 14:18:00Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> @@ -10,7 +10,7 @@ arch=('i686' 'x86_64' 'mips64el') url="http://www.fbreader.org/" license=('GPL') depends=('fribidi' 'bzip2' 'curl' 'gtk2' 'liblinebreak' 'sqlite3') -source=(http://only.mawhrin.net/fbreader/fbreader-sources-$pkgver.tgz +source=(http://www.fbreader.org/files/sources/fbreader-sources-$pkgver.tgz build-fix.patch) md5sums=('da9ec4721efdb0ec0aaa182bff16ad82' '66ac17d8640625b6d2a806de4aa4e76c') diff --git a/community/fityk/PKGBUILD b/community/fityk/PKGBUILD index 669d2d45d..71e3fb36c 100644 --- a/community/fityk/PKGBUILD +++ b/community/fityk/PKGBUILD @@ -4,19 +4,20 @@ pkgname=fityk pkgver=1.1.1 -pkgrel=2 +pkgrel=3 pkgdesc='A program for nonlinear fitting of analytical functions to data.' arch=('i686' 'x86_64' 'mips64el') url='http://www.unipress.waw.pl/fityk/' license=('GPL') depends=('xylib' 'shared-mime-info' 'lua' 'gnuplot') # wxgtk supplied by statically linked wxWidgets -makedepends=('boost' 'git' 'python-sphinx' 'swig') +makedepends=('boost' 'git' 'python-sphinx' 'swig' 'subversion') options=('!libtool') install='fityk.install' -source=('http://biolpc22.york.ac.uk/pub/Daily_HEAD/wxWidgets.tar.gz') # daily snapshot because fityk requires a version that hasn't been released yet... -md5sums=('99bb0cf3813ee173edc9cbbc026a78ca') build() { + # daily snapshot because fityk requires a version that hasn't been released yet... + svn checkout http://svn.wxwidgets.org/svn/wx/wxWidgets/trunk wxWidgets + cd wxWidgets ./configure --prefix=${srcdir}/usr --disable-shared --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys make diff --git a/community/floyd/PKGBUILD b/community/floyd/PKGBUILD index 7c711c677..42c4cd155 100644 --- a/community/floyd/PKGBUILD +++ b/community/floyd/PKGBUILD @@ -1,23 +1,28 @@ -# $Id: PKGBUILD 5264 2009-11-07 13:00:24Z ibiru $ +# $Id: PKGBUILD 58684 2011-11-17 15:37:37Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=floyd pkgver=2.0.1 -pkgrel=3 +pkgrel=4 pkgdesc="displays system load with pulse of keyboard LED" -arch=(i686 x86_64 'mips64el') +arch=('i686' 'x86_64' 'mips64el') url="http://www.asahi-net.or.jp/~pi9s-nnb/floyd/" license=("GPL") -depends=(glibc) -backup=(etc/fuse.conf) -source=(http://www.asahi-net.or.jp/~pi9s-nnb/floyd/$pkgname-$pkgver.tar.gz) -md5sums=('c1b80bc76ac4e25e821a193428fa42a4') +depends=() +source=(http://www.asahi-net.or.jp/~pi9s-nnb/floyd/$pkgname-$pkgver.tar.gz + build-fix.patch) +md5sums=('c1b80bc76ac4e25e821a193428fa42a4' + '0cde2017ead790f9d556ef34c6a4008f') build() { cd $startdir/src/$pkgname-$pkgver - sed -i "s#/usr/local#/usr#" ./Makefile - make floyd || return 1 - install -D -m 0755 ./floyd $startdir/pkg/usr/bin/floyd && \ - install -D -m 0644 ./floyd.1 $startdir/pkg/usr/share/man/man1/floyd.1 + patch -p1 <$srcdir/build-fix.patch + make pthread +} + +package() { + cd $startdir/src/$pkgname-$pkgver + mkdir -p $pkgdir/usr/share/man/man1 $pkgdir/usr/bin + make install MANDIR=$pkgdir/usr/share/man/man1 BINDIR=$pkgdir/usr/bin } diff --git a/community/floyd/build-fix.patch b/community/floyd/build-fix.patch new file mode 100644 index 000000000..d78737b54 --- /dev/null +++ b/community/floyd/build-fix.patch @@ -0,0 +1,30 @@ +diff -wbBur floyd-2.0.1/floyd.c floyd-2.0.1.my/floyd.c +--- floyd-2.0.1/floyd.c 2005-12-01 12:49:43.000000000 +0300 ++++ floyd-2.0.1.my/floyd.c 2011-11-17 19:31:13.000000000 +0400 +@@ -167,11 +167,6 @@ + } + if (gfprm.verbose || doargforked) /* doargforked: set by -D */ + fprintf(stderr, "%s: signal %d received [%d]\n", progname, sig, getpid()); +-#ifdef linux +- pthread_kill_other_threads_np(); +-#else +- Maybe you loose. Check out if you have pthread_kill_other_threads_np(). +-#endif + close(fdes); /* but here ? */ + exit(0); + } +diff -wbBur floyd-2.0.1/voodoo.c floyd-2.0.1.my/voodoo.c +--- floyd-2.0.1/voodoo.c 1999-07-29 18:01:10.000000000 +0400 ++++ floyd-2.0.1.my/voodoo.c 2011-11-17 19:31:18.000000000 +0400 +@@ -101,11 +101,6 @@ + perror("KDSETLED"); + } + fprintf(stderr, "%s: signal %d received [%d]\n", progname, sig, getpid()); +-#ifdef linux +- pthread_kill_other_threads_np(); +-#else +- Maybe you loose. Check out if you have pthread_kill_other_threads_np(). +-#endif + exit(0); + } + diff --git a/community/fltk2/PKGBUILD b/community/fltk2/PKGBUILD index 38e95673e..833e51f00 100644 --- a/community/fltk2/PKGBUILD +++ b/community/fltk2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 33138 2010-11-22 16:59:51Z spupykin $ +# $Id: PKGBUILD 58766 2011-11-18 13:49:19Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=fltk2 pkgver=2.0 -_pkgver=2.0.x-r7725 -pkgrel=6 +_pkgver=2.0.x-alpha-r9166 +pkgrel=7 pkgdesc="Graphical user interface toolkit for X" arch=(i686 x86_64 'mips64el') license=('LGPL') @@ -12,8 +12,8 @@ url="http://www.fltk.org/" depends=('libjpeg' 'libpng' 'gcc-libs' 'libxft' 'libxext' 'libxi' 'libxinerama') makedepends=('mesa') source=(http://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/fltk/snapshots/fltk-${_pkgver}.tar.bz2 - libpng14.patch) -md5sums=('4d2680a65574e920becf968b899d5311' + libpng14.patch) +md5sums=('d5e7cd859d2aeb9bb6e13ee298e8b2aa' '93955f17f56ad8b419ca1f8ea8c24a7f') build() { @@ -27,7 +27,7 @@ build() { > int n = scandir(d, list, 0, (int(*)(const dirent64**,const dirent64**))sort); EOF - patch -Np1 -i "$srcdir/libpng14.patch" +# patch -Np1 -i "$srcdir/libpng14.patch" make make DESTDIR=$pkgdir install } diff --git a/community/fonteditfs/PKGBUILD b/community/fonteditfs/PKGBUILD index 45d4a5832..b0f6d74fd 100644 --- a/community/fonteditfs/PKGBUILD +++ b/community/fonteditfs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 5263 2009-11-07 12:56:38Z ibiru $ +# $Id: PKGBUILD 58688 2011-11-17 15:43:36Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> @@ -9,13 +9,13 @@ pkgdesc="console font editor" arch=('i686' 'x86_64' 'mips64el') url="http://fonteditfs.sourceforge.net/" license=('GPL') -depends=(ncurses) +depends=('ncurses') source=("http://downloads.sourceforge.net/sourceforge/fonteditfs/fnteditfs-$pkgver.tgz") md5sums=('1e7c827da078d41a76459439dda0d5a9') -build () { - cd $startdir/src/fnteditfs-$pkgver - make || return 1 - install -D -m0755 fnteditfs $startdir/pkg/usr/bin/fnteditfs && \ - install -D -m0644 fnteditfs.1 $startdir/pkg/usr/share/man/man1/fnteditfs.1 +build() { + cd $srcdir/fnteditfs-$pkgver + make + install -D -m0755 fnteditfs $pkgdir/usr/bin/fnteditfs + install -D -m0644 fnteditfs.1 $pkgdir/usr/share/man/man1/fnteditfs.1 } diff --git a/community/fox/PKGBUILD b/community/fox/PKGBUILD index 0d3dde1d5..1b8a62b11 100644 --- a/community/fox/PKGBUILD +++ b/community/fox/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 40876 2011-03-01 10:03:57Z spupykin $ +# $Id: PKGBUILD 58793 2011-11-18 14:31:12Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Ben <ben@benmazer.net> pkgname=fox -pkgver=1.6.43 +pkgver=1.6.44 pkgrel=1 pkgdesc="Free Objects for X: GUI Toolkit for C++" arch=('i686' 'x86_64' 'mips64el') @@ -12,14 +12,12 @@ license=('LGPL' 'custom') depends=('bzip2' 'libxcursor' 'libxft' 'libxrandr' 'mesa' 'libxi' 'libpng' 'libtiff') optdepends=('perl') options=('!libtool') -source=(http://www.fox-toolkit.org/ftp/${pkgname}-${pkgver}.tar.gz) -md5sums=('4c6a322a8117420e417daeec8fbfeba5') +source=(http://ftp.fox-toolkit.org/pub/fox-$pkgver.tar.gz) +md5sums=('6ccc8cbcfa6e4c8b6e4deeeb39c36434') build() { cd ${srcdir}/${pkgname}-${pkgver} - export CPPFLAGS="$CPPFLAGS -I/usr/include/freetype2" - ./configure --prefix=/usr \ --enable-release \ --with-xft=yes \ @@ -38,7 +36,6 @@ build() { package() { cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install - cd ${srcdir}/${pkgname}-${pkgver}/tests make ControlPanel install -m755 ${srcdir}/${pkgname}-${pkgver}/tests/.libs/ControlPanel ${pkgdir}/usr/bin/ diff --git a/community/freemat/PKGBUILD b/community/freemat/PKGBUILD index 432119a77..a2f839ed6 100644 --- a/community/freemat/PKGBUILD +++ b/community/freemat/PKGBUILD @@ -1,15 +1,16 @@ -# $Id: PKGBUILD 36137 2010-12-27 15:12:01Z spupykin $ +# $Id: PKGBUILD 58815 2011-11-18 15:51:12Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> pkgname=freemat pkgver=4.0 -pkgrel=4 +pkgrel=5 pkgdesc="A free environment for rapid engineering, scientific prototyping and data processing" arch=('i686' 'x86_64' 'mips64el') url="http://freemat.sourceforge.net" license=('GPL') -depends=('qt' 'umfpack' 'arpack' 'libmatio' 'ffcall' 'fftw' 'blas' 'lapack' 'mesa' 'portaudio') +depends=('qt' 'ffcall' 'fftw' 'mesa' 'portaudio') +makedepends=('arpack' 'lapack' 'umfpack' 'blas' 'libmatio' 'cmake') install=freemat.install source=(http://downloads.sourceforge.net/project/freemat/FreeMat4/FreeMat-$pkgver-Source.tar.gz freemat-gcc-4.3.0.patch diff --git a/community/freewrl/PKGBUILD b/community/freewrl/PKGBUILD index da9e1278d..ba57c7f1e 100644 --- a/community/freewrl/PKGBUILD +++ b/community/freewrl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 55881 2011-09-24 16:48:32Z stephane $ +# $Id: PKGBUILD 58829 2011-11-18 16:55:57Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> @@ -19,7 +19,8 @@ md5sums=('07fd8f193d14799ffb95a59a4887fc88' '52e4b6aacebcaf18cbec8975e0eb7fd8') build() { - . /etc/profile.d/openjdk6.sh + . /etc/profile.d/jre.sh + . /etc/profile.d/jdk.sh cd $srcdir/$pkgname-$pkgver patch -p1 <$srcdir/build-fix.patch export JAVASCRIPT_ENGINE_CFLAGS="-I/usr/include/js -DXP_UNIX -DJS_THREADSAFE $(pkg-config --cflags nspr)" diff --git a/community/gnash/PKGBUILD b/community/gnash/PKGBUILD index a78103e6d..889ef3ce5 100644 --- a/community/gnash/PKGBUILD +++ b/community/gnash/PKGBUILD @@ -4,7 +4,7 @@ pkgbase=gnash pkgname=(gnash-common gnash-gtk) pkgver=0.8.9 -pkgrel=5 +pkgrel=6 arch=(i686 x86_64 'mips64el') url="http://www.gnu.org/software/gnash/" license=(GPL3) @@ -15,9 +15,10 @@ makedepends=(curl giflib libldap sdl agg libjpeg libpng libtool pkgconfig boost) options=(!libtool !emptydirs) source=(http://ftp.gnu.org/gnu/gnash/${pkgver}/gnash-${pkgver}.tar.bz2 - gentoo-ffmpeg-0.8.patch) + gentoo-ffmpeg-0.8.patch xul8.patch) md5sums=('5b2be6b04a1bcc5fb404cc377034499e' - '98dec9a5c1b1084245a3f46b4022a6e2') + '98dec9a5c1b1084245a3f46b4022a6e2' + '9b77325d0b8b9d4150c4097771482d26') build() { cd "$srcdir/gnash-$pkgver" @@ -25,8 +26,11 @@ build() { # Consolidated gentoo patches for ffmpeg compatibility # as of 2011-10-31 patch -Np1 -i "$srcdir/gentoo-ffmpeg-0.8.patch" - ./autogen.sh + # Patch for compatibility with newer xulrunner headers + patch -Np1 -i "$srcdir/xul8.patch" + + ./autogen.sh ./configure \ --prefix=/usr \ --sysconfdir=/etc \ diff --git a/community/gnash/xul8.patch b/community/gnash/xul8.patch new file mode 100644 index 000000000..7bd708b2d --- /dev/null +++ b/community/gnash/xul8.patch @@ -0,0 +1,44 @@ +diff -u -r gnash-0.8.9/plugin/npapi/mozilla-sdk/np_entry.cpp gnash-0.8.9-xul/plugin/npapi/mozilla-sdk/np_entry.cpp +--- gnash-0.8.9/plugin/npapi/mozilla-sdk/np_entry.cpp 2011-03-13 17:47:36.000000000 +0100 ++++ gnash-0.8.9-xul/plugin/npapi/mozilla-sdk/np_entry.cpp 2011-11-18 16:25:55.198007371 +0100 +@@ -238,7 +238,7 @@ + return NS_PluginInitialize(); + } + +-char * ++const char * + NP_GetMIMEDescription(void) + { + return NPP_GetMIMEDescription(); +diff -u -r gnash-0.8.9/plugin/npapi/plugin.cpp gnash-0.8.9-xul/plugin/npapi/plugin.cpp +--- gnash-0.8.9/plugin/npapi/plugin.cpp 2011-03-18 14:44:30.000000000 +0100 ++++ gnash-0.8.9-xul/plugin/npapi/plugin.cpp 2011-11-18 16:35:42.496794816 +0100 +@@ -128,10 +128,10 @@ + } + + /// \brief Return the MIME Type description for this plugin. +-char* ++const char* + NPP_GetMIMEDescription(void) + { +- return const_cast<char *>(MIME_TYPES_DESCRIPTION); ++ return MIME_TYPES_DESCRIPTION; + } + + static bool waitforgdb = false; +diff -u -r gnash-0.8.9/plugin/npapi/test.cpp gnash-0.8.9-xul/plugin/npapi/test.cpp +--- gnash-0.8.9/plugin/npapi/test.cpp 2011-03-13 17:47:36.000000000 +0100 ++++ gnash-0.8.9-xul/plugin/npapi/test.cpp 2011-11-18 16:37:06.997539299 +0100 +@@ -408,10 +408,10 @@ + { + } + +-char* ++const char* + NPP_GetMIMEDescription(void) + { +- char *x = 0; ++ const char *x = 0; + return x; + } + diff --git a/community/gobby/PKGBUILD b/community/gobby/PKGBUILD index 140bd1cea..66a3a79cd 100644 --- a/community/gobby/PKGBUILD +++ b/community/gobby/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 18527 2010-06-07 11:16:36Z spupykin $ +# $Id: PKGBUILD 58735 2011-11-18 10:25:12Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> # Maintainer: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> @@ -10,16 +10,19 @@ pkgdesc="A collaborative text editor" arch=('i686' 'x86_64' 'mips64el') url="http://gobby.0x539.de" license=('GPL') + depends=('obby' 'libxml++' 'gtkmm' 'gnome-vfs' 'libbonobo' 'libgtksourceviewmm2' 'gtksourceview2') +#depends=('obby' 'libxml++2' 'gtkmm' 'gnome-vfs' 'libbonobo' 'libgtksourceviewmm2' +# 'gtksourceview2' 'libxml++' 'libunique' 'libinfinity' 'gsasl') + makedepends=('gettext' 'intltool') -options=(force) source=(http://releases.0x539.de/gobby/gobby-$pkgver.tar.gz) md5sums=('835cc48f5177196e4a18610c2cb013bf') build() { cd $srcdir/gobby-$pkgver ./configure --prefix=/usr --with-gnome - make || return 1 + make make DESTDIR=$pkgdir install install -D -m644 contrib/gobby.desktop \ $pkgdir/usr/share/applications/gobby.desktop diff --git a/community/gphpedit/PKGBUILD b/community/gphpedit/PKGBUILD index 963c8d44a..6739ade04 100644 --- a/community/gphpedit/PKGBUILD +++ b/community/gphpedit/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 44458 2011-04-07 16:24:21Z spupykin $ +# $Id: PKGBUILD 58832 2011-11-18 16:59:44Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: tobias <tobias@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> @@ -10,23 +10,19 @@ pkgdesc="a scintilla/gnome based editor specialized on php-files" arch=(i686 x86_64 'mips64el') license=('GPL') depends=('libgnomeui>=2.18.1-2' 'libgtkhtml>=2.11.0' 'desktop-file-utils' 'libwebkit') +makedepends=('intltool') url="http://www.gphpedit.org/" options=('!makeflags') install=gphpedit.install -source=(http://www.gphpedit.org/sites/default/files/gphpedit-$pkgver.tar.gz - doc-fix.patch) -md5sums=('cc3c5f50704fa0ed3ef3d4ac983db525' - 'db5e427642af2971accbcd90812ae88c') +source=(http://www.gphpedit.org/sites/default/files/gphpedit-$pkgver.tar.gz) +md5sums=('cc3c5f50704fa0ed3ef3d4ac983db525') build() { cd ${srcdir}/*$pkgname* -# patch -Np1 -i ${srcdir}/doc-fix.patch - ./autogen.sh ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var make make DESTDIR=$pkgdir install - # extend MimeType declaration echo "MimeType=application/x-php;text-x-php-text/x-php-source;" >> \ $pkgdir/usr/share/applications/gphpedit.desktop diff --git a/community/gprolog/PKGBUILD b/community/gprolog/PKGBUILD index e65fcb8c7..badc9b5c5 100644 --- a/community/gprolog/PKGBUILD +++ b/community/gprolog/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 50772 2011-06-30 21:54:27Z spupykin $ +# $Id: PKGBUILD 58769 2011-11-18 13:54:39Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Geoffroy Carrier <geoffroy.carrier@koon.fr> # Contributer: Jason Chu <jchu@xentac.net> @@ -12,7 +12,7 @@ url="http://www.gprolog.org/" depends=('glibc') license=('GPL') source=(ftp://ftp.gnu.org/gnu/gprolog/gprolog-$pkgver.tar.gz) -md5sums=('9d4fc311b7f6e37e524a5e7ccd0b6c28') +md5sums=('cc944e5637a04a9184c8aa46c947fd16') build() { cd "$srcdir/gprolog-$pkgver/src" diff --git a/community/gq/PKGBUILD b/community/gq/PKGBUILD index 827bf915f..c690cd1c7 100644 --- a/community/gq/PKGBUILD +++ b/community/gq/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 18516 2010-06-07 11:11:04Z spupykin $ +# $Id: PKGBUILD 58750 2011-11-18 13:04:07Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Gergely Tamas <dice@mfa.kfki.hu> @@ -9,7 +9,7 @@ pkgdesc="interactive graphical LDAP browser" url="http://sourceforge.net/projects/gqclient" license=("GPL") depends=('libxml2' 'gtk2' 'libgnome-keyring' 'libglade' 'libldap>=2.4.18' 'libgpg-error' 'libgcrypt') -makedepends=('intltool' 'pkgconfig') +makedepends=('intltool' 'pkgconfig' 'gnome-doc-utils') arch=('i686' 'x86_64' 'mips64el') install=gq.install source=(http://downloads.sourceforge.net/sourceforge/gqclient/$pkgname-$pkgver.tar.gz) @@ -18,6 +18,6 @@ md5sums=('d7b1e183a3ecbd77aceea02d27f36b3e') build() { cd $srcdir/$pkgname-$pkgver ./configure --prefix=/usr --disable-debugging --disable-update-mimedb - make || return 1 + make make DESTDIR=$pkgdir install } diff --git a/community/gsoap/PKGBUILD b/community/gsoap/PKGBUILD index aec8477fa..479195e01 100644 --- a/community/gsoap/PKGBUILD +++ b/community/gsoap/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 55148 2011-09-04 07:26:57Z spupykin $ +# $Id: PKGBUILD 58578 2011-11-15 16:25:21Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Tor Krill <tor@krill.nu> # Contributor: Lee.MaRS <leemars@gmail.com> pkgname=gsoap -pkgver=2.8.3 +pkgver=2.8.4 pkgrel=1 pkgdesc="Offers an XML language binding to ease the development of SOAP/XML Web services in C and C/C++" url="http://www.cs.fsu.edu/~engelen/soap.html" @@ -14,7 +14,7 @@ depends=('openssl' 'zlib' 'gcc-libs') makedepends=('autoconf' 'automake') source=(http://prdownloads.sourceforge.net/gsoap2/${pkgname}_${pkgver}.zip LICENSE) -md5sums=('48e7739a5719bd635843e42d2ec670f7' +md5sums=('cb37c5cc3ef15b6b82863f45544d9473' '27aaa3f5166db94d44044c11a7b2c37b') build() { diff --git a/community/gsql/PKGBUILD b/community/gsql/PKGBUILD index 93cf19ab0..155914731 100644 --- a/community/gsql/PKGBUILD +++ b/community/gsql/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 50643 2011-06-29 10:56:50Z spupykin $ +# $Id: PKGBUILD 58755 2011-11-18 13:09:30Z spupykin $ # Contributor: Michael Kanis <mkanis@gmx.de> pkgname=gsql @@ -8,7 +8,8 @@ pkgdesc="Integrated database development tool for GNOME" url="http://gsql.org/" license=('GPL') arch=('i686' 'x86_64' 'mips64el') -depends=('gtk2>=2.12' 'gtksourceview2' 'vte' 'libgnomeui' 'gconf' 'desktop-file-utils') +depends=('gtk2>=2.12' 'gtksourceview2' 'vte' 'libgnomeui' 'gconf' + 'desktop-file-utils' 'libnotify') makedepends=('libmysqlclient' 'postgresql-libs' 'libssh') optdepends=('libmysqlclient' 'postgresql-libs' 'libssh') install=gsql.install diff --git a/community/gtkwave/PKGBUILD b/community/gtkwave/PKGBUILD index 48791d7ab..e363851a6 100644 --- a/community/gtkwave/PKGBUILD +++ b/community/gtkwave/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 57344 2011-10-26 07:36:21Z ebelanger $ +# $Id: PKGBUILD 58564 2011-11-15 03:42:53Z ebelanger $ # Maintainer: Thomas Dziedzic < gostrc at gmail > # Contributor: Jared Casper <jaredcasper@gmail.com> pkgname=gtkwave -pkgver=3.3.27 +pkgver=3.3.28 pkgrel=1 pkgdesc='A wave viewer which reads LXT, LXT2, VZT, GHW and VCD/EVCD files' arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('bzip2' 'xz' 'gtk2') makedepends=('gperf') install='gtkwave.install' source=("http://gtkwave.sourceforge.net/gtkwave-${pkgver}.tar.gz") -md5sums=('0ab7f1a239c73ed7773ef0a33db6a683') +md5sums=('396cc15cfc12801c9ad6af507ee4a0f1') build() { cd "${srcdir}/gtkwave-${pkgver}" diff --git a/community/guifications/PKGBUILD b/community/guifications/PKGBUILD index 837667cbe..94a0683b9 100644 --- a/community/guifications/PKGBUILD +++ b/community/guifications/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 17250 2010-05-22 14:25:10Z ibiru $ +# $Id: PKGBUILD 58837 2011-11-18 17:38:20Z jelle $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Link Dupont <link@.subpop.net> pkgname=guifications pkgver=2.16 -pkgrel=2 +pkgrel=3 pkgdesc="A set of GUI popup notifications for pidgin" arch=(i686 x86_64 'mips64el') url="http://plugins.guifications.org/trac/wiki/Guifications" @@ -12,12 +12,16 @@ license=("GPL") depends=('pidgin') makedepends=('perlxml') options=('!libtool') -source=(pidgin-${pkgname}-${pkgver}.tar.bz2::http://plugins.guifications.org/trac/downloads/7) -md5sums=('cd1f803231093cde01514feca59f643f') +source=("https://www.guifications.org/attachments/download/145/pidgin-guifications-2.16.tar.gz") +md5sums=('43fd9022160f15b4b262c4662ba62fc9') build() { cd "${srcdir}/pidgin-${pkgname}-${pkgver}" ./configure --prefix=/usr --disable-deprecated - make || return 1 + make +} +package() +{ + cd "${srcdir}/pidgin-${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install } diff --git a/community/gxmessage/PKGBUILD b/community/gxmessage/PKGBUILD index 6448e9840..4c964485f 100644 --- a/community/gxmessage/PKGBUILD +++ b/community/gxmessage/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 20450 2010-07-08 10:59:33Z spupykin $ +# $Id: PKGBUILD 58826 2011-11-18 16:48:21Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Geoffroy Carrier <geoffroy.carrier@koon.fr> # Contributor: Jaroslav Lichtblau <tu@dragonlord.cz> @@ -11,7 +11,7 @@ arch=('i686' 'x86_64' 'mips64el') url="http://homepages.ihug.co.nz/~trmusson/programs.html#gxmessage" license=('GPL') depends=('gtk2' 'desktop-file-utils') -makedepends=('pkgconfig') +makedepends=('pkgconfig' 'intltool') install=$pkgname.install source=(http://homepages.ihug.co.nz/~trmusson/stuff/$pkgname-$pkgver.tar.gz $pkgname.desktop) @@ -20,9 +20,9 @@ md5sums=('7c94c714ebedbfa2db2d645cc4a4092a' build() { cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr --mandir=/usr/share/man || return 1 - make || return 1 - make DESTDIR="$pkgdir" install || return 1 + ./configure --prefix=/usr --mandir=/usr/share/man + make + make DESTDIR="$pkgdir" install install -D -m644 "$srcdir/$pkgname.desktop" \ "${pkgdir}/usr/share/applications/$pkgname.desktop" } diff --git a/community/haddock/PKGBUILD b/community/haddock/PKGBUILD index 7c3572523..506005a9d 100644 --- a/community/haddock/PKGBUILD +++ b/community/haddock/PKGBUILD @@ -1,40 +1,45 @@ -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> +# $Id: PKGBUILD 58668 2011-11-17 12:39:33Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Vesa Kaihlavirta <vesa@archlinux.org> # Contributor: Arch Haskell Team <arch-haskell@haskell.org> -# As generated by cabal2arch 0.7.6 pkgname=haddock pkgver=2.9.2 -pkgrel=2 -pkgdesc="Documentation-generation tool for Haskell libraries" -url="http://hackage.haskell.org/package/${pkgname}" +pkgrel=3 +pkgdesc="Tool for generating documentation for Haskell libraries" +url="http://hackage.haskell.org/package/$pkgname" license=('custom:BSD3') arch=('i686' 'x86_64' 'mips64el') -makedepends=(alex happy) -depends=(ghc=7.0.3-2 sh 'haskell-mtl=2.0.1.0-3.1' 'haskell-xhtml=3000.2.0.1-7.1' 'haskell-ghc-paths=0.1.0.8-4.1') -options=('strip') -source=(http://hackage.haskell.org/packages/archive/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz) -install=${pkgname}.install +makedepends=('alex' 'happy') +depends=('ghc' 'haskell-mtl' 'haskell-xhtml>=3000.2' 'haskell-ghc-paths') +options=(strip) +install=haddock.install +source=("http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz") +md5sums=('04928e132827a1da20ace52babb43e47') build() { - cd ${srcdir}/${pkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \ - --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh + cd "$srcdir/$pkgname-$pkgver" + + #sed -i 's:ghc >= 7.2 && < 7.4:ghc:' haddock.cabal + runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \ + --docdir=/usr/share/doc/"$pkgname" --libsubdir=\$compiler/site-local/\$pkgid + runhaskell Setup build + runhaskell Setup haddock + runhaskell Setup register --gen-script + runhaskell Setup unregister --gen-script + sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh } package() { - cd ${srcdir}/${pkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${pkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE - mv $pkgdir/usr/bin/haddock $pkgdir/usr/bin/haddock-cabal + cd "$srcdir/$pkgname-$pkgver" + + install -Dm744 register.sh "$pkgdir/usr/share/haskell/$pkgname/register.sh" + install -m744 unregister.sh "$pkgdir/usr/share/haskell/$pkgname/unregister.sh" + install -dm755 "$pkgdir/usr/share/doc/ghc/html/libraries" + ln -s "/usr/share/doc/$pkgname/html" "$pkgdir/usr/share/doc/ghc/html/libraries/$pkgname" + runhaskell Setup copy --destdir="$pkgdir" + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE" + mv "$pkgdir/usr/bin/haddock" "$pkgdir/usr/bin/haddock-cabal" } -md5sums=('04928e132827a1da20ace52babb43e47') +# vim:set ts=2 sw=2 et: diff --git a/community/haddock/haddock.install b/community/haddock/haddock.install index 278da355e..97cdaefdc 100644 --- a/community/haddock/haddock.install +++ b/community/haddock/haddock.install @@ -1,18 +1,25 @@ +pkgname=haddock HS_DIR=usr/share/haskell/haddock -post_install() { + +post_upgrade() { ${HS_DIR}/register.sh &> /dev/null (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) &> /dev/null } -pre_upgrade() { - ${HS_DIR}/unregister.sh &> /dev/null -} -post_upgrade() { - ${HS_DIR}/register.sh &> /dev/null + +post_remove() { (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) &> /dev/null } + pre_remove() { ${HS_DIR}/unregister.sh &> /dev/null } -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) &> /dev/null + +post_install() { + post_upgrade +} + +pre_upgrade() { + pre_remove } + +# vim:set ts=2 sw=2 et: diff --git a/community/hashcash/PKGBUILD b/community/hashcash/PKGBUILD index 35ef2038d..24ba4a3bf 100644 --- a/community/hashcash/PKGBUILD +++ b/community/hashcash/PKGBUILD @@ -1,22 +1,24 @@ -# $Id: PKGBUILD 5144 2009-11-07 00:41:40Z ibiru $ +# $Id: PKGBUILD 58693 2011-11-17 15:59:12Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Charles Mauch <cmauch@gmail.com> pkgname=hashcash pkgver=1.22 pkgrel=2 -pkgdesc="Hashcash is a denial-of-service counter measure tool for email/spam." +pkgdesc="a denial-of-service counter measure tool for email/spam." arch=('i686' 'x86_64' 'mips64el') url="http://www.hashcash.org" license=('GPL') depends=( 'glibc' ) -source=(http://www.hashcash.org/source/${pkgname}-${pkgver}.tgz) -md5sums=(31fae207061841dffc7b90ee18e3d0fa) +source=(http://www.hashcash.org/source/${pkgname}-${pkgver}.tgz) +md5sums=('31fae207061841dffc7b90ee18e3d0fa') build() { cd ${srcdir}/${pkgname}-${pkgver} if [ "${CARCH}" = "x86_64" ]; then - make generic-openssl || return 1 - else make x86-openssl || return 1 + make generic-openssl + else + make x86-openssl fi install -Dm755 hashcash ${pkgdir}/usr/bin/hashcash install -Dm755 sha1 ${pkgdir}/usr/bin/sha1 diff --git a/community/haskell-glib/PKGBUILD b/community/haskell-glib/PKGBUILD index 82d9fca13..3df001441 100644 --- a/community/haskell-glib/PKGBUILD +++ b/community/haskell-glib/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 57333 2011-10-25 21:58:40Z spupykin $ +# $Id: PKGBUILD 58778 2011-11-18 14:12:48Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=haskell-glib @@ -9,7 +9,7 @@ url="http://hackage.haskell.org/package/glib" license=('LGPL2.1') arch=('i686' 'x86_64') depends=('ghc' 'glib2') -makedepends=("haskell-gtk2hs-buildtools=$pkgver") +makedepends=("gtk2hs-buildtools=$pkgver") options=('strip') install=gtk2hs-glib.install provides=('gtk2hs-glib') diff --git a/community/hex-a-hop/PKGBUILD b/community/hex-a-hop/PKGBUILD index 68f12f526..31a4276db 100644 --- a/community/hex-a-hop/PKGBUILD +++ b/community/hex-a-hop/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 42002 2011-03-11 13:44:37Z spupykin $ +# $Id: PKGBUILD 58758 2011-11-18 13:12:19Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: insulae <insulae@gmail.com> @@ -12,7 +12,7 @@ license=('GPL') depends=('sdl_mixer' 'sdl_ttf' 'gcc-libs') makedepends=() options=(force) -source=("https://downloads.sourceforge.net/project/hexahop/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz" +source=("http://downloads.sourceforge.net/project/hexahop/$pkgver/hex-a-hop-$pkgver.tar.gz" "hex-a-hop.desktop") md5sums=('cc8d065c2cc0fce9e08852b8c465175e' '048ff7975024ae1eda3164620f594c09') diff --git a/community/icewm-utils/PKGBUILD b/community/icewm-utils/PKGBUILD index 539b6daf1..6b0e5ffca 100644 --- a/community/icewm-utils/PKGBUILD +++ b/community/icewm-utils/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 27018 2010-09-16 17:37:18Z schuay $ +# $Id: PKGBUILD 58602 2011-11-16 15:27:25Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Dominika Solarz <dominikasolarz@gmail.com> @@ -17,7 +17,7 @@ _iconcvtver=1.0 _rrunver=0.5 _mergeprefsver=0.5 -pkgrel=5 +pkgrel=6 pkgdesc="Suite of tools for IceWM" arch=(i686 x86_64 'mips64el') license=("GPL") @@ -66,11 +66,10 @@ build() { # python2 fix for file in $(find . -name '*.py' -print); do - sed -i 's_#!.*/usr/bin/python_#!/usr/bin/python2_' $file - sed -i 's_#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file + sed -i 's_#!.*/usr/bin/python$_#!/usr/bin/python2_' $file + sed -i 's_#!.*/usr/bin/env.*python$_#!/usr/bin/env python2_' $file done - (cd icets-$_tsver && patch -p0 <$srcdir/icets-fix-icewmtray-crash.diff) cd $srcdir/icemc-$_mcver diff --git a/community/iniparser/PKGBUILD b/community/iniparser/PKGBUILD index 6ee74ba3c..f7ddc40de 100644 --- a/community/iniparser/PKGBUILD +++ b/community/iniparser/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 43048 2011-03-23 21:45:17Z spupykin $ +# $Id: PKGBUILD 58761 2011-11-18 13:28:12Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Roman Kyrylych <Roman.Kyrylych@gmail.com> # Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com> @@ -11,9 +11,8 @@ arch=('i686' 'x86_64' 'mips64el') url="http://ndevilla.free.fr/iniparser/" license=('MIT') depends=() -options=(force) source=(http://ndevilla.free.fr/iniparser/$pkgname-$pkgver.tar.gz) -md5sums=('cded4eba694beed39ec932fc6c64e010') +md5sums=('133d955064d107a4fcb7739214356ce8') build() { cd $srcdir/$pkgname diff --git a/community/ipsec-tools/PKGBUILD b/community/ipsec-tools/PKGBUILD index dde4114bb..68555e52d 100644 --- a/community/ipsec-tools/PKGBUILD +++ b/community/ipsec-tools/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 45815 2011-04-29 12:08:18Z spupykin $ +# $Id: PKGBUILD 58775 2011-11-18 14:08:01Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Allan Henriksen <allan.henriksen@gmail.com> @@ -9,6 +9,7 @@ pkgdesc="KAME IPSec tools ported to Linux" arch=('i686' 'x86_64' 'mips64el') url="http://ipsec-tools.sourceforge.net/" depends=('readline' 'openssl' 'krb5') +makedepends=('linux-headers') license=('GPL') options=('!makeflags' '!libtool') source=(http://downloads.sourceforge.net/sourceforge/ipsec-tools/$pkgname-$pkgver.tar.bz2 diff --git a/community/javasqlite/PKGBUILD b/community/javasqlite/PKGBUILD index db11165a8..64157d8c6 100644 --- a/community/javasqlite/PKGBUILD +++ b/community/javasqlite/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 42275 2011-03-15 23:31:24Z ebelanger $ +# $Id: PKGBUILD 58850 2011-11-19 00:04:26Z guillaume $ # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> pkgname=javasqlite -pkgver=20110106 +pkgver=20110827 pkgrel=1 pkgdesc="Java support for SQLite database engine" arch=('i686' 'x86_64' 'mips64el') url="http://www.ch-werner.de/javasqlite/" license=('BSD') -depends=('java-runtime') -makedepends=('java-environment' 'sqlite3') +depends=('java-runtime<7') +makedepends=('java-environment<7' 'sqlite3') options=('!libtool') source=(http://www.ch-werner.de/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('542a7de8af0186c61d2d68af1c14242e') -sha1sums=('13af516c83cf93a1809de950de76b4b0403a2caa') +md5sums=('6fb577b1632425ddcf45f439886623b9') +sha1sums=('b64eb3955cfba2388dd0cda7a9d5a5ff46db22e9') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/kovpn/PKGBUILD b/community/kovpn/PKGBUILD index 6bf0df2f1..aba4638d0 100644 --- a/community/kovpn/PKGBUILD +++ b/community/kovpn/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 9444 2010-01-25 14:13:42Z spupykin $ +# $Id: PKGBUILD 58772 2011-11-18 14:01:32Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Douglas Soares de Andrade <dsandrade@gmail.com> pkgname=kovpn pkgver=0.3pre7 _pkgver=0.3.pre7 -pkgrel=4 +pkgrel=5 pkgdesc="An OpenVPN client management interface for KDE" arch=('i686' 'x86_64' 'mips64el') url="http://www.kde-apps.org/content/show.php?content=37043" @@ -14,27 +14,26 @@ depends=('openvpn' 'kdelibs3' 'xdg-utils') makedepends=('automake' 'autoconf') options=('libtool') install=kovpn.install -source=("http://projects.fslab.de/projects/kovpn/chrome/site/kovpn-${_pkgver}.tar.bz2" - "kovpn-disable-dcop.patch::http://bugs.archlinux.org/task/15464?getfile=4173" - 'traywindow_x86_64.patch') +DLAGENTS=('ftp::/usr/bin/wget -c --passive-ftp -t 3 --waitretry=3 -O %o %u' + 'http::/usr/bin/wget -c -t 3 --waitretry=3 --no-check-certificate -O %o %u' + 'https::/usr/bin/wget -c -t 3 --waitretry=3 --no-check-certificate -O %o %u') +source=("https://projects.fslab.de/projects/kovpn/chrome/site/kovpn-${_pkgver}.tar.bz2" + "kovpn-disable-dcop.patch::https://bugs.archlinux.org/task/15464?getfile=4173") md5sums=('19b61cf9f84088baffbd5bb0a287422c' - '21171b74f76289daea1cc61eedaa4dba' - 'bf6218bf2686b6fe41874d5df4e71d63') + '21171b74f76289daea1cc61eedaa4dba') build() { - cd $startdir/src/$pkgname-$_pkgver + cd $srcdir/$pkgname-$_pkgver + unset LDFLAGS . /etc/profile.d/qt3.sh export PATH=$QTDIR/bin:$PATH export QMAKESPEC=$QTDIR/mkspecs/linux-g++ patch -Np1 -i ../kovpn-disable-dcop.patch - - [ "$CARCH" = "x86_64" ] && patch -Np0 -i ../traywindow_x86_64.patch sed -i 's#automake\*1.10\*#automake*1.10* | automake*1.11*#' admin/cvs.sh - make -f admin/Makefile.common cvs ./configure --prefix=/opt/kde --without-arts --with-qt-dir=/opt/qt - make || return 1 - make prefix=$startdir/pkg/usr install + make + make prefix=$pkgdir/usr install } diff --git a/community/ksshaskpass/PKGBUILD b/community/ksshaskpass/PKGBUILD index d72b21bab..4ecd121e4 100644 --- a/community/ksshaskpass/PKGBUILD +++ b/community/ksshaskpass/PKGBUILD @@ -2,7 +2,7 @@ pkgname=ksshaskpass pkgver=0.5.3 -pkgrel=2 +pkgrel=3 pkgdesc='KDE4 implementation of ssh-askpass with Kwallet integration' url='http://www.kde-apps.org/content/show.php/Ksshaskpass?content=50971' license=('GPL') @@ -17,19 +17,19 @@ md5sums=('05dad7745e9d92b08bd86e7ab7a9540d' '70396ba019ae05cc91502456f548caff') build() { - cd $srcdir/$pkgname-$pkgver + cd "$srcdir"/$pkgname-$pkgver cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release make } package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install + cd "$srcdir"/$pkgname-$pkgver + make DESTDIR="$pkgdir" install # Remove useless desktop file. - rm -rf "$pkgdir/usr/share/applications" + rm -rf "$pkgdir"/usr/share/applications # Documentation requires that this application is installed as /usr/bin/ssh-askpass. # But this way is cleaner. # Add script to profile.d to set ssh password agent to ksshasskpass. - install -Dm 755 $srcdir/$pkgname.sh $pkgdir/etc/profile.d/$pkgname.sh + install -Dm 755 "$srcdir"/$pkgname.sh "$pkgdir"/etc/profile.d/$pkgname.sh } diff --git a/community/ktechlab/PKGBUILD b/community/ktechlab/PKGBUILD index f032ead3b..04662f644 100644 --- a/community/ktechlab/PKGBUILD +++ b/community/ktechlab/PKGBUILD @@ -1,21 +1,30 @@ -# $Id: PKGBUILD 5614 2009-11-12 14:06:56Z spupykin $ +# $Id: PKGBUILD 58604 2011-11-16 15:28:16Z spupykin $ # Maintainer: JJDaNiMoTh <jjdanimoth.aur@gmail.com> + pkgname=ktechlab pkgver=0.3.7 -pkgrel=1 +pkgrel=3 pkgdesc="IDE for electronic circuits and microcontrollers" arch=('i686' 'x86_64' 'mips64el') url="http://sourceforge.net/projects/ktechlab" license=("GPL") depends=('kdelibs3' 'gputils' 'gpsim') -makedepends=() -source=(http://downloads.sourceforge.net/sourceforge/ktechlab/${pkgname}-${pkgver}.tar.bz2) -md5sums=('8e778ef8ce6d0dd4539f5532c933f6bf') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2" + "$pkgname-gcc45.patch::http://patch-tracker.debian.org/patch/series/dl/ktechlab/0.3.7-10/40-gcc-4.5.patch") +md5sums=('8e778ef8ce6d0dd4539f5532c933f6bf' + '126a04255a8288a7ee42fe47a81c0079') build() { - cd ${startdir}/src/${pkgname}-$pkgver + . /etc/profile.d/qt3.sh + cd "${srcdir}/${pkgname}-$pkgver" + patch -p1 <$srcdir/$pkgname-gcc45.patch + ./configure --prefix=/opt/kde \ + --disable-debug \ + --without-arts + make +} - ./configure --prefix=/opt/kde --disable-debug --without-arts - make || return 1 - make DESTDIR=${startdir}/pkg install +package() { + cd "${srcdir}/${pkgname}-$pkgver" + make DESTDIR="${pkgdir}" install } diff --git a/community/kvirc/PKGBUILD b/community/kvirc/PKGBUILD index e711e233e..2c1779253 100644 --- a/community/kvirc/PKGBUILD +++ b/community/kvirc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 58525 2011-11-13 15:45:32Z andrea $ +# $Id: PKGBUILD 58785 2011-11-18 14:18:17Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=kvirc @@ -23,7 +23,7 @@ build() { -DWANT_KDE4=OFF \ -DWANT_PERL=ON \ -DWANT_PHONON=OFF \ - -DCMAKE_INSTALL_PREFIX=/usr . + -DCMAKE_INSTALL_PREFIX=/usr make } diff --git a/community/kvpnc/PKGBUILD b/community/kvpnc/PKGBUILD index de1568042..ff3de078c 100644 --- a/community/kvpnc/PKGBUILD +++ b/community/kvpnc/PKGBUILD @@ -1,27 +1,33 @@ -# $Id: PKGBUILD 18438 2010-06-04 15:44:00Z spupykin $ +# $Id: PKGBUILD 58789 2011-11-18 14:22:42Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Danial Olsen <do@meyl.fo> +# Contributor: Danial Olsen <do@meyl.fo> pkgname=kvpnc pkgver=0.9.6a pkgrel=1 -pkgdesc="KVpnc is a KDE Desktop Environment frontend for various vpn clients" +pkgdesc="A KDE Desktop Environment frontend for various vpn clients" arch=(i686 x86_64 'mips64el') url="http://home.gna.org/kvpnc/" license=("GPL") depends=('kdelibs' 'hicolor-icon-theme') makedepends=('cmake' 'automoc4') install=kvpnc.install -options=(force) source=(http://download.gna.org/$pkgname/$pkgname-${pkgver}-kde4.tar.bz2) md5sums=('bf8b7224284f5d3f8ad5235c599fe9e7') build() { - cd $srcdir/${pkgname}-${pkgver}-kde4 - export LDFLAGS=-lX11 - cmake . -DCMAKE_INSTALL_PREFIX=/usr - make || return 1 - make DESTDIR=$pkgdir install || return 1 + cd $srcdir + mkdir build + cd build + cmake ../${pkgname}-${pkgver}-kde4 \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release + make +} + +package() { + cd $srcdir/build + make DESTDIR=$pkgdir install } diff --git a/community/kydpdict/PKGBUILD b/community/kydpdict/PKGBUILD index d217794f6..b53c4a581 100644 --- a/community/kydpdict/PKGBUILD +++ b/community/kydpdict/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 23962 2010-08-18 13:20:20Z lcarlier $ +# $Id: PKGBUILD 58593 2011-11-16 14:44:57Z andrea $ # Contributor: Jaroslaw Swierczynski <swiergot@juvepoland.com> pkgname=kydpdict @@ -9,7 +9,7 @@ arch=('i686' 'x86_64' 'mips64el') url="http://ytm.bossstation.dnsalias.org/html/kydpdict.html" license=('GPL') depends=('qt3') -install=(kydpdict.install) +install=kydpdict.install source=(http://ytm.bossstation.dnsalias.org/src/$pkgname-$pkgver.tar.bz2 \ $pkgname.png $pkgname.desktop) md5sums=('bf8aa06d4a3bbe401d7972e01c07609d' diff --git a/community/leafnode/PKGBUILD b/community/leafnode/PKGBUILD index 06ddb1d8b..eb14ece2a 100644 --- a/community/leafnode/PKGBUILD +++ b/community/leafnode/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 18744 2010-06-14 12:55:42Z spupykin $ +# $Id: PKGBUILD 58812 2011-11-18 15:35:58Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # You need an news user and group to build this package pkgname=leafnode pkgver=1.11.8 -pkgrel=1 +pkgrel=2 pkgdesc="implements a store & forward NNTP proxy (client and server) with IPv4 and IPv6" arch=('i686' 'x86_64' 'mips64el') url="http://leafnode.sourceforge.net/" -depends=(pcre xinetd) +depends=('pcre' 'xinetd') license=('GPL') -install=(leafnode.install) +install=leafnode.install options=(!emptydirs) -backup=(etc/xinet.d/leafnode) +backup=('etc/xinetd.d/leafnode') source=(http://downloads.sf.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2 leafnode.xinetd) md5sums=('a3edafeb854efaa3fbb0f7951d02160f' @@ -20,10 +20,11 @@ md5sums=('a3edafeb854efaa3fbb0f7951d02160f' build() { cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --localstatedir=/var --sysconfdir=/etc/leafnode - make || return 1 - make DESTDIR=$pkgdir install && \ - chown -R root.root $pkgdir && \ + ./configure --prefix=/usr --localstatedir=/var --sysconfdir=/etc/leafnode \ + --with-user=9 \ + --with-group=13 + make + make DESTDIR=$pkgdir install + chown -R root.root $pkgdir install -D -m0644 $srcdir/leafnode.xinetd $pkgdir/etc/xinetd.d/leafnode } - diff --git a/community/leafnode/leafnode.install b/community/leafnode/leafnode.install index eb942009e..f1a046e1c 100644 --- a/community/leafnode/leafnode.install +++ b/community/leafnode/leafnode.install @@ -1,10 +1,8 @@ post_install() { echo "-- Adding user 'news' and group 'news', chowning /var/spool/news" - groupadd -K GID_MIN=5000 news &>/dev/null - gid=`cat /etc/group | grep news | cut -d: -f 3` - useradd -u $gid -g news -d /var/spool/news -s /bin/false news &>/dev/null + grep -e "^news:" /etc/group 2>&- >&- || groupadd -g 13 -r news 2>&- >&- + grep -e "^news:" /etc/passwd 2>&- >&- || useradd -u 9 -r -m -g news news 2>&- >&- chown -R root:news etc/leafnode - # create dir if necessary if [ ! -d var/spool/news ]; then install -d -m 770 -o news -g news var/spool/news @@ -12,9 +10,6 @@ post_install() { } post_remove() { - echo "-- Removing user 'news' and group 'news', deleting spool directory" - userdel news &>/dev/null - groupdel news &>/dev/null + echo "-- Deleting spool directory" rm -rf var/spool/news } - diff --git a/community/libdlna/PKGBUILD b/community/libdlna/PKGBUILD index 57c0ec859..f3fd73aa4 100644 --- a/community/libdlna/PKGBUILD +++ b/community/libdlna/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 58401 2011-11-12 17:17:29Z ibiru $ +# $Id: PKGBUILD 58580 2011-11-15 20:11:36Z spupykin $ # Maintainer: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com> # Contributor: kastor <kastor@fobos.org.ar> + pkgname=libdlna pkgver=0.2.3 -pkgrel=9 +pkgrel=10 pkgdesc="An open-source implementation of DLNA (Digital Living Network Alliance) standards " url="http://libdlna.geexbox.org" license=("LGPL") @@ -12,20 +13,19 @@ options=('!libtool' '!makeflags') # not parallel safe, error find -ldlna makedepends=('ctags') depends=('glibc' 'ffmpeg') source=("http://libdlna.geexbox.org/releases/${pkgname}-${pkgver}.tar.bz2" "libdlna-0.2.3-libavcodec-libavformat-include-paths.patch" "ffmpeg-0.8.patch") +md5sums=('2c974f95b711e5fd07f78fc4ebfcca66' + '937f1aebf930571127856056bd1d3959' + 'a5c9f58233fc7fc79b5fe550b297273b') build() { cd ${srcdir}/${pkgname}-${pkgver} patch -Np1 -i $srcdir/libdlna-0.2.3-libavcodec-libavformat-include-paths.patch patch -Np1 -i $srcdir/ffmpeg-0.8.patch -# sed -i 's|ffmpeg/avformat.h|libavformat/avformat.h|' ./configure src/profiles.h src/*.c -# sed -i 's|ffmpeg/avcodec.h|libavcodec/avcodec.h|' ./configure src/profiles.h src/*.c ./configure --prefix=/usr --includedir=/usr/include/libavformat - make -j1 # not parallel safe, error find -ldlna + make -j1 # not parallel safe, error find -ldlna } + package() { cd ${srcdir}/${pkgname}-${pkgver} make INSTALL=/bin/install DESTDIR=${pkgdir} install } -md5sums=('2c974f95b711e5fd07f78fc4ebfcca66' - '937f1aebf930571127856056bd1d3959' - 'a5c9f58233fc7fc79b5fe550b297273b') diff --git a/community/libdnet/PKGBUILD b/community/libdnet/PKGBUILD index 819d9fb90..433626ab2 100644 --- a/community/libdnet/PKGBUILD +++ b/community/libdnet/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 27071 2010-09-17 12:26:08Z schuay $ +# $Id: PKGBUILD 58611 2011-11-16 15:32:03Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: James Fryman <jfryman@gmail.com> @@ -9,7 +9,7 @@ pkgdesc="A simplified, portable interface to several low-level networking routin arch=(i686 x86_64 'mips64el') makedepends=(python2) optdepends=(python2) -install=(libdnet.install) +install=libdnet.install license=("BSD") url="http://code.google.com/p/libdnet/" options=('!libtool') diff --git a/community/libfbclient/PKGBUILD b/community/libfbclient/PKGBUILD index ab0e8f94d..5f9ac10f4 100755 --- a/community/libfbclient/PKGBUILD +++ b/community/libfbclient/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 58129 2011-11-06 19:02:46Z lcarlier $ +# $Id: PKGBUILD 58848 2011-11-18 21:30:35Z lcarlier $ # Maintainer: Carlier Laurent <lordheavym@gmail.com> # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> @@ -10,6 +10,7 @@ arch=('i686' 'x86_64' 'mips64el') url="http://www.firebirdsql.org/" license=('custom') depends=('gcc-libs' 'icu') +options=('!makeflags') source=(http://downloads.sourceforge.net/firebird/Firebird-$pkgver-0.tar.bz2 LICENSE) md5sums=('1772fba4f09c8fc84d989282405f90fd' diff --git a/community/libmatchbox/PKGBUILD b/community/libmatchbox/PKGBUILD index 1da61da49..0aafb6d11 100644 --- a/community/libmatchbox/PKGBUILD +++ b/community/libmatchbox/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 42735 2011-03-20 08:11:51Z spupykin $ +# $Id: PKGBUILD 58821 2011-11-18 16:44:16Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Henrique C. Alves <hcarvalhoalves@gmail.com> @@ -10,8 +10,8 @@ arch=('i686' 'x86_64' 'mips64el') license=('LGPL') depends=('pango' 'libpng' 'libjpeg>=7' 'xsettings-client' 'libxext') options=('!libtool') -url="http://projects.o-hand.com/matchbox" -source=(http://projects.o-hand.com/matchbox/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2) +url="http://matchbox-project.org/" +source=(http://matchbox-project.org/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2) md5sums=('9f73e7515cc4679171a5db180dc1343b') build() { diff --git a/community/librcc/PKGBUILD b/community/librcc/PKGBUILD index 61679f035..3bcfc4abd 100644 --- a/community/librcc/PKGBUILD +++ b/community/librcc/PKGBUILD @@ -1,6 +1,5 @@ -# $Id: PKGBUILD 49369 2011-06-15 09:26:07Z spupykin $ +# $Id: PKGBUILD 58641 2011-11-16 23:02:02Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=librcc pkgver=0.2.6 @@ -12,10 +11,11 @@ license=('GPL') depends=(aspell enca libxml2 db librcd) makedepends=(patch gtk gtk2) install=librcc.install +options=('!libtool') source=(http://downloads.sourceforge.net/rusxmms/${pkgname}-${pkgver}.tar.bz2 - librcc-strnlen.patch) + librcc-strnlen.patch) md5sums=('9bbf248c7312c73c0b6ca19b9c5a2af1' - '040313d1d8f166ccf2b128cea4c05f21') + '040313d1d8f166ccf2b128cea4c05f21') build() { cd ${startdir}/src/$pkgname-${pkgver} @@ -32,10 +32,6 @@ package() { make DESTDIR=$startdir/pkg install - rm -f $startdir/pkg/usr/lib/*.la - rm -f $startdir/pkg/usr/lib/rcc/engines/*.a - rm -f $startdir/pkg/usr/lib/rcc/engines/*.la - make -C examples make -C examples install DESTDIR=$startdir/pkg rm -f $startdir/pkg/usr/bin/example* diff --git a/community/linuxtv-dvb-apps/PKGBUILD b/community/linuxtv-dvb-apps/PKGBUILD index a81c5e802..1feef95e5 100644 --- a/community/linuxtv-dvb-apps/PKGBUILD +++ b/community/linuxtv-dvb-apps/PKGBUILD @@ -1,37 +1,32 @@ -# $Id: PKGBUILD 21619 2010-07-16 20:05:39Z tdziedzic $ +# $Id: PKGBUILD 58910 2011-11-20 04:55:32Z jconder $ +# Maintainer: Jonathan Conder <jonno.conder@gmail.com> # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> # Contributor: Camille Moncelier <pix@devlife.org> pkgname=linuxtv-dvb-apps -pkgver=1.1.1 -pkgrel=4 -_hgrev=68d20621d93a +pkgver=1452 +pkgrel=1 +_hgrev=d4e8bf5658ce pkgdesc='Viewer programs for DVB cards' arch=('i686' 'x86_64' 'mips64el') url='http://www.linuxtv.org/' license=('GPL') -install=linuxtv-dvb-apps.install -#source=(http://www.linuxtv.org/download/dvb/$pkgname-$pkgver.tar.bz2) -source=("http://linuxtv.org/hg/dvb-apps/archive/${_hgrev}.tar.bz2") -md5sums=('5b43136359d9555a567a76ba28433afc') +source=("http://linuxtv.org/hg/dvb-apps/archive/$_hgrev.tar.bz2") +sha256sums=('c3bb865ea5c8dd97050d7b3a68ee158dadff50a2fb948d955b3a559be3cf31c5') build() { - cd dvb-apps-${_hgrev} - + cd "dvb-apps-$_hgrev" rm -rf include make -C lib - make -C util } package() { - cd dvb-apps-${_hgrev} + cd "dvb-apps-$_hgrev" - make -C lib DESTDIR=${pkgdir} install + make -C lib DESTDIR="$pkgdir" install + make -C util DESTDIR="$pkgdir" install - make -C util DESTDIR=${pkgdir} install - - chmod 755 ${pkgdir}/usr/lib/*.so* + chmod 755 "$pkgdir"/usr/lib/*.so* } - diff --git a/community/mcabber/PKGBUILD b/community/mcabber/PKGBUILD index e12dce92d..6f3eeabaa 100644 --- a/community/mcabber/PKGBUILD +++ b/community/mcabber/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 34137 2010-12-03 13:48:45Z ttopper $ +# $Id: PKGBUILD 58853 2011-11-19 00:17:45Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Contributor: 3ED <kas1987@o2.pl> @@ -12,7 +12,7 @@ url="http://www.lilotux.net/~mikael/mcabber/" license=('GPL') depends=('ncurses' 'glib2' 'loudmouth' 'gpgme' 'libotr' 'aspell') makedepends=('pkgconfig') -options=('!libtool' 'force') +options=('!libtool') source=(http://www.lilotux.net/~mikael/mcabber/files/$pkgname-${pkgver/_/-}.tar.bz2) md5sums=('fe96beab30f535d5d6270fd1719659b4') diff --git a/community/me-tv/PKGBUILD b/community/me-tv/PKGBUILD index 067b2a338..75d1b8c87 100644 --- a/community/me-tv/PKGBUILD +++ b/community/me-tv/PKGBUILD @@ -6,15 +6,15 @@ pkgname=me-tv pkgver=2.0.1 -pkgrel=1 +pkgrel=2 pkgdesc="A GTK desktop application for watching digital television services that use the DVB standard" arch=('i686' 'x86_64' 'mips64el') url="https://launchpad.net/me-tv" license=('GPL') depends=('glibmm' 'gtkmm' 'gconfmm' 'glib2' 'xine-lib' 'sqlite3' 'linuxtv-dvb-apps' 'libunique' 'libxml++' 'vlc' 'gstreamer0.10-base') makedepends=('intltool') -install=me-tv.install -source=(http://launchpad.net/${pkgname}/${pkgver:0:3}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz) +install='me-tv.install' +source=("http://launchpad.net/${pkgname}/${pkgver:0:3}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz") options=('!emptydirs') md5sums=('7cda820b795f2fea522ba3de5e312483') diff --git a/community/mixxx/PKGBUILD b/community/mixxx/PKGBUILD index b8855f7f3..2748143b3 100644 --- a/community/mixxx/PKGBUILD +++ b/community/mixxx/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 40367 2011-02-23 14:19:01Z lfleischer $ +# $Id: PKGBUILD 58662 2011-11-17 11:26:44Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Ali H. Caliskan <ali.h.caliskan AT gmail DOT com> # Contributor: Ryan Coyner <rcoyner@gmail.com> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> pkgname=mixxx -pkgver=1.9.0 +pkgver=1.9.2 pkgrel=1 pkgdesc="Free, open source software for digital DJ'ing." arch=('i686' 'x86_64' 'mips64el') @@ -15,14 +15,22 @@ depends=('fftw' 'libid3tag' 'libmad' 'libogg' 'libshout' 'libsndfile' 'portaudio 'qt>=4.5' 'taglib') makedepends=('mesa' 'scons' 'libshout') source=("http://downloads.mixxx.org/${pkgname}-${pkgver}/${pkgname}-${pkgver}-src.tar.gz") -md5sums=('ea78fc81922e6c7d85d6afffd2e526b1') +md5sums=('f84095951f66b12af5cf45d19200ff82') build() { - cd "${srcdir}/${pkgname}-${pkgver}"\~* + cd "${srcdir}/${pkgname}-${pkgver}" + + # GCC segfault workaround (fixes FS#26716) + CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=2/} + scons qtdir=/usr/lib/qt prefix=/usr install_root="${pkgdir}/usr" } package() { - cd "${srcdir}/${pkgname}-${pkgver}"\~* + cd "${srcdir}/${pkgname}-${pkgver}" + + # GCC segfault workaround (fixes FS#26716) + CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=2/} + scons qtdir=/usr/lib/qt prefix=/usr install_root="${pkgdir}/usr" install } diff --git a/community/netsurf/PKGBUILD b/community/netsurf/PKGBUILD index 9e19abe7b..367a4e688 100644 --- a/community/netsurf/PKGBUILD +++ b/community/netsurf/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 56237 2011-10-03 16:13:35Z arodseth $ +# $Id: PKGBUILD 58607 2011-11-16 15:29:25Z spupykin $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Paulo Matias <matiasΘarchlinux-br·org> # Contributor: Georgij Kondratjev <smpuj@bk.ru> @@ -14,7 +14,7 @@ depends=('libmng' 'curl' 'libglade' 'librsvg' 'desktop-file-utils' 'libnsbmp' 'l makedepends=('re2c' 'lcms') provides=('netsurf') conflicts=('netsurf') -install=("${pkgname}.install") +install="${pkgname}.install" source=("${pkgname}.desktop" "${pkgname}.install" "http://ubuntu.allmyapps.com/data/n/e/netsurf-netsurf-web-browser/icon_48x48_netsurf.png" diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD index f9d565477..406764ab6 100644 --- a/community/nginx/PKGBUILD +++ b/community/nginx/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 57848 2011-11-03 13:37:30Z spupykin $ +# $Id: PKGBUILD 58582 2011-11-15 20:13:02Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Miroslaw Szot <mss@czlug.icis.pcz.pl> @@ -11,7 +11,7 @@ _user=http _group=http pkgname=nginx -pkgver=1.0.9 +pkgver=1.0.10 pkgrel=1 pkgdesc="lightweight HTTP server and IMAP/POP3 proxy server" arch=('i686' 'x86_64' 'mips64el') @@ -34,7 +34,7 @@ backup=("etc/nginx/conf/fastcgi.conf" changelog=changelog source=(http://nginx.org/download/nginx-$pkgver.tar.gz nginx) -md5sums=('bd2bfba1c5bf751bc3361de5e3ac7c4a' +md5sums=('930b297b00fa1018fb0a1dd3e6b7e17e' '0e8032d3ba26c3276e8c7c30588d375f') build() { diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD index 338c5de24..773b77bd5 100644 --- a/community/nodejs/PKGBUILD +++ b/community/nodejs/PKGBUILD @@ -6,7 +6,7 @@ # Contributor: TIanyi Cui <tianyicui@gmail.com> pkgname=nodejs -pkgver=0.6.1 +pkgver=0.6.2 pkgrel=1 pkgdesc='Evented I/O for V8 javascript' arch=('i686' 'x86_64' 'mips64el') @@ -17,7 +17,7 @@ checkdepends=('curl') # curl used for check() optdepends=('openssl: TLS support') options=('!emptydirs') source=("http://nodejs.org/dist/v${pkgver}/node-v${pkgver}.tar.gz") -md5sums=('92b8085967110b0125c192634f127a2b') +md5sums=('875431b2c2e3d0ebf5a676b3d96bf766') build() { cd node-v${pkgver} diff --git a/community/open-vm-tools-modules/PKGBUILD b/community/open-vm-tools-modules/PKGBUILD index b940f264b..b374841e9 100644 --- a/community/open-vm-tools-modules/PKGBUILD +++ b/community/open-vm-tools-modules/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 58321 2011-11-11 11:56:51Z spupykin $ +# $Id: PKGBUILD 58558 2011-11-14 12:47:57Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Krzysztof Raczkowski <raczkow@gmail.com> pkgname=open-vm-tools-modules pkgver=2011.10.26 _pkgsubver=514583 -pkgrel=2 +pkgrel=3 pkgdesc="kernel modules for the open source implementation of VMware Tools" arch=('i686' 'x86_64' 'mips64el') url="http://open-vm-tools.sourceforge.net/" @@ -14,8 +14,10 @@ makedepends=('libdnet' 'icu' 'uriparser' 'linux-headers') depends=("linux") install=$pkgname.install options=('!strip') -source=("http://downloads.sourceforge.net/open-vm-tools/open-vm-tools-$pkgver-${_pkgsubver}.tar.gz") -md5sums=('06f299375a91fbcba9d16b5007490023') +source=("http://downloads.sourceforge.net/open-vm-tools/open-vm-tools-$pkgver-${_pkgsubver}.tar.gz" + "modprobe.conf") +md5sums=('06f299375a91fbcba9d16b5007490023' + 'ac9b8e3cb798f5056ca92767ec705117') build() { _kernver=`pacman -Q linux | cut -d . -f 2 | cut -f 1 -d -` @@ -40,4 +42,6 @@ package() { done sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='$KERNEL_VERSION'/" $startdir/$pkgname.install gzip $pkgdir/lib/modules/extramodules-3.${_kernver}-ARCH/*.ko + + install -D -m 644 ${srcdir}/modprobe.conf ${pkgdir}/etc/modprobe.d/${pkgname}.conf } diff --git a/community/open-vm-tools-modules/modprobe.conf b/community/open-vm-tools-modules/modprobe.conf new file mode 100644 index 000000000..b72fcc61a --- /dev/null +++ b/community/open-vm-tools-modules/modprobe.conf @@ -0,0 +1,2 @@ +#VMware net driver +install pcnet32 /sbin/modprobe -q --ignore-install vmxnet; /sbin/modprobe -q --ignore-install pcnet32 ; /bin/true; diff --git a/community/open-vm-tools-modules/open-vm-tools-modules.install b/community/open-vm-tools-modules/open-vm-tools-modules.install index cdd13e929..187dfb1bb 100644 --- a/community/open-vm-tools-modules/open-vm-tools-modules.install +++ b/community/open-vm-tools-modules/open-vm-tools-modules.install @@ -3,15 +3,8 @@ KERNEL_VERSION='3.1.0-4-ARCH' post_install() { depmod -a -v $KERNEL_VERSION > /dev/null 2>&1 - VMXNET="install pcnet32 /sbin/modprobe -q --ignore-install vmxnet;" - VMXNET="$VMXNET /sbin/modprobe -q --ignore-install pcnet32 $CMDLINE_OPTS;" - VMXNET="$VMXNET /bin/true;" - - echo ">>> Enabling vmxnet driver in /etc/modprobe.d/modprobe.conf" + echo ">>> Enabling vmxnet driver in /etc/modprobe.d/open-vm-tools-modules.conf" echo ">>> (this will disable pcnet32 driver)" - sed "$ a \\\n#VMware net driver\n$VMXNET" -i /etc/modprobe.d/modprobe.conf - echo - echo ">>>" echo ">>> If vmxnet driver doesn't handle your NIC, you have to manually" echo ">>> disable loading of pcnet32 driver" @@ -25,9 +18,6 @@ post_upgrade() { post_remove() { depmod -a -v $KERNEL_VERSION > /dev/null 2>&1 - echo ">>> Disabling vmxnet driver in /etc/modprobe.d/modprobe.conf" - sed "/VMware net driver/,+1 d" -i /etc/modprobe.d/modprobe.conf - echo ">>>" echo ">>> Remember to un-blacklist pcnet32 driver" echo ">>>" diff --git a/community/openssh-askpass/PKGBUILD b/community/openssh-askpass/PKGBUILD index 66a24c3df..848c6e3b5 100644 --- a/community/openssh-askpass/PKGBUILD +++ b/community/openssh-askpass/PKGBUILD @@ -4,7 +4,7 @@ pkgname=openssh-askpass pkgver=1.3.2 -pkgrel=1 +pkgrel=2 pkgdesc='A plasma-like passphrase dialog for ssh' arch=('i686' 'x86_64' 'mips64el') url='http://www.phenix.bnl.gov/WWW/publish/hpereira/software/index.php?page=package&package_list=software_list_qt4&package=openssh-askpass&full=1' @@ -14,8 +14,6 @@ provides=('x11-ssh-askpass') conflicts=('x11-ssh-askpass') source=("http://www.phenix.bnl.gov/WWW/publish/hpereira/software/tgz/$pkgname-$pkgver.tar.gz" "$pkgname.sh") -md5sums=('89ca29f3b21c7ca87829269866dd623b' - '961738244318f3723ba99cdcaac91a21') build() { cd "$srcdir/$pkgname-$pkgver" @@ -27,3 +25,6 @@ package() { make DESTDIR="$pkgdir" install install -Dm755 ../$pkgname.sh "$pkgdir/etc/profile.d/$pkgname.sh" } + +md5sums=('f4ed7ed95c727d1c3963007d9d24bdb8' + '961738244318f3723ba99cdcaac91a21') diff --git a/community/parrot/PKGBUILD b/community/parrot/PKGBUILD index 027162877..e3bed3e31 100644 --- a/community/parrot/PKGBUILD +++ b/community/parrot/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 56087 2011-09-30 23:19:11Z spupykin $ +# $Id: PKGBUILD 58586 2011-11-16 05:16:04Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributer: mpie <michael.kyne-phillips1@ntlworld.com> pkgname=parrot -pkgver=3.8.0 +pkgver=3.10.0 _rel=devel #_rel=stable pkgrel=2 @@ -16,7 +16,7 @@ makedepends=('perl-json') optdepends=('freeglut') options=(!emptydirs !makeflags) source=(ftp://ftp.parrot.org/pub/parrot/releases/${_rel}/$pkgver/parrot-$pkgver.tar.gz) -md5sums=('72bac15a47f01bacef5ad28e45fe08b9') +md5sums=('36a839beaef511f178b0607a03f1ff0f') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/pigeonhole/PKGBUILD b/community/pigeonhole/PKGBUILD index 2ebc948b7..de6de2e74 100644 --- a/community/pigeonhole/PKGBUILD +++ b/community/pigeonhole/PKGBUILD @@ -4,12 +4,12 @@ # This must be built against the version of dovecot being used, # else mail delivery will fail. # Specify the version of dovecot to be used here: -_dcpkgver=2.0.15 +_dcpkgver=2.0.16 # Make sure to bump pkgrel if changing this. pkgname=pigeonhole pkgver=0.2.4 -pkgrel=2 +pkgrel=3 pkgdesc="Fully rewritten Sieve implementation for Dovecot v2.0" arch=('i686' 'x86_64' 'mips64el') url="http://pigeonhole.dovecot.org/" diff --git a/community/pragha/PKGBUILD b/community/pragha/PKGBUILD index f172fb294..44bdf517d 100755 --- a/community/pragha/PKGBUILD +++ b/community/pragha/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 58369 2011-11-12 14:16:49Z ttopper $ +# $Id: PKGBUILD 58664 2011-11-17 11:39:42Z ttopper $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Contributor: Alois Nespor <alois.nespor@gmail.com> # Contributor: JerichoKru <jerichokru(AT)htomail.com> pkgname=pragha -pkgver=0.99.1 +pkgver=0.99.1.1 pkgrel=1 pkgdesc="A lightweight GTK+ music manager - fork of Consonance Music Manager." arch=('i686' 'x86_64' 'mips64el') @@ -18,7 +18,7 @@ optdepends=('notification-daemon: OSD notification') replaces=('dissonance') install=pragha.install source=(http://dissonance.googlecode.com/files/$pkgname-$pkgver.tar.bz2) -sha1sums=('bd3e965da2f602bb7d9c731eccbb4d67e8c70d6c') +sha1sums=('25ff36e8a197f45edf7309072f1bd55785d9843d') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/procstatd/PKGBUILD b/community/procstatd/PKGBUILD index 05d23fbcb..0123c6a68 100644 --- a/community/procstatd/PKGBUILD +++ b/community/procstatd/PKGBUILD @@ -1,4 +1,5 @@ -# $Id: PKGBUILD 5270 2009-11-07 13:16:35Z ibiru $ +# $Id: PKGBUILD 58686 2011-11-17 15:41:14Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Maintainer: Jason Chu <jason@archlinux.org> @@ -11,15 +12,14 @@ license=('GPL') source=(http://downloads.sourceforge.net/herdtools/$pkgname.tar.gz) md5sums=('1fdeaf05ca6337f5c02e76a76c53c407') url="http://www.phy.duke.edu/brahma/" +md5sums=('1fdeaf05ca6337f5c02e76a76c53c407') build() { -cd $startdir/src/$pkgname -# Get rid of the funky mkae install forever bug -sed -i 's/make install/echo/;s/cd watchman/echo/' Makefile -make || return 1 -make INSTDIR=$startdir/pkg/usr install -mkdir ${pkgdir}/usr/share -mv ${pkgdir}/usr/man ${pkgdir}/usr/share/man -#mkdir -p $startdir/pkg/usr/share/procstatd-extras -#cp -R webwatch $startdir/pkg/usr/share/procstatd-extras/ + cd $srcdir/$pkgname + # Get rid of the funky make install forever bug + sed -i 's/make install/echo/;s/cd watchman/echo/' Makefile + make + make INSTDIR=$pkgdir/usr install + mkdir ${pkgdir}/usr/share + mv ${pkgdir}/usr/man ${pkgdir}/usr/share/man } diff --git a/community/puzzles/PKGBUILD b/community/puzzles/PKGBUILD index ab91b797e..fa9d3d803 100644 --- a/community/puzzles/PKGBUILD +++ b/community/puzzles/PKGBUILD @@ -4,7 +4,7 @@ pkgname=puzzles pkgver=9306 -pkgrel=1 +pkgrel=2 pkgdesc="Simon Tatham's Portable Puzzle Collection" arch=('i686' 'x86_64' 'mips64el') url="http://www.chiark.greenend.org.uk/~sgtatham/puzzles/" @@ -12,7 +12,6 @@ license=('MIT') makedepends=('pkgconfig') depends=('gtk2') source=("http://www.chiark.greenend.org.uk/~sgtatham/${pkgname}/${pkgname}-r${pkgver}.tar.gz") -md5sums=('30eac18bcfe1e202003709a8281a81bc') build() { cd ${srcdir}/${pkgname}-r${pkgver} @@ -34,3 +33,5 @@ package() { mv ${pkgdir}/usr/bin/cube ${pkgdir}/usr/bin/puzzles-cube mv ${pkgdir}/usr/bin/blackbox ${pkgdir}/usr/bin/puzzles-blackbox } + +md5sums=('317e97dc3bfc7cb901636761747fa4c9') diff --git a/community/pwmanager/PKGBUILD b/community/pwmanager/PKGBUILD index c75d4f16b..e0bafdeb5 100644 --- a/community/pwmanager/PKGBUILD +++ b/community/pwmanager/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 9064 2010-01-23 12:16:49Z foutrelis $ +# $Id: PKGBUILD 58627 2011-11-16 15:52:59Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributors: Pointer <pointer@linux-blog.de>, tmaynard <arch@toddmaynard.com> pkgname=pwmanager pkgver=1.2.4 -pkgrel=4 +pkgrel=5 pkgdesc="With PwManager you can easily manage your passwords" arch=('i686' 'x86_64' 'mips64el') url="http://passwordmanager.sourceforge.net/" license=('GPL') depends=('kdelibs3') -options=('libtool') -source=(http://downloads.sourceforge.net/sourceforge/passwordmanager/$pkgname-$pkgver.tar.bz2 \ +options=('!libtool') +source=(http://downloads.sourceforge.net/sourceforge/passwordmanager/$pkgname-$pkgver.tar.bz2 build-fix.patch) md5sums=('e6f720af9b325bc0e7ea20c9c5e6039f' 'bcc412cb855cba4910e51920ae38a326') @@ -19,14 +20,11 @@ md5sums=('e6f720af9b325bc0e7ea20c9c5e6039f' build() { . /etc/profile.d/qt3.sh export PATH=$QTDIR/bin:$PATH - cd $startdir/src/$pkgname-$pkgver + cd $srcdir/$pkgname-$pkgver patch -p1 <$srcdir/build-fix.patch ./configure --prefix=/opt/kde --without-arts - make || return 1 - make DESTDIR=$startdir/pkg install - - # ugly libtool - rm $startdir/pkg/opt/kde/lib/kde3/kded_pwmanager_kwalletemu.la + make + make DESTDIR=$pkgdir install } diff --git a/community/python-lcms/PKGBUILD b/community/python-lcms/PKGBUILD index 33efa9902..e5cd1d251 100644 --- a/community/python-lcms/PKGBUILD +++ b/community/python-lcms/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 26298 2010-09-14 17:18:19Z schuay $ +# $Id: PKGBUILD 58889 2011-11-19 16:52:42Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Connor Behan <connor.behan@gmail.com> @@ -11,7 +11,7 @@ arch=(i686 x86_64 'mips64el') license=('CUSTOM') depends=('libtiff' 'python2' 'lcms') url="http://www.littlecms.com" -options=('!libtool' 'force') +options=('!libtool') source=(http://downloads.sourceforge.net/project/lcms/lcms/${_mver}/lcms-$pkgver.tar.gz) md5sums=('8af94611baf20d9646c7c2c285859818') diff --git a/community/qmc2/PKGBUILD b/community/qmc2/PKGBUILD index 2ffb00768..b45a08dd0 100644 --- a/community/qmc2/PKGBUILD +++ b/community/qmc2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 58531 2011-11-13 16:04:18Z andrea $ +# $Id: PKGBUILD 58650 2011-11-17 09:14:35Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: JJDaNiMoTh <jjdanimoth@gmail.com> pkgname=qmc2 -pkgver=0.2.b20 +pkgver=0.34 pkgrel=1 pkgdesc="Qt 4 based UNIX MAME frontend supporting SDLMAME" url="http://qmc2.arcadehits.net" @@ -12,7 +12,7 @@ arch=('i686' 'x86_64' 'mips64el') depends=('qt' 'phonon' 'sdl' 'libxmu') makedepends=('rsync' 'mesa') source=("http://downloads.sourceforge.net/project/qmc2/qmc2/$pkgver/qmc2-$pkgver.tar.bz2") -md5sums=('e868144815ff44a2146e839c2395c6d1') +md5sums=('3439fb62c95ff702e3c4194c05353169') build() { cd "$srcdir/$pkgname" diff --git a/community/r8168/PKGBUILD b/community/r8168/PKGBUILD new file mode 100644 index 000000000..10afb9759 --- /dev/null +++ b/community/r8168/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 58713 2011-11-17 21:35:20Z mtorromeo $ +# Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> +# Contributor: Bob Fanger < bfanger(at)gmail > +# Contributor: Filip <fila pruda com>, Det < nimetonmaili(at)gmail > + +pkgname=r8168 +pkgver=8.026.00 +pkgrel=3 +pkgdesc="A kernel module for Realtek 8168 network cards" +url="http://www.realtek.com.tw" +license=("GPL") +arch=('i686' 'x86_64') +depends=('glibc' 'linux>=3.1' 'linux<3.2') +makedepends=('linux-headers') +source=(http://r8168.googlecode.com/files/$pkgname-$pkgver.tar.bz2) +install=$pkgname.install + +_extramodules=extramodules-3.1-ARCH +_kernver="$(cat /lib/modules/$_extramodules/version || true)" + +build() { + cd "$srcdir/$pkgname-$pkgver" + make clean SYSSRC=/usr/src/linux-$_kernver modules +} + +package() { + cd "$srcdir/$pkgname-$pkgver/src" + install -D -m644 $pkgname.ko "$pkgdir/lib/modules/$_extramodules/$pkgname.ko" +} + +md5sums=('cd0b93af17e18eb20cbfb8c5dee40f51') +sha256sums=('e0a58706a956f22f6f44a617d218693888bfc5d3eba7197e61ed6cb75eebb425') diff --git a/community/r8168/r8168.install b/community/r8168/r8168.install new file mode 100644 index 000000000..ff6d6ee42 --- /dev/null +++ b/community/r8168/r8168.install @@ -0,0 +1,17 @@ +rebuild_module_dependencies() { + EXTRAMODULES='extramodules-3.1-ARCH' + depmod $(cat /lib/modules/$EXTRAMODULES/version) +} + +post_install() { + rebuild_module_dependencies + echo '>>> The module r8168 conflicts with r8169. You can blacklist it with:' + echo '>>> `echo "blacklist r8169" > /etc/modprobe.d/r8169_blacklist.conf`' +} +post_upgrade() { + rebuild_module_dependencies +} + +post_remove() { + rebuild_module_dependencies +} diff --git a/community/rt3562sta/PKGBUILD b/community/rt3562sta/PKGBUILD new file mode 100644 index 000000000..1f8de793d --- /dev/null +++ b/community/rt3562sta/PKGBUILD @@ -0,0 +1,74 @@ +# $Id: PKGBUILD 58717 2011-11-17 21:59:14Z mtorromeo $ +# Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> +# Based on SUSE spec https://build.opensuse.org/package/files?package=rt3562sta&project=driver%3Awireless + +pkgname=rt3562sta +pkgver=2.4.1.1 +pkgrel=1 +pkgdesc="Ralink RT3562 PCI WLAN adaptors kernel module" +arch=(i686 x86_64) +url="http://www.ralinktech.com/support.php?s=2" +license=('GPL') +depends=('linux>=3.1' 'linux<3.2') +source=( + http://dl.dropbox.com/u/362439/DPO_RT3562_3592_3062_LinuxSTA_V${pkgver}_20101217.tgz + $pkgname-$pkgver-config.patch + $pkgname-$pkgver-gcc-warnings-x86_64.patch + $pkgname-$pkgver-WPA-mixed.patch + $pkgname-$pkgver-convert-devicename-to-wlanX.patch + $pkgname-$pkgver-remove-potential-conflicts-with-rt2860sta.patch + $pkgname-$pkgver-return_nonvoid.patch + $pkgname-$pkgver-reduce_debug_output.patch + $pkgname-$pkgver-remove_date_time.patch +) +install=$pkgname.install + +_extramodules=extramodules-3.1-ARCH +_kernver="$(cat /lib/modules/$_extramodules/version || true)" + +build() { + cd "$srcdir/DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217" + patch -p0 -i "$srcdir/$pkgname-$pkgver-config.patch" + [ "$CARCH" == "x86_64" ] && patch -p0 -i "$srcdir/$pkgname-$pkgver-gcc-warnings-x86_64.patch" + patch -p0 -i "$srcdir/$pkgname-$pkgver-WPA-mixed.patch" + patch -p0 -i "$srcdir/$pkgname-$pkgver-convert-devicename-to-wlanX.patch" + patch -p0 -i "$srcdir/$pkgname-$pkgver-remove-potential-conflicts-with-rt2860sta.patch" + patch -p0 -i "$srcdir/$pkgname-$pkgver-return_nonvoid.patch" + patch -p0 -i "$srcdir/$pkgname-$pkgver-reduce_debug_output.patch" + patch -p0 -i "$srcdir/$pkgname-$pkgver-remove_date_time.patch" + + # clean up this mess of mixing RT2860STA with RT3562STA + # in documentation files + mv RT2860STA.dat RT3562STA.dat + mv RT2860STACard.dat RT3562STACard.dat + sed -i 's/2860/3562/g' *STA* iwpriv_usage.txt + + # as we change the default name of the interface from raX to wlanX, change respective references in documentation, too + sed -i 's|ra0|wlan0|g' *.txt README* *.dat + sed -i 's|ra1|wlan1|g' *.txt README* *.dat + sed -i 's|ra2|wlan2|g' *.txt README* *.dat + + export EXTRA_CFLAGS="-DVERSION=$pkgver" + make +} + +package() { + cd "$srcdir/DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217" + + install -Dm 0640 RT3562STA.dat "$pkgdir/etc/Wireless/RT3562STA/RT3562STA.dat" + install -Dm 0644 os/linux/$pkgname.ko "$pkgdir/lib/modules/$_extramodules/$pkgname.ko" + install -dm 0755 "$pkgdir/usr/share/doc/$pkgname" + install -m 0644 iwpriv_usage.txt README* RT3562STA* sta_ate_iwpriv_usage.txt "$pkgdir/usr/share/doc/$pkgname" + + find "$pkgdir" -name '*.ko' -exec gzip -9 {} \; +} + +md5sums=('a5e9af70abccdb7b86d1ef605bb34491' + '5cff38fb070fd181cf4beb52acc99616' + 'ca40e951c0799d395a74bf274459b950' + '743b45ad2bf60bf757e53439c26edb71' + 'f2d0fbe845415cdb4f31e365876f740e' + '874619383576e38c5c048f0a068c9844' + '466df4e09896836082db417e52f0224e' + 'edc79dd0de1e8fabcec1e4791feb4391' + 'c8e174ea362bf94ce46038f8388439b6') diff --git a/community/rt3562sta/rt3562sta-2.4.1.1-WPA-mixed.patch b/community/rt3562sta/rt3562sta-2.4.1.1-WPA-mixed.patch new file mode 100644 index 000000000..caf2b1c6a --- /dev/null +++ b/community/rt3562sta/rt3562sta-2.4.1.1-WPA-mixed.patch @@ -0,0 +1,11 @@ +--- common/cmm_wpa.c.orig 2010-11-26 04:18:41.000000000 +0100 ++++ common/cmm_wpa.c 2010-12-01 15:09:22.000000000 +0100 +@@ -2410,7 +2410,7 @@ + UCHAR PrimaryRsnie; + BOOLEAN bMixCipher = FALSE; // indicate the pairwise and group cipher are different + UCHAR p_offset; +- WPA_MIX_PAIR_CIPHER FlexibleCipher = MIX_CIPHER_NOTUSE; // it provide the more flexible cipher combination in WPA-WPA2 and TKIPAES mode ++ WPA_MIX_PAIR_CIPHER FlexibleCipher = WPA_TKIPAES_WPA2_TKIPAES; // it provide the more flexible cipher combination in WPA-WPA2 and TKIPAES mode + + rsnielen_cur_p = NULL; + rsnielen_ex_cur_p = NULL; diff --git a/community/rt3562sta/rt3562sta-2.4.1.1-config.patch b/community/rt3562sta/rt3562sta-2.4.1.1-config.patch new file mode 100644 index 000000000..dc245e38e --- /dev/null +++ b/community/rt3562sta/rt3562sta-2.4.1.1-config.patch @@ -0,0 +1,98 @@ +--- os/linux/config.mk.orig 2010-12-17 12:44:47.000000000 +0100 ++++ os/linux/config.mk 2010-12-17 19:53:36.000000000 +0100 +@@ -9,10 +9,10 @@ + + + # Support Wpa_Supplicant +-HAS_WPA_SUPPLICANT=n ++HAS_WPA_SUPPLICANT=y + + # Support Native WpaSupplicant for Network Maganger +-HAS_NATIVE_WPA_SUPPLICANT_SUPPORT=n ++HAS_NATIVE_WPA_SUPPLICANT_SUPPORT=y + + #Support Net interface block while Tx-Sw queue full + HAS_BLOCK_NET_IF=n +@@ -283,7 +283,7 @@ + endif + + ifeq ($(CHIPSET),3562) +-WFLAGS +=-DRTMP_MAC_PCI -DRT2860 -DRT28xx -DRT30xx -DRT35xx -DRTMP_PCI_SUPPORT -DRTMP_RF_RW_SUPPORT -DRTMP_EFUSE_SUPPORT -DA_BAND_SUPPORT ++WFLAGS +=-DRTMP_MAC_PCI -DRT2860 -DRT28xx -DRT30xx -DRT35xx -DRTMP_PCI_SUPPORT -DRTMP_RF_RW_SUPPORT -DRTMP_EFUSE_SUPPORT -DA_BAND_SUPPORT -DDOT11N_SS3_SUPPORT -DNEW_RATE_ADAPT_SUPPORT -DRT3593 + ifeq ($(HAS_DFS_SUPPORT),y) + WFLAGS += -DDFS_HARDWARE_SUPPORT -DDFS_DEBUG + endif +--- Makefile.orig 2010-12-17 12:44:47.000000000 +0100 ++++ Makefile 2010-12-17 19:51:39.000000000 +0100 +@@ -284,26 +284,26 @@ + endif + + ifeq ($(RT28xx_MODE),AP) +- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)ap.o /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)ap.o /tftpboot + ifeq ($(OSABL),YES) +- cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)ap.o /tftpboot +- cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)ap.o /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)ap.o /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)ap.o /tftpboot + endif + ifeq ($(PLATFORM),INF_AMAZON_SE) +- cp -f /tftpboot/rt2870ap.o /backup/ifx/build/root_filesystem/lib/modules/2.4.31-Amazon_SE-3.6.2.2-R0416_Ralink/kernel/drivers/net ++# cp -f /tftpboot/rt2870ap.o /backup/ifx/build/root_filesystem/lib/modules/2.4.31-Amazon_SE-3.6.2.2-R0416_Ralink/kernel/drivers/net + endif + else + ifeq ($(RT28xx_MODE),APSTA) +- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)apsta.o /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)apsta.o /tftpboot + ifeq ($(OSABL),YES) +- cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)apsta.o /tftpboot +- cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)apsta.o /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)apsta.o /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)apsta.o /tftpboot + endif + else +- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.o /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.o /tftpboot + ifeq ($(OSABL),YES) +- cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)sta.o /tftpboot +- cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)sta.o /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)sta.o /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)sta.o /tftpboot + endif + endif + endif +@@ -331,25 +331,25 @@ + endif + + ifeq ($(RT28xx_MODE),AP) +- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)ap.ko /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)ap.ko /tftpboot + ifeq ($(OSABL),YES) +- cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)ap.ko /tftpboot +- cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)ap.ko /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)ap.ko /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)ap.ko /tftpboot + endif + rm -f os/linux/rt$(CHIPSET)ap.ko.lzma + /root/bin/lzma e os/linux/rt$(CHIPSET)ap.ko os/linux/rt$(CHIPSET)ap.ko.lzma + else + ifeq ($(RT28xx_MODE),APSTA) +- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)apsta.ko /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)apsta.ko /tftpboot + ifeq ($(OSABL),YES) +- cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)apsta.ko /tftpboot +- cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)apsta.ko /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)apsta.ko /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)apsta.ko /tftpboot + endif + else +- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.ko /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.ko /tftpboot + ifeq ($(OSABL),YES) +- cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)sta.ko /tftpboot +- cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)sta.ko /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)sta.ko /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)sta.ko /tftpboot + endif + endif + endif diff --git a/community/rt3562sta/rt3562sta-2.4.1.1-convert-devicename-to-wlanX.patch b/community/rt3562sta/rt3562sta-2.4.1.1-convert-devicename-to-wlanX.patch new file mode 100644 index 000000000..5ec4d5028 --- /dev/null +++ b/community/rt3562sta/rt3562sta-2.4.1.1-convert-devicename-to-wlanX.patch @@ -0,0 +1,13 @@ +--- include/rtmp_def.h.orig 2010-11-26 04:18:41.000000000 +0100 ++++ include/rtmp_def.h 2010-12-01 14:57:05.000000000 +0100 +@@ -1451,8 +1451,8 @@ + #define SET_ENTRY_CLIWDS(_x) CLIENT_STATUS_SET_FLAG((_x), fCLIENT_STATUS_CLI_WDS) + #endif // CLIENT_WDS // + +-#define INF_MAIN_DEV_NAME "ra" +-#define INF_MBSSID_DEV_NAME "ra" ++#define INF_MAIN_DEV_NAME "wlan" ++#define INF_MBSSID_DEV_NAME "wlan" + #define INF_WDS_DEV_NAME "wds" + #define INF_APCLI_DEV_NAME "apcli" + #define INF_MESH_DEV_NAME "mesh" diff --git a/community/rt3562sta/rt3562sta-2.4.1.1-gcc-warnings-x86_64.patch b/community/rt3562sta/rt3562sta-2.4.1.1-gcc-warnings-x86_64.patch new file mode 100644 index 000000000..a53dbde86 --- /dev/null +++ b/community/rt3562sta/rt3562sta-2.4.1.1-gcc-warnings-x86_64.patch @@ -0,0 +1,14 @@ +--- os/linux/rt_linux.c.orig 2010-11-26 04:18:41.000000000 +0100 ++++ os/linux/rt_linux.c 2010-12-01 14:57:53.000000000 +0100 +@@ -479,9 +479,9 @@ + MEM_DBG_PKT_ALLOC_INC(pAd); + + skb_reserve(skb, 2); +- NdisMoveMemory(skb->tail, pHeader802_3, HdrLen); ++ NdisMoveMemory(skb_tail_pointer(skb), pHeader802_3, HdrLen); // + skb_put(skb, HdrLen); +- NdisMoveMemory(skb->tail, pData, DataSize); ++ NdisMoveMemory(skb_tail_pointer(skb), pData, DataSize); // + skb_put(skb, DataSize); + skb->dev = get_netdev_from_bssid(pAd, FromWhichBSSID); + pPacket = OSPKT_TO_RTPKT(skb); diff --git a/community/rt3562sta/rt3562sta-2.4.1.1-reduce_debug_output.patch b/community/rt3562sta/rt3562sta-2.4.1.1-reduce_debug_output.patch new file mode 100644 index 000000000..6754f214d --- /dev/null +++ b/community/rt3562sta/rt3562sta-2.4.1.1-reduce_debug_output.patch @@ -0,0 +1,15 @@ +--- include/os/rt_linux.h.orig 2011-01-07 11:20:02.000000000 +0100 ++++ include/os/rt_linux.h 2011-01-07 11:21:30.000000000 +0100 +@@ -611,10 +611,10 @@ + + #define DBGPRINT_RAW(Level, Fmt) \ + do{ \ +- if (Level <= RTDebugLevel) \ ++/* if (Level <= RTDebugLevel) \ + { \ + printk Fmt; \ +- } \ ++ }*/ \ + }while(0) + + #define DBGPRINT(Level, Fmt) DBGPRINT_RAW(Level, Fmt) diff --git a/community/rt3562sta/rt3562sta-2.4.1.1-remove-potential-conflicts-with-rt2860sta.patch b/community/rt3562sta/rt3562sta-2.4.1.1-remove-potential-conflicts-with-rt2860sta.patch new file mode 100644 index 000000000..a0d00d6e3 --- /dev/null +++ b/community/rt3562sta/rt3562sta-2.4.1.1-remove-potential-conflicts-with-rt2860sta.patch @@ -0,0 +1,47 @@ +--- include/os/rt_linux.h.orig 2010-11-26 04:18:41.000000000 +0100 ++++ include/os/rt_linux.h 2010-12-01 14:58:46.000000000 +0100 +@@ -111,10 +111,10 @@ + + #ifdef CONFIG_STA_SUPPORT + #ifdef RTMP_MAC_PCI +-#define STA_PROFILE_PATH "/etc/Wireless/RT2860STA/RT2860STA.dat" ++#define STA_PROFILE_PATH "/etc/Wireless/RT3562STA/RT3562STA.dat" + #define STA_DRIVER_VERSION "2.4.1.1" + #ifdef MULTIPLE_CARD_SUPPORT +-#define CARD_INFO_PATH "/etc/Wireless/RT2860STA/RT2860STACard.dat" ++#define CARD_INFO_PATH "/etc/Wireless/RT3562STA/RT3562STACard.dat" + #endif // MULTIPLE_CARD_SUPPORT // + #endif // RTMP_MAC_PCI // + +--- os/linux/pci_main_dev.c.orig 2010-12-17 19:59:25.000000000 +0100 ++++ os/linux/pci_main_dev.c 2010-12-17 20:00:12.000000000 +0100 +@@ -90,14 +90,15 @@ + MODULE_VERSION(STA_DRIVER_VERSION); + #endif + #endif // CONFIG_STA_SUPPORT // +- ++MODULE_DESCRIPTION("RT3562 Wireless Lan Linux Driver"); ++MODULE_LICENSE("GPL"); + + // + // Our PCI driver structure + // + static struct pci_driver rt2860_driver = + { +- name: "rt2860", ++ name: "rt3562", + id_table: rt2860_pci_tbl, + probe: rt2860_probe, + #if LINUX_VERSION_CODE >= 0x20412 +@@ -317,9 +318,9 @@ + } + + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) +- print_name = pci_dev ? pci_name(pci_dev) : "rt2860"; ++ print_name = pci_dev ? pci_name(pci_dev) : "rt3562"; + #else +- print_name = pci_dev ? pci_dev->slot_name : "rt2860"; ++ print_name = pci_dev ? pci_dev->slot_name : "rt3562"; + #endif // LINUX_VERSION_CODE // + + if ((rv = pci_request_regions(pci_dev, print_name)) != 0) diff --git a/community/rt3562sta/rt3562sta-2.4.1.1-remove_date_time.patch b/community/rt3562sta/rt3562sta-2.4.1.1-remove_date_time.patch new file mode 100644 index 000000000..b17ba5a12 --- /dev/null +++ b/community/rt3562sta/rt3562sta-2.4.1.1-remove_date_time.patch @@ -0,0 +1,11 @@ +--- os/linux/sta_ioctl.c.orig 2010-12-17 12:44:47.000000000 +0100 ++++ os/linux/sta_ioctl.c 2011-08-02 14:52:37.000000000 +0200 +@@ -1812,7 +1812,7 @@ + wrq->length = strlen(extra) + 1; // 1: size of '\0' + break; + case SHOW_DRVIER_VERION: +- sprintf(extra, "Driver version-%s, %s %s\n", STA_DRIVER_VERSION, __DATE__, __TIME__ ); ++ sprintf(extra, "Driver version-%s, %s %s\n", STA_DRIVER_VERSION, NULL, NULL ); + wrq->length = strlen(extra) + 1; // 1: size of '\0' + break; + #ifdef DOT11_N_SUPPORT diff --git a/community/rt3562sta/rt3562sta-2.4.1.1-return_nonvoid.patch b/community/rt3562sta/rt3562sta-2.4.1.1-return_nonvoid.patch new file mode 100644 index 000000000..7416a31f9 --- /dev/null +++ b/community/rt3562sta/rt3562sta-2.4.1.1-return_nonvoid.patch @@ -0,0 +1,11 @@ +--- os/linux/rt_main_dev.c.orig 2010-12-17 12:44:47.000000000 +0100 ++++ os/linux/rt_main_dev.c 2010-12-17 19:42:23.000000000 +0100 +@@ -1247,7 +1247,7 @@ + RTMP_OS_TASK *pTask; + + if (pAd->bWriteDat == FALSE) +- return; ++ return 0; + + DBGPRINT(RT_DEBUG_TRACE, ("-->WriteDatThreadInit()\n")); + diff --git a/community/rt3562sta/rt3562sta.install b/community/rt3562sta/rt3562sta.install new file mode 100644 index 000000000..82ec4d462 --- /dev/null +++ b/community/rt3562sta/rt3562sta.install @@ -0,0 +1,16 @@ +rebuild_module_dependencies() { + EXTRAMODULES='extramodules-3.1-ARCH' + depmod $(cat /lib/modules/$EXTRAMODULES/version) +} + +post_install() { + rebuild_module_dependencies +} + +post_upgrade() { + rebuild_module_dependencies +} + +post_remove() { + rebuild_module_dependencies +} diff --git a/community/scummvm-tools/PKGBUILD b/community/scummvm-tools/PKGBUILD index c757fde51..b00fd1046 100644 --- a/community/scummvm-tools/PKGBUILD +++ b/community/scummvm-tools/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 48337 2011-05-31 11:29:28Z svenstaro $ +# $Id: PKGBUILD 58732 2011-11-18 08:41:40Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Jérémie Dimino <jeremie@dimino.org> # Contributor: Sebastian Hase <sebastian_hase@gmx.de> # Contributor: Joe Davison <joe@thosedamnpeanuts.com> pkgname=scummvm-tools -pkgver=1.3.0 +pkgver=1.4.0 pkgrel=1 pkgdesc="A set of tools that enable you to convert, compress and decode game datafiles for ScummVM" url="http://www.scummvm.org/" @@ -12,7 +12,7 @@ license=('GPL') depends=('libpng' 'wxgtk' 'flac' 'libvorbis') arch=('i686' 'x86_64' 'mips64el') source=(http://downloads.sourceforge.net/sourceforge/scummvm/${pkgname}-${pkgver}.tar.gz) -md5sums=('0239cb022e508f2399d584efa6f177b2') +md5sums=('43cbf9f5c4939876cf4149dd59e68044') build() { cd ${pkgname}-${pkgver} diff --git a/community/shntool/PKGBUILD b/community/shntool/PKGBUILD index 5c45b8c46..51b020f1f 100644 --- a/community/shntool/PKGBUILD +++ b/community/shntool/PKGBUILD @@ -3,7 +3,7 @@ pkgname=shntool pkgver=3.0.10 -pkgrel=1 +pkgrel=2 pkgdesc="A multi-purpose WAVE data processing and reporting utility" arch=('i686' 'x86_64' 'mips64el') url="http://www.etree.org/shnutils/shntool/" @@ -15,13 +15,13 @@ md5sums=('5d41f8f42c3c15e3145a7a43539c3eae') sha1sums=('7a2bc8801e180cf582f0e39775603582e35d50d2') build() { - cd ${pkgname}-${pkgver} + cd "${srcdir}"/${pkgname}-${pkgver} ./configure --prefix=/usr make } package() { - cd ${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd "${srcdir}"/${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install } # vim:set ts=2 sw=2 et: diff --git a/community/soundkonverter/PKGBUILD b/community/soundkonverter/PKGBUILD index 2c47900ca..113f78180 100644 --- a/community/soundkonverter/PKGBUILD +++ b/community/soundkonverter/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 54953 2011-08-28 23:34:04Z andrea $ -# Maintainer: Eric Belanger <eric@archlinux.org> +# $Id: PKGBUILD 58635 2011-11-16 22:07:30Z andrea $ # Maintainer: Mateusz Herych <heniekk@gmail.com> +# Contributor: Eric Belanger <eric@archlinux.org> # Contributor: Darwin Bautista <djclue917@gmail.com> pkgname=soundkonverter -pkgver=1.0.0 +pkgver=1.2.0 pkgrel=1 pkgdesc="Front-end to various audio converters" arch=('i686' 'x86_64' 'mips64el') @@ -23,10 +23,9 @@ optdepends=('cdrkit: cdda2wav backend' 'speex: speexenc, speexdec backends' 'vorbisgain: vorbisgain backend' ) -options=('libtool') install=$pkgname.install -source=("https://api.opensuse.org/public/source/home:HessiJames/${pkgname}/"${pkgname}-"${pkgver}.tar.gz") -md5sums=('fc8bab43a27c53e651907489f5ce5032') +source=("https://gitorious.org/soundkonverter/soundkonverter/blobs/raw/180e777aa3d91456ac386868a1e324ca28649e2e/release/${pkgname}-${pkgver}.tar.gz") +md5sums=('e4c4ccf1f7f93f758c3d440f67f61a64') build() { cd "${srcdir}" diff --git a/community/uptimed/PKGBUILD b/community/uptimed/PKGBUILD index 87ec6b821..44bd457cd 100644 --- a/community/uptimed/PKGBUILD +++ b/community/uptimed/PKGBUILD @@ -1,6 +1,6 @@ -# $Id: PKGBUILD 17435 2010-05-24 10:30:22Z spupykin $ +# $Id: PKGBUILD 58644 2011-11-16 23:03:01Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Tom Killian <tomk@runbox.com> +# Contributor: Tom Killian <tomk@runbox.com> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=uptimed @@ -8,22 +8,23 @@ pkgver=0.3.16 pkgrel=3 pkgdesc="A system uptime record daemon" arch=(i686 x86_64 'mips64el') -install=$pkgname.install url="http://podgorny.cz/uptimed/" license=('GPL') -depends=('glibc') +depends=('glibc' 'bash') backup=(etc/uptimed.conf) +options=('!libtool') +install=$pkgname.install source=(http://podgorny.cz/$pkgname/releases/$pkgname-$pkgver.tar.bz2 - uptimed) + uptimed) md5sums=('f87ec2cc39039239004afa542cf99c59' '4ae90bee9fc78014a889a5072effb735') build() { - cd $startdir/src/$pkgname-$pkgver + cd $srcdir/$pkgname-$pkgver # Change log path to Arch standard for M in `ls M*`; do - sed -i "s|/var/spool/uptimed|$startdir/pkg/var/log/uptimed|" $M + sed -i "s|/var/spool/uptimed|$pkgdir/var/log/uptimed|" $M done sed -i 's|spool|log|' libuptimed/urec.h @@ -31,12 +32,13 @@ build() { libtoolize --force ./configure --prefix=/usr --sysconfdir=/etc + make +} - make || return 1 - make prefix=$startdir/pkg/usr sysconfdir=$startdir/pkg/etc install +package() { + cd $srcdir/$pkgname-$pkgver + make prefix=$pkgdir/usr sysconfdir=$pkgdir/etc install - mv $startdir/pkg/etc/uptimed.conf-dist \ - $startdir/pkg/etc/uptimed.conf - install -D ../uptimed $startdir/pkg/etc/rc.d/uptimed - find $startdir/pkg -name '*.la' -exec rm {} \; + mv $pkgdir/etc/uptimed.conf-dist $pkgdir/etc/uptimed.conf + install -D $srcdir/uptimed $pkgdir/etc/rc.d/uptimed } diff --git a/community/ushare/PKGBUILD b/community/ushare/PKGBUILD index 8252ba9c9..522bd1b1f 100644 --- a/community/ushare/PKGBUILD +++ b/community/ushare/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 54798 2011-08-26 08:53:52Z spupykin $ +# $Id: PKGBUILD 58584 2011-11-15 20:14:24Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com> # Contributor: kastor <kastor@fobos.org.ar> pkgname=ushare pkgver=1.1a -pkgrel=15 +pkgrel=16 pkgdesc="A free UPnP A/V Media Server for Linux" url="http://ushare.geexbox.org" license=('GPL2') diff --git a/community/ushare/ushare.install b/community/ushare/ushare.install index c58209616..38d710156 100644 --- a/community/ushare/ushare.install +++ b/community/ushare/ushare.install @@ -13,4 +13,5 @@ post_upgrade() { post_remove() { userdel ushare + groupdel ushare } diff --git a/community/wine/PKGBUILD b/community/wine/PKGBUILD index 4070ff775..8a8198de4 100644 --- a/community/wine/PKGBUILD +++ b/community/wine/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 57119 2011-10-22 01:45:14Z svenstaro $ +# $Id: PKGBUILD 58857 2011-11-19 02:52:24Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Eduardo Romero <eduardo@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=wine -pkgver=1.3.31 +pkgver=1.3.33 pkgrel=1 _pkgbasever=${pkgver/rc/-rc} source=(http://ibiblio.org/pub/linux/system/emulators/$pkgname/$pkgname-$_pkgbasever.tar.bz2) -md5sums=('9c575dbbb308d269ad76e1c6f5a0866d') +md5sums=('24807ef7d9a5e8c2635541880672db7b') pkgdesc="A compatibility layer for running Windows programs" url="http://www.winehq.com" @@ -26,7 +26,6 @@ depends=( libxrandr lib32-libxrandr libxdamage lib32-libxdamage libxi lib32-libxi - alsa-lib lib32-alsa-lib desktop-file-utils ) @@ -46,8 +45,8 @@ makedepends=(autoconf ncurses bison perl fontforge flex prelink mpg123 lib32-mpg123 openal lib32-openal libcups lib32-libcups - gnutls lib32-gnutls v4l-utils lib32-v4l-utils + alsa-lib lib32-alsa-lib oss ) @@ -60,10 +59,10 @@ optdepends=( mpg123 lib32-mpg123 openal lib32-openal libcups lib32-libcups - gnutls lib32-gnutls v4l-utils lib32-v4l-utils libpulse lib32-libpulse alsa-plugins lib32-alsa-plugins + alsa-lib lib32-alsa-lib oss ) diff --git a/community/wol/PKGBUILD b/community/wol/PKGBUILD index 1bb774627..b5d778ac6 100644 --- a/community/wol/PKGBUILD +++ b/community/wol/PKGBUILD @@ -1,27 +1,28 @@ -# $Id: PKGBUILD 17446 2010-05-24 10:42:15Z spupykin $ +# $Id: PKGBUILD 58676 2011-11-17 14:54:30Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Anders Bergh <anders1@gmail.com> # Contributor: Markus Volkmann <mcfock@counterstrike.de> pkgname=wol pkgver=0.7.1 -pkgrel=4 +pkgrel=5 arch=('i686' 'x86_64' 'mips64el') -pkgdesc="wol implements Wake On LAN functionality in a small program. It wakes up hardware that is Magic Packet compliant." +pkgdesc="Wake On LAN functionality in a small program. It wakes up hardware that is Magic Packet compliant" license=("GPL") -depends=(sh) +depends=() url="http://ahh.sourceforge.net/wol/" install=wol.install source=(http://downloads.sourceforge.net/ahh/wol-$pkgver.tar.gz) md5sums=('c2fa9d7e771134ac8c89d56b8197d4ca') build() { - cd $startdir/src/$pkgname-$pkgver - ./configure --prefix=/usr - make || return 1 - make prefix=$startdir/pkg/usr install || return 1 + cd $srcdir/$pkgname-$pkgver + ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info + make +} - mv $pkgdir/usr/man $pkgdir/usr/share/ && \ - mv $pkgdir/usr/info $pkgdir/usr/share/ && \ +package() { + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install rm $pkgdir/usr/share/info/dir } diff --git a/community/xfmedia/PKGBUILD b/community/xfmedia/PKGBUILD index 94776599e..92afa25ab 100644 --- a/community/xfmedia/PKGBUILD +++ b/community/xfmedia/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 38810 2011-02-01 11:14:57Z spupykin $ +# $Id: PKGBUILD 58605 2011-11-16 15:28:21Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer : Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer : Tom Killian <tomk@runbox.com> @@ -13,7 +13,7 @@ license=('GPL') url="http://spuriousinterrupt.org/projects/xfmedia/" depends=('xine-lib' 'taglib' 'exo' 'libxtst' 'libxss' 'libxfcegui4' 'dbus-glib') makedepends=('intltool' 'libxt') -install=(xfmedia.install) +install=xfmedia.install source=(http://spuriousinterrupt.org/files/$pkgname/$pkgname-$pkgver.tar.bz2 xfmedia-dbus-0.6-support.patch xfmedia-empty-prev-next-fix.patch diff --git a/community/xlockmore/PKGBUILD b/community/xlockmore/PKGBUILD index a9a182228..74f912e37 100644 --- a/community/xlockmore/PKGBUILD +++ b/community/xlockmore/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 55400 2011-09-11 21:18:11Z spupykin $ +# $Id: PKGBUILD 58588 2011-11-16 05:16:51Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: dorphell <dorphell@archlinux.org> pkgname=xlockmore -pkgver=5.34 +pkgver=5.35 pkgrel=1 pkgdesc="screen saver / locker for the X Window System" arch=(i686 x86_64 'mips64el') @@ -13,7 +13,7 @@ url="http://www.tux.org/~bagleyd/xlockmore.html" options=('!makeflags') source=(http://www.tux.org/~bagleyd/xlock/xlockmore-$pkgver/xlockmore-$pkgver.tar.bz2 \ LICENSE) -md5sums=('ed464197e8684a243e56aab7919a52d8' +md5sums=('fdd7b876aac46f9a86497858b70e17b2' 'a64afab4283f53972a6702c2e59850d7') build() { diff --git a/community/xnc/PKGBUILD b/community/xnc/PKGBUILD index edb37f897..43cb3b476 100644 --- a/community/xnc/PKGBUILD +++ b/community/xnc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 8981 2010-01-23 01:17:11Z foutrelis $ +# $Id: PKGBUILD 58678 2011-11-17 15:02:45Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=xnc pkgver=5.0.4 -pkgrel=3 +pkgrel=4 pkgdesc="X nortern captain file manager" arch=(i686 x86_64 'mips64el') url="http://xnc.jinr.ru/" @@ -12,12 +12,13 @@ depends=('gcc-libs' 'libpng' 'libtiff' 'libsm' 'libxext' 'libjpeg>=7') makedepends=('libxt') options=('!makeflags') source=(http://xnc.jinr.ru/src-5/xnc-$pkgver.src.tar.gz xnc-gcc44.patch) -md5sums=('62446cdfdf5730f125fb351a658c0bd3' '60673809f2db3a8d9939e9f38ade59d2') +md5sums=('62446cdfdf5730f125fb351a658c0bd3' + 'c0037a081824bca691e59a4ec68b6686') build() { cd "$srcdir/$pkgname-$pkgver" - patch -p0 < ../xnc-gcc44.patch || return 1 - ./configure --prefix=/usr --mandir=/usr/share/man || return 1 - make || return 1 - make DESTDIR="$pkgdir" install || return 1 + patch -p1 <$srcdir/xnc-gcc44.patch + ./configure --prefix=/usr --mandir=/usr/share/man + make + make DESTDIR="$pkgdir" install } diff --git a/community/xnc/xnc-gcc44.patch b/community/xnc/xnc-gcc44.patch index 5ce977850..120d9d467 100644 --- a/community/xnc/xnc-gcc44.patch +++ b/community/xnc/xnc-gcc44.patch @@ -1,5 +1,18 @@ ---- src/lib/tool/commonfuncs.cxx.orig 2009-07-15 21:19:42.000000000 -0400 -+++ src/lib/tool/commonfuncs.cxx 2009-07-15 21:23:58.000000000 -0400 +diff -wbBur xnc-5.0.4/src/include/commonfuncs.h xnc-5.0.4.my/src/include/commonfuncs.h +--- xnc-5.0.4/src/include/commonfuncs.h 2002-10-16 10:44:17.000000000 +0400 ++++ xnc-5.0.4.my/src/include/commonfuncs.h 2011-11-17 18:59:19.000000000 +0400 +@@ -15,7 +15,7 @@ + extern int path_to_fullpath(char* dest, char *srcdir); + extern void add_path_content(char *curdir, const char *cont, int vms_host=0); + extern void upper_path(char *curdir, int vms_host=0); +-extern char* get_first_content(const char *curdir, char *cont); ++extern const char* get_first_content(const char *curdir, char *cont); + extern void get_last_content(char *curdir, char *cont); + extern void get_last_and_rest_content(char* curdir, char* last, char* rest); + extern void str_swap(char *str1, char *str2); +diff -wbBur xnc-5.0.4/src/lib/tool/commonfuncs.cxx xnc-5.0.4.my/src/lib/tool/commonfuncs.cxx +--- xnc-5.0.4/src/lib/tool/commonfuncs.cxx 2002-10-16 10:44:20.000000000 +0400 ++++ xnc-5.0.4.my/src/lib/tool/commonfuncs.cxx 2011-11-17 18:59:19.000000000 +0400 @@ -117,9 +117,9 @@ } @@ -12,19 +25,9 @@ if(b) { strncpy(cont,curdir,b-curdir); ---- src/include/commonfuncs.h.orig 2009-07-15 21:24:37.000000000 -0400 -+++ src/include/commonfuncs.h 2009-07-15 21:25:04.000000000 -0400 -@@ -15,7 +15,7 @@ - extern int path_to_fullpath(char* dest, char *srcdir); - extern void add_path_content(char *curdir, const char *cont, int vms_host=0); - extern void upper_path(char *curdir, int vms_host=0); --extern char* get_first_content(const char *curdir, char *cont); -+extern const char* get_first_content(const char *curdir, char *cont); - extern void get_last_content(char *curdir, char *cont); - extern void get_last_and_rest_content(char* curdir, char* last, char* rest); - extern void str_swap(char *str1, char *str2); ---- src/lib/vfs/afs.cxx.orig 2009-07-15 21:47:44.000000000 -0400 -+++ src/lib/vfs/afs.cxx 2009-07-15 21:50:02.000000000 -0400 +diff -wbBur xnc-5.0.4/src/lib/vfs/afs.cxx xnc-5.0.4.my/src/lib/vfs/afs.cxx +--- xnc-5.0.4/src/lib/vfs/afs.cxx 2003-11-27 18:36:43.000000000 +0300 ++++ xnc-5.0.4.my/src/lib/vfs/afs.cxx 2011-11-17 18:59:19.000000000 +0400 @@ -29,7 +29,7 @@ // The return value is static, so copy it before using the // method again! @@ -43,8 +46,9 @@ if(*s) { do ---- src/lib/vfs/ftpfs.cxx.orig 2009-07-15 21:50:48.000000000 -0400 -+++ src/lib/vfs/ftpfs.cxx 2009-07-15 21:54:26.000000000 -0400 +diff -wbBur xnc-5.0.4/src/lib/vfs/ftpfs.cxx xnc-5.0.4.my/src/lib/vfs/ftpfs.cxx +--- xnc-5.0.4/src/lib/vfs/ftpfs.cxx 2002-10-30 15:47:38.000000000 +0300 ++++ xnc-5.0.4.my/src/lib/vfs/ftpfs.cxx 2011-11-17 18:59:19.000000000 +0400 @@ -1413,7 +1413,7 @@ return; if(strcmp(dir,"/")) @@ -54,3 +58,15 @@ if(*s=='/') //Skip leading '/' s++; do +diff -wbBur xnc-5.0.4/src/man_page.cxx xnc-5.0.4.my/src/man_page.cxx +--- xnc-5.0.4/src/man_page.cxx 2002-10-02 16:54:33.000000000 +0400 ++++ xnc-5.0.4.my/src/man_page.cxx 2011-11-17 18:59:00.000000000 +0400 +@@ -81,7 +81,7 @@ + buf[j] = 0; + manf->size = j; + delete buf; +- fp = open(tmps, O_WRONLY | O_CREAT | O_TRUNC); ++ fp = open(tmps, O_WRONLY | O_CREAT | O_TRUNC, 0600); + write(fp, buf2, j); + close(fp); + delete manf; diff --git a/community/xrestop/PKGBUILD b/community/xrestop/PKGBUILD index 429b33ba6..5820da5df 100644 --- a/community/xrestop/PKGBUILD +++ b/community/xrestop/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 23510 2010-08-11 21:54:23Z lcarlier $ +# $Id: PKGBUILD 58682 2011-11-17 15:15:17Z spupykin $ # Contributor: William Rea <sillywilly@gmail.com> pkgname=xrestop @@ -9,19 +9,16 @@ arch=('i686' 'x86_64' 'mips64el') url="http://freedesktop.org/wiki/Software/xrestop" license=('GPL') depends=('libxres' 'ncurses') -source=(http://projects.o-hand.com/sources/$pkgname/$pkgname-$pkgver.tar.gz) +source=(ftp://ftp.archlinux.org/other/community/xrestop/xrestop-$pkgver.tar.gz) md5sums=('d8a54596cbaf037e62b80c4585a3ca9b') build() { - cd "$srcdir/$pkgname-$pkgver" - + cd "$srcdir/xrestop-$pkgver" ./configure --prefix=/usr --mandir=/usr/share/man make } package() { - cd "$srcdir/$pkgname-$pkgver" - + cd "$srcdir/xrestop-$pkgver" make DESTDIR="$pkgdir" install } - diff --git a/community/xvkbd/PKGBUILD b/community/xvkbd/PKGBUILD index 31c8feced..76db0fc76 100644 --- a/community/xvkbd/PKGBUILD +++ b/community/xvkbd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 21233 2010-07-15 11:20:17Z spupykin $ +# $Id: PKGBUILD 58680 2011-11-17 15:09:35Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Benjamin Andresen <benny@klapmuetz.org> # Contributor: Mikko Seppдlд <t-r-a-y@mbnet.fi> pkgname=xvkbd pkgver=3.2 -pkgrel=1 +pkgrel=2 pkgdesc="virtual (graphical) keyboard program for X Window System" arch=('i686' 'x86_64' 'mips64el') url="http://homepage3.nifty.com/tsato/xvkbd/" @@ -17,22 +17,17 @@ md5sums=('1bce8d6c27e6e7df92ec09b414f82dad') build() { cd "$srcdir/$pkgname-$pkgver" - -# patch xvkbd.c <<EOF -#diff xvkbd-2.8/xvkbd.c xvkbd-2.8.my/xvkbd.c -#45a46 -#> #include <X11/extensions/XKB.h> -#1988a1990 -#> XkbLockGroup(dpy, XkbUseCoreKbd, (shift_state & altgr_mask) ? 1 : 0); -#EOF - xmkmf - make || return 1 - make DESTDIR=$pkgdir install || return 1 + sed -i 's|#include <X11/Xaw/|#include <X11/Xaw3d/|' xvkbd.c + make +} +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR=$pkgdir install # fix - rm -f $pkgdir/usr/lib/X11/app-defaults && \ - mkdir -p $pkgdir/usr/lib/X11 && \ - mv $pkgdir/etc/X11/app-defaults $pkgdir/usr/lib/X11/ && \ + rm -f $pkgdir/usr/lib/X11/app-defaults + mkdir -p $pkgdir/usr/lib/X11 + mv $pkgdir/etc/X11/app-defaults $pkgdir/usr/lib/X11/ rm -rf $pkgdir/etc/ } diff --git a/core/eventlog/ChangeLog b/core/eventlog/ChangeLog index d90a881d4..1c139bdf5 100644 --- a/core/eventlog/ChangeLog +++ b/core/eventlog/ChangeLog @@ -1,3 +1,7 @@ +2011-11-02 Andrea Scarpino <andrea@archlinux.org> + + * Sign package + 2011-04-05 Stéphane Gaudreault <stephane@archlinux.org> * Rebuild of old package diff --git a/core/eventlog/PKGBUILD b/core/eventlog/PKGBUILD index f8ddb12dc..92abd7bcc 100644 --- a/core/eventlog/PKGBUILD +++ b/core/eventlog/PKGBUILD @@ -1,10 +1,11 @@ -# $Id: PKGBUILD 118142 2011-04-05 15:32:10Z stephane $ -# Maintainer: Eric Belanger <eric@archlinux.org> +# $Id: PKGBUILD 142815 2011-11-15 17:24:10Z andrea $ +# Maintainer: +# Contributor: Eric Belanger <eric@archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=eventlog pkgver=0.2.12 -pkgrel=2 +pkgrel=3 pkgdesc="API to format and send structured log messages" arch=('i686' 'x86_64' 'mips64el') url="http://www.balabit.com/support/community/products/" @@ -12,18 +13,20 @@ license=('BSD') depends=('glibc') options=('!libtool') changelog=ChangeLog -source=(http://www.balabit.com/downloads/files/eventlog/${pkgver%.*}/eventlog_${pkgver}.tar.gz) -md5sums=('3d6ebda8a161d36cb40d09328f78786b') +source=("http://www.balabit.com/downloads/files/${pkgname}/${pkgver%.*}/${pkgname}_${pkgver}.tar.gz") sha1sums=('3e35a634e7de029ab9d36995a085bfcb00ed6a4d') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var make } package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - install -D -m644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE + install -D -m644 COPYING \ + "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE } diff --git a/core/heirloom-mailx/PKGBUILD b/core/heirloom-mailx/PKGBUILD index b43230449..e08a0246e 100644 --- a/core/heirloom-mailx/PKGBUILD +++ b/core/heirloom-mailx/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 132725 2011-07-25 13:08:32Z stephane $ +# $Id: PKGBUILD 142842 2011-11-16 20:25:47Z dan $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> -# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Andreas Wagner <Andreas dot Wagner at em dot uni-frankfurt dot de> +# Contributor: Sergej Pupykin <pupykin.s@arch@gmail.com> +# Contributor: Andreas Wagner <Andreas.Wagner@em.uni-frankfurt.de> pkgname=heirloom-mailx pkgver=12.5 -pkgrel=2 +pkgrel=3 pkgdesc="A commandline utility for sending and receiving email" arch=('i686' 'x86_64' 'mips64el') url="http://heirloom.sourceforge.net/mailx.html" diff --git a/core/isdn4k-utils/PKGBUILD b/core/isdn4k-utils/PKGBUILD index 731138125..f0a8d83e9 100644 --- a/core/isdn4k-utils/PKGBUILD +++ b/core/isdn4k-utils/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 102060 2010-12-04 10:48:14Z allan $ +# $Id: PKGBUILD 142790 2011-11-15 08:59:08Z tpowa $ # Contributor: Dennis "Gyroplast" Herbrich <dennis@archlinux.org> # Maintainer: dorphell <dorphell@archlinux.org> pkgname=isdn4k-utils pkgver=3.2p1 -pkgrel=6 +pkgrel=7 pkgdesc="User space administration programs and tools for ISDN" arch=('i686' 'x86_64' 'mips64el') url="http://www.isdn4linux.de/" diff --git a/core/jfsutils/PKGBUILD b/core/jfsutils/PKGBUILD index a96f6b8c5..8ed938017 100644 --- a/core/jfsutils/PKGBUILD +++ b/core/jfsutils/PKGBUILD @@ -1,24 +1,30 @@ -# $Id: PKGBUILD 126948 2011-06-08 20:07:37Z tpowa $ +# $Id: PKGBUILD 142848 2011-11-17 00:38:27Z bisson $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> + pkgname=jfsutils pkgver=1.1.15 -pkgrel=2 -pkgdesc="JFS filesystem utilities" -arch=(i686 x86_64 'mips64el') -url="http://jfs.sourceforge.net" +pkgrel=3 +pkgdesc='JFS filesystem utilities' +arch=('i686' 'x86_64' 'mips64el') +url='http://jfs.sourceforge.net' license=('GPL') groups=('base') depends=('util-linux-ng') -source=(http://jfs.sourceforge.net/project/pub/${pkgname}-${pkgver}.tar.gz) -md5sums=('8809465cd48a202895bc2a12e1923b5d') +source=("http://jfs.sourceforge.net/project/pub/${pkgname}-${pkgver}.tar.gz") +sha1sums=('291e8bd9d615cf3d27e4000117c81a3602484a50') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --sbindir=/sbin - make + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --sbindir=/sbin + make +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR=${pkgdir} install + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/core/librpcsecgss/PKGBUILD b/core/librpcsecgss/PKGBUILD index 7031203ce..6e571f9ee 100644 --- a/core/librpcsecgss/PKGBUILD +++ b/core/librpcsecgss/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 121187 2011-04-29 07:12:44Z stephane $ +# $Id: PKGBUILD 142792 2011-11-15 09:00:03Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Andrew Krawchyk <krawch_a@denison.edu>, Marco Lima <cipparello gmail com> pkgname=librpcsecgss pkgver=0.19 -pkgrel=5 +pkgrel=7 pkgdesc="Library for RPCSECGSS support" arch=('i686' 'x86_64' 'mips64el') url="http://www.citi.umich.edu/projects/nfsv4/linux/" @@ -21,6 +21,11 @@ build() { make } +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="$pkgdir/" install diff --git a/core/libusb-compat/PKGBUILD b/core/libusb-compat/PKGBUILD index 2391c2cbd..ff8b34a8b 100644 --- a/core/libusb-compat/PKGBUILD +++ b/core/libusb-compat/PKGBUILD @@ -1,26 +1,27 @@ -# $Id: PKGBUILD 101197 2010-11-28 15:10:38Z tpowa $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +# $Id: PKGBUILD 142817 2011-11-15 17:24:12Z andrea $ +# Maintainer: +# Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: arjan <arjan@archlinux.org> pkgname=libusb-compat pkgver=0.1.3 -pkgrel=1 +pkgrel=2 pkgdesc="Library to enable user space application programs to communicate with USB devices" arch=('i686' 'x86_64' 'mips64el') depends=('libusb' 'sh') url="http://libusb.sourceforge.net/" license=('LGPL') -source=(http://downloads.sourceforge.net/libusb/libusb-compat-0.1/$pkgname-$pkgver/${pkgname}-${pkgver}.tar.bz2) +source=("http://downloads.sourceforge.net/${pkgname%-*}/${pkgname}-${pkgver%.*}/$pkgname-$pkgver/${pkgname}-${pkgver}.tar.bz2") options=('!libtool') md5sums=('570ac2ea085b80d1f74ddc7c6a93c0eb') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr make } package() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR=${pkgdir} install } diff --git a/core/linux-atm/PKGBUILD b/core/linux-atm/PKGBUILD index 0939ae538..5134874b1 100644 --- a/core/linux-atm/PKGBUILD +++ b/core/linux-atm/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 107943 2011-01-28 01:46:01Z stephane $ +# $Id: PKGBUILD 142964 2011-11-19 08:22:13Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Surain Mallawa Arachchi <mas@crc32.net> pkgname=linux-atm -pkgver=2.5.1 -pkgrel=2 +pkgver=2.5.2 +pkgrel=1 pkgdesc="Drivers and tools to support ATM networking under Linux." arch=('i686' 'x86_64' 'mips64el') depends=('glibc') url="http://linux-atm.sourceforge.net/" license=(GPL) -source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tgz +source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz man-pages.patch) -md5sums=('9560b0e1f410a05b849dfdab465dd758' - '181390736336cdb615ae32f1ae5acfa6') options=(!libtool !makeflags) +md5sums=('d49499368c3cf15f73a05d9bce8824a8' + '181390736336cdb615ae32f1ae5acfa6') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -27,4 +27,3 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install } - diff --git a/core/ppp/PKGBUILD b/core/ppp/PKGBUILD index 038c0f52c..e9e6d7c32 100644 --- a/core/ppp/PKGBUILD +++ b/core/ppp/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 109460 2011-02-09 19:24:24Z stephane $ +# $Id: PKGBUILD 142987 2011-11-19 20:10:23Z thomas $ # Maintainer: Thomas Baechler <thomas@archlinux.org> pkgname=ppp pkgver=2.4.5 -pkgrel=2 +pkgrel=3 pkgdesc="A daemon which implements the Point-to-Point Protocol for dial-up networking" arch=(i686 x86_64 'mips64el') url="http://www.samba.org/ppp/" diff --git a/core/pptpclient/PKGBUILD b/core/pptpclient/PKGBUILD index 68f497aa1..1040e8ba9 100644 --- a/core/pptpclient/PKGBUILD +++ b/core/pptpclient/PKGBUILD @@ -1,29 +1,29 @@ -# $Id: PKGBUILD 99891 2010-11-19 12:45:55Z allan $ +# $Id: PKGBUILD 142906 2011-11-18 07:42:07Z pierre $ # Maintainer: Daniel Isenmann <daniel @ archlinux.org> # Contributor: Mark Nikkel <mnikkel@gmail.com> -pkgname=pptpclient +pkgname=pptpclient pkgver=1.7.2 -pkgrel=3 +pkgrel=4 pkgdesc="Client for the proprietary Microsoft Point-to-Point Tunneling Protocol, PPTP." arch=('i686' 'x86_64' 'mips64el') url="http://pptpclient.sourceforge.net/" license=('GPL') depends=('ppp' 'iproute2') -backup=(etc/ppp/options.pptp) -source=(http://downloads.sourceforge.net/sourceforge/pptpclient/pptp-$pkgver.tar.gz) +backup=('etc/ppp/options.pptp') +source=("http://downloads.sourceforge.net/sourceforge/pptpclient/pptp-$pkgver.tar.gz") md5sums=('4c3d19286a37459a632c7128c92a9857') -build() { +build() { cd $srcdir/pptp-$pkgver - + # use our CFLAGS and LDFLAGS sed -i -e "/CFLAGS =/ c\CFLAGS = ${CFLAGS}" Makefile sed -i -e "/LDFLAGS =/ c\LDFLAGS = ${LDFLAGS}" Makefile - + # adjust ip path sed -i 's#/bin/ip#/usr/sbin/ip#' routing.c - + make } diff --git a/core/reiserfsprogs/PKGBUILD b/core/reiserfsprogs/PKGBUILD index c723d2922..769a72908 100644 --- a/core/reiserfsprogs/PKGBUILD +++ b/core/reiserfsprogs/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 102064 2010-12-04 10:58:12Z allan $ +# $Id: PKGBUILD 142934 2011-11-18 14:00:58Z pierre $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=reiserfsprogs pkgver=3.6.21 -pkgrel=3 +pkgrel=4 pkgdesc="Reiserfs utilities" arch=('i686' 'x86_64' 'mips64el') -url="http://www.kernel.org/pub/linux/utils/fs/reiserfs/README" +url="http://www.kernel.org/" license=('GPL') groups=('base') -depends=('util-linux-ng>=2.16') -source=(http://www.kernel.org/pub/linux/utils/fs/reiserfs/reiserfsprogs-${pkgver}.tar.bz2) +depends=('util-linux-ng') +source=("ftp://ftp.archlinux.org/other/reiserfsprogs/reiserfsprogs-${pkgver}.tar.bz2") md5sums=('0639cefac8f8150536cfa7531c2aa2d2') build() { @@ -20,6 +20,11 @@ build() { make } +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install diff --git a/core/rfkill/PKGBUILD b/core/rfkill/PKGBUILD index e17e77cb5..040eef5b6 100644 --- a/core/rfkill/PKGBUILD +++ b/core/rfkill/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 109452 2011-02-09 18:22:15Z stephane $ +# $Id: PKGBUILD 142840 2011-11-16 20:25:37Z dan $ # Maintainer: Thomas Bächler <thomas@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=rfkill pkgver=0.4 -pkgrel=2 +pkgrel=3 pkgdesc="A tool for enabling and disabling wireless devices" arch=('i686' 'x86_64' 'mips64el') url="http://linuxwireless.org/en/users/Documentation/rfkill" diff --git a/core/rpcbind/PKGBUILD b/core/rpcbind/PKGBUILD index 2d3c66e67..7ddf7799e 100644 --- a/core/rpcbind/PKGBUILD +++ b/core/rpcbind/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 103509 2010-12-20 18:40:07Z andyrtr $ +# $Id: PKGBUILD 142757 2011-11-14 20:23:15Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=rpcbind pkgver=0.2.0 -pkgrel=3 +pkgrel=5 pkgdesc="portmap replacement which supports RPC over various protocols" arch=(i686 x86_64 'mips64el') depends=('bash' 'glibc' 'libtirpc') @@ -25,6 +25,11 @@ build() { make } +check() { + cd $srcdir/$pkgname-$pkgver + make check +} + package() { cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install diff --git a/core/sdparm/PKGBUILD b/core/sdparm/PKGBUILD index a61ecc2c7..b1497971a 100644 --- a/core/sdparm/PKGBUILD +++ b/core/sdparm/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 99522 2010-11-14 22:33:34Z andrea $ +# $Id: PKGBUILD 142819 2011-11-15 17:24:15Z andrea $ # Maintainer: # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: grimi@poczta.fm pkgname=sdparm pkgver=1.06 -pkgrel=1 +pkgrel=2 pkgdesc="An utility similar to hdparm but for SCSI devices" arch=('i686' 'x86_64' 'mips64el') url="http://sg.danny.cz/sg/sdparm.html" @@ -15,14 +15,20 @@ source=("http://sg.danny.cz/sg/p/${pkgname}-${pkgver}.tgz") md5sums=('5e19913658bb4f9849ddd909e0f47cde') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr make } +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir}/ install + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install - install -Dm644 COPYING $pkgdir/usr/share/licenses/${pkgname}/LICENSE + install -Dm644 COPYING \ + "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/core/syslog-ng/PKGBUILD b/core/syslog-ng/PKGBUILD index b83a5a570..58a245bde 100644 --- a/core/syslog-ng/PKGBUILD +++ b/core/syslog-ng/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 140503 2011-10-15 23:07:16Z dreisner $ +# $Id: PKGBUILD 142836 2011-11-16 14:19:52Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Maintainer: Eric Bélanger <eric@archlinux.org> # Maintainer: Aaron Griffin <aaron@archlinux.org> pkgname=syslog-ng -pkgver=3.3.1 +pkgver=3.3.2 pkgrel=1 pkgdesc="Next-generation syslogd with advanced networking and filtering capabilities" arch=('i686' 'x86_64' 'mips64el') @@ -22,13 +22,13 @@ source=("http://www.balabit.com/downloads/files/syslog-ng/sources/$pkgver/source syslog-ng.conf syslog-ng.logrotate syslog-ng.rc) -sha1sums=('f084d66754c7fa1eada56946f77ef3066faa27a1' +sha1sums=('a7cfc987cdd584e357e253d2794bad1159776638' '98074e0facfc6ef036202662cc86d04b38a2c142' 'ac997b25d7d8e69e66782d3771a0e12aff55ae7f' 'a6ad26912b5bcbe1b47b003309945d733613b98f') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" ./configure \ --prefix=/usr \ @@ -44,9 +44,7 @@ build() { } package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir" install + make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install install -dm755 "$pkgdir/var/lib/syslog-ng" "$pkgdir/etc/syslog-ng/patterndb.d" install -Dm644 "$srcdir/syslog-ng.conf" "$pkgdir/etc/syslog-ng/syslog-ng.conf" diff --git a/core/xfsprogs/PKGBUILD b/core/xfsprogs/PKGBUILD index 9d01c2a9b..e4fcf373b 100644 --- a/core/xfsprogs/PKGBUILD +++ b/core/xfsprogs/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 118982 2011-04-09 21:14:21Z tpowa $ +# $Id: PKGBUILD 142968 2011-11-19 08:45:36Z tpowa $ # Maintainer: Paul Mattal <paul@archlinux.org> pkgname=xfsprogs -pkgver=3.1.5 +pkgver=3.1.7 pkgrel=1 pkgdesc="XFS filesystem utilities" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ depends=('util-linux-ng>=2.16') options=('!makeflags' '!libtool') # We mirror the sources as upstream tends to move them once a new release is out source=("ftp://ftp.archlinux.org/other/xfsprogs/${pkgname}-${pkgver}.tar.gz") -md5sums=('b1db37749e2b4149a0dd178abff956be') +md5sums=('049cf9873794ea49d0bb3f12d45748a4') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/aisleriot/PKGBUILD b/extra/aisleriot/PKGBUILD index 22eb0e4b1..314410011 100644 --- a/extra/aisleriot/PKGBUILD +++ b/extra/aisleriot/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 140834 2011-10-20 05:41:34Z ibiru $ +# $Id: PKGBUILD 142864 2011-11-17 18:34:18Z ibiru $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=aisleriot -pkgver=3.2.1 +pkgver=3.2.2 pkgrel=1 pkgdesc="GNOME Solitaire card games" arch=(mips64el) @@ -14,7 +14,7 @@ makedepends=(gnome-doc-utils intltool itstool) options=('!emptydirs' '!libtool') install=aisleriot.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('86bbc131daf97d14f1587216d3e4c73db35126dddf393bfef4f7a67822f96529') +sha256sums=('818e16767f30238a98332fe07e8b905376a71de05feb3de19815652a48fdfcca') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/anjuta/PKGBUILD b/extra/anjuta/PKGBUILD index 4baf7e714..93c2775d2 100644 --- a/extra/anjuta/PKGBUILD +++ b/extra/anjuta/PKGBUILD @@ -1,32 +1,32 @@ -# $Id: PKGBUILD 140836 2011-10-20 05:41:37Z ibiru $ +# $Id: PKGBUILD 142974 2011-11-19 10:42:16Z ibiru $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Harley Laue <losinggeneration@yahoo.com> pkgname=anjuta -pkgver=3.2.1 +pkgver=3.2.2 pkgrel=1 pkgdesc="GNOME Integrated Development Environment (IDE)" arch=('i686' 'x86_64' 'mips64el') license=('GPL') -depends=('vte3' 'gdl' 'autogen' 'devhelp' 'glade' 'libgda' 'subversion' 'gnome-icon-theme' 'hicolor-icon-theme' 'vala' 'python2' 'shared-mime-info' 'desktop-file-utils') +depends=('vte3' 'gdl' 'autogen' 'devhelp' 'glade' 'libgda' 'subversion' 'gnome-icon-theme' 'vala' 'dconf') makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection') url="http://anjuta.sourceforge.net/" install=anjuta.install -source=(ftp://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +source=(ftp://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) options=('!libtool' '!emptydirs') -sha256sums=('1e59aed63312e293c55f2934c4766411e9908fa512dd86e1422e3d906fe75613') +sha256sums=('909fee6af9b86192eecac47e417f1de8bd8c759dfd2bf3ee288bb146a575683e') build() { - cd "${srcdir}/anjuta-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-scrollkeeper make } package(){ - cd "${srcdir}/anjuta-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="${pkgdir}" install + make DESTDIR="$pkgdir" install sed -i "1s|#!/usr/bin/python$|&2|" \ $pkgdir/usr/share/anjuta/project/{pygtk,python}/src/main.py diff --git a/extra/anjuta/anjuta.install b/extra/anjuta/anjuta.install index c6fcfec11..59113c6f5 100644 --- a/extra/anjuta/anjuta.install +++ b/extra/anjuta/anjuta.install @@ -1,9 +1,9 @@ post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + glib-compile-schemas /usr/share/glib-2.0/schemas update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - gtk-update-icon-cache -q -t -f usr/share/icons/gnome - update-mime-database usr/share/mime > /dev/null + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor + gtk-update-icon-cache -q -t -f /usr/share/icons/gnome + update-mime-database /usr/share/mime > /dev/null } pre_upgrade() { diff --git a/extra/attica/PKGBUILD b/extra/attica/PKGBUILD index a984a7082..d50a08cfe 100644 --- a/extra/attica/PKGBUILD +++ b/extra/attica/PKGBUILD @@ -1,8 +1,8 @@ -# $Id$ +# $Id: PKGBUILD 142782 2011-11-15 06:11:07Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=attica -pkgver=0.2.0 +pkgver=0.2.9 pkgrel=1 pkgdesc='A library to access Open Collaboration Service providers' arch=('i686' 'x86_64' 'mips64el') @@ -11,10 +11,10 @@ license=('LGPL') depends=('qt') makedepends=('cmake') source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('df3dcea0229cfa31539bdd427976e15b') +md5sums=('7dadb6ca7dec09f89d41cd868ea6dc39') build() { - cd ${srcdir} + cd "${srcdir}" mkdir build cd build cmake ../${pkgname}-${pkgver} \ @@ -24,6 +24,6 @@ build() { } package() { - cd ${srcdir}/build - make DESTDIR=${pkgdir} install + cd "${srcdir}/build" + make DESTDIR="${pkgdir}" install } diff --git a/extra/bind/PKGBUILD b/extra/bind/PKGBUILD index e9243bbad..b9acf0d7d 100644 --- a/extra/bind/PKGBUILD +++ b/extra/bind/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 137100 2011-09-06 08:10:20Z bisson $ +# $Id: PKGBUILD 142846 2011-11-16 23:53:56Z ibiru $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> # Contributor: Mario Vazquez <mario_vazq@hotmail.com> @@ -6,8 +6,8 @@ pkgname=bind # Use a period and not a hyphen before the patch level for proper versioning. -pkgver=9.8.1 -_pkgver=9.8.1 +pkgver=9.8.1.P1 +_pkgver=9.8.1-P1 pkgrel=1 pkgdesc='Berkeley Internet Name Daemon is the reference implementation of the DNS protocols' @@ -26,7 +26,7 @@ source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz" 'named.logrotate' 'localhost.zone' '127.0.0.zone') -sha1sums=('7e6ed6ebc896b1de33a9f440233066c60539de4c' +sha1sums=('1cff6594aa185d84942edd2f3cc06dff9cebb04b' 'cbdecd1ea8e7b612b33b63d66bc57273795d1f54' 'b433ba99f23e3db305f8ce293fe4ce6d1b8d4cfb' '18f477f510df31e6c6f547ee2d5fc46e973479bf' diff --git a/extra/bitlbee/PKGBUILD b/extra/bitlbee/PKGBUILD index ed99212ff..d4e1c3b34 100644 --- a/extra/bitlbee/PKGBUILD +++ b/extra/bitlbee/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 142478 2011-11-10 14:19:09Z bisson $ +# $Id: PKGBUILD 142776 2011-11-15 02:49:37Z bisson $ # Contributor: FUBAR <mrfubar@gmail.com> # Contributor: simo <simo@archlinux.org> # Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org> @@ -7,7 +7,7 @@ pkgname=bitlbee pkgver=3.0.3 -pkgrel=5 +pkgrel=6 pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC' arch=('i686' 'x86_64' 'mips64el') url='http://www.bitlbee.org/' @@ -19,7 +19,7 @@ source=("http://get.bitlbee.org/src/${pkgname}-${pkgver}.tar.gz" 'xinetd' 'rc.d') sha1sums=('4140eb7aaa2c6a39fa059d19f8fbaec0d7a1ebff' - 'e5880344ff96e6f061d850e7207f5f0bb31fb82b' + 'fee9dcd59ad0231ffbcae822f17b68d9a8684376' '5e0af27ba9cc4fe455e3381c75fc49a9326e2f17' 'be09d29af3853825778331df451f16ca9e452d03') diff --git a/extra/bitlbee/msn.patch b/extra/bitlbee/msn.patch index e126784bf..55e2f9b92 100644 --- a/extra/bitlbee/msn.patch +++ b/extra/bitlbee/msn.patch @@ -1,29 +1,27 @@ ---- bitlbee-3.0.3.old/protocols/msn/soap.h 2011-06-12 08:53:51.000000000 -0300 -+++ bitlbee-3.0.3/protocols/msn/soap.h 2011-11-09 21:35:56.000000000 -0200 -@@ -115,7 +115,7 @@ int msn_soapq_flush( struct im_connectio - "<wst:RequestType>http://schemas.xmlsoap.org/ws/2004/04/security/trust/Issue</wst:RequestType>" \ - "<wsp:AppliesTo>" \ - "<wsa:EndpointReference>" \ -- "<wsa:Address>contacts.msn.com</wsa:Address>" \ -+ "<wsa:Address>local-bay.contacts.msn.com</wsa:Address>" \ - "</wsa:EndpointReference>" \ - "</wsp:AppliesTo>" \ - "<wsse:PolicyReference xmlns=\"http://schemas.xmlsoap.org/ws/2003/06/secext\" URI=\"MBI\"></wsse:PolicyReference>" \ -@@ -198,7 +198,7 @@ int msn_soap_oim_send_queue( struct im_c - "</soap:Body>" \ - "</soap:Envelope>" - --#define SOAP_MEMLIST_URL "http://contacts.msn.com/abservice/SharingService.asmx" -+#define SOAP_MEMLIST_URL "http://local-bay.contacts.msn.com/abservice/SharingService.asmx" - #define SOAP_MEMLIST_ACTION "http://www.msn.com/webservices/AddressBook/FindMembership" - - #define SOAP_MEMLIST_PAYLOAD \ -@@ -233,7 +233,7 @@ int msn_soap_memlist_request( struct im_ - int msn_soap_memlist_edit( struct im_connection *ic, const char *handle, gboolean add, int list ); - - --#define SOAP_ADDRESSBOOK_URL "http://contacts.msn.com/abservice/abservice.asmx" -+#define SOAP_ADDRESSBOOK_URL "http://local-bay.contacts.msn.com/abservice/abservice.asmx" - #define SOAP_ADDRESSBOOK_ACTION "http://www.msn.com/webservices/AddressBook/ABFindAll" - - #define SOAP_ADDRESSBOOK_PAYLOAD \ +Index: devel/lib/http_client.c
+===================================================================
+--- devel/lib/http_client.c (revision devel,783)
++++ devel/lib/http_client.c (revision devel,824)
+@@ -314,5 +314,5 @@
+ }
+
+- if( ( req->status_code == 301 || req->status_code == 302 ) && req->redir_ttl-- > 0 )
++ if( ( req->status_code >= 301 && req->status_code <= 303 ) && req->redir_ttl-- > 0 )
+ {
+ char *loc, *new_request, *new_host;
+@@ -375,8 +375,11 @@
+ going to use strcat(), whether you like it or not. :-) */
+
+- sprintf( new_request, "GET %s HTTP/1.0", url->file );
+-
+- s = strstr( req->request, "\r\n" );
+- if( s == NULL )
++ *s = 0;
++ sprintf( new_request, "%s %s HTTP/1.0\r\nHost: %s",
++ req->status_code == 303 || req->request[0] == 'G' ? "GET" : "POST", url->file, url->host );
++ *s = ' ';
++
++ if( !( ( s = strstr( req->request, "\r\nHost: " ) ) &&
++ ( s = strstr( s + strlen( "\r\nHost: " ), "\r\n" ) ) ) )
+ {
+ req->status_string = g_strdup( "Error while rebuilding request string" );
diff --git a/extra/dovecot/PKGBUILD b/extra/dovecot/PKGBUILD index 8108bf6b4..be7a8e2b3 100644 --- a/extra/dovecot/PKGBUILD +++ b/extra/dovecot/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 138194 2011-09-18 13:49:40Z andyrtr $ +# $Id: PKGBUILD 142912 2011-11-18 08:18:50Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Paul Mattal <paul@mattal.com> # Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com> # Contributor: GARETTE Emmanuel <gnunux at laposte dot net> pkgname=dovecot -pkgver=2.0.15 +pkgver=2.0.16 pkgrel=1 pkgdesc="An IMAP and POP3 server written with security primarily in mind" arch=('i686' 'x86_64' 'mips64el') @@ -25,7 +25,7 @@ backup=(etc/dovecot/dovecot.conf etc/ssl/dovecot-openssl.cnf) install=$pkgname.install source=(http://dovecot.org/releases/2.0/${pkgname}-${pkgver}.tar.gz dovecot.sh) -md5sums=('16a08dfd24422d482440a8b03d6f7f6c' +md5sums=('e01a29a355afefcb9fb5f8b7a54e1a14' '587159e84e2da6f83d70b3c706ba87cc') build() { diff --git a/extra/empathy/PKGBUILD b/extra/empathy/PKGBUILD index 432c535ea..e44a59713 100644 --- a/extra/empathy/PKGBUILD +++ b/extra/empathy/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 142286 2011-11-07 20:59:23Z ibiru $ +# $Id: PKGBUILD 142866 2011-11-17 18:34:20Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=empathy -pkgver=3.2.1.2 +pkgver=3.2.2 pkgrel=1 pkgdesc="A GNOME instant messaging client using the Telepathy framework." arch=('i686' 'x86_64' 'mips64el') @@ -20,11 +20,11 @@ optdepends=('telepathy-gabble: XMPP/Jabber support' options=('!libtool') groups=('gnome-extra') install=empathy.install -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/3.2/${pkgname}-${pkgver}.tar.xz) -sha256sums=('44e149ecadce6269a6d31d93bbd7d4a4bda8d092d4e95de9d5ca09cf067d8ab7') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/3.2/$pkgname-$pkgver.tar.xz) +sha256sums=('d6a391b801f58024ed6f97d9bf4e774b9ab9e1262d79aefb5c1dd95233fd5aa1') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib/empathy \ @@ -36,6 +36,6 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } diff --git a/extra/eog/PKGBUILD b/extra/eog/PKGBUILD index 26a877beb..7f73d8c1b 100644 --- a/extra/eog/PKGBUILD +++ b/extra/eog/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 140853 2011-10-20 05:41:57Z ibiru $ +# $Id: PKGBUILD 142868 2011-11-17 18:34:22Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=eog -pkgver=3.2.1 +pkgver=3.2.2 pkgrel=1 pkgdesc="Eye of Gnome: An image viewing and cataloging program" arch=('i686' 'x86_64' 'mips64el') @@ -13,20 +13,20 @@ install=eog.install groups=('gnome-extra') options=('!emptydirs' '!libtool') url="http://www.gnome.org" -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('ae20715790796061e51132804f5925c5a61a1e615527c7c746cd8b76a8f97c89') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('315625babf04293341bd0b3ae26337d11c8696422d5dc4442ad551b25db42530') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-scrollkeeper make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install # remove it from Xfce menu that ships its own thingy - echo "NotShowIn=XFCE" >> ${pkgdir}/usr/share/applications/eog.desktop + echo "NotShowIn=XFCE" >> $pkgdir/usr/share/applications/eog.desktop } diff --git a/extra/evolution-data-server/PKGBUILD b/extra/evolution-data-server/PKGBUILD index e70bce5d4..48754fefd 100644 --- a/extra/evolution-data-server/PKGBUILD +++ b/extra/evolution-data-server/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 140863 2011-10-20 05:42:08Z ibiru $ +# $Id: PKGBUILD 142872 2011-11-17 18:34:28Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=evolution-data-server -pkgver=3.2.1 +pkgver=3.2.2 pkgrel=1 pkgdesc="Centralized access to appointments and contacts" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ options=('!libtool') url="http://www.gnome.org" license=('GPL') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/3.2/${pkgname}-${pkgver}.tar.xz) -sha256sums=('0091e41e87d589a984c6d089919fece2d28101df5b37e4b2d8615efdf60a09c3') +sha256sums=('2a129b4c9412b8b855ce28bd682e522b3af0309e407f9d900f1d48be649bc76a') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/evolution-ews/PKGBUILD b/extra/evolution-ews/PKGBUILD new file mode 100644 index 000000000..29fa39fd2 --- /dev/null +++ b/extra/evolution-ews/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 142874 2011-11-17 18:34:31Z ibiru $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> + +pkgname=evolution-ews +pkgver=3.2.2 +pkgrel=1 +pkgdesc="MS Exchange integration through Exchange Web Services" +arch=('i686' 'x86_64') +license=('LGPL2.1') +url="http://www.gnome.org" +depends=('evolution-data-server' 'gtkhtml4' 'gnome-desktop') +makedepends=('intltool' 'evolution') +options=('!libtool' '!emptydirs') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('f6a557a93e632e19cde1501f6f0540f67e41c193120d7297268662ddc7927439') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --libexecdir=/usr/lib/evolution --disable-static + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/extra/evolution/PKGBUILD b/extra/evolution/PKGBUILD index 394ef098a..8dfdf8698 100644 --- a/extra/evolution/PKGBUILD +++ b/extra/evolution/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 140861 2011-10-20 05:42:06Z ibiru $ +# $Id: PKGBUILD 142870 2011-11-17 18:34:24Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=evolution -pkgver=3.2.1 +pkgver=3.2.2 pkgrel=1 pkgdesc="Manage your email, contacts and schedule" arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +16,7 @@ options=('!libtool' '!emptydirs') install=evolution.install url=http://www.gnome.org/projects/evolution/ source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('244d4fcf57d59b3fe0bcedddc65da5f508b253cb64159e6ddb2bddedf8d7e19a') +sha256sums=('03c68242bbf494dda3bf34f52ec843c282c9bb07f9415a69fe58237c7efbbe7d') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/freetype2/PKGBUILD b/extra/freetype2/PKGBUILD index e08d033e3..a9b9a792c 100644 --- a/extra/freetype2/PKGBUILD +++ b/extra/freetype2/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 141107 2011-10-24 08:04:06Z jgc $ +# $Id: PKGBUILD 142921 2011-11-18 09:26:09Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=freetype2 -pkgver=2.4.7 +pkgver=2.4.8 pkgrel=1 pkgdesc="TrueType font rendering library" arch=(i686 x86_64 'mips64el') license=('GPL') url="http://freetype.sourceforge.net" -depends=('zlib') +depends=('zlib' 'bzip2' 'sh') options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/freetype/freetype-${pkgver}.tar.bz2 freetype-2.3.0-enable-spr.patch freetype-2.2.1-enable-valid.patch) -md5sums=('dbadce8f0c5e70a0b7c51eadf2dd9394' +md5sums=('dbf2caca1d3afd410a29217a9809d397' '816dc8619a6904a7385769433c0a8653' '214119610444c9b02766ccee5e220680') @@ -26,6 +26,11 @@ build() { make } +check() { + cd "${srcdir}/freetype-${pkgver}" + make -k check +} + package() { cd "${srcdir}/freetype-${pkgver}" make DESTDIR="${pkgdir}" install diff --git a/extra/gedit/PKGBUILD b/extra/gedit/PKGBUILD index 69af3bf6f..1b80a60be 100644 --- a/extra/gedit/PKGBUILD +++ b/extra/gedit/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141681 2011-11-02 09:25:16Z ibiru $ +# $Id: PKGBUILD 142878 2011-11-17 18:34:36Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gedit -pkgver=3.2.2 +pkgver=3.2.3 pkgrel=1 pkgdesc="A text editor for GNOME" arch=('i686' 'x86_64' 'mips64el') @@ -13,11 +13,11 @@ groups=('gnome-extra') options=('!libtool' '!emptydirs') url="http://www.gnome.org" install=gedit.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('e87db79bf93b5149bb76e5845716d30d8c4f47b499848604feef233408ac0d21') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('9db009de74874846edadc0f4a7dc0127a4272cff4348a13544c611cc3696b751') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ --sysconfdir=/etc --localstatedir=/var \ --libexecdir=/usr/lib --disable-scrollkeeper \ @@ -27,6 +27,6 @@ build() { } package(){ - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } diff --git a/extra/glibmm/PKGBUILD b/extra/glibmm/PKGBUILD index f739422fc..7599f84f9 100644 --- a/extra/glibmm/PKGBUILD +++ b/extra/glibmm/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 139277 2011-10-01 18:57:17Z ibiru $ +# $Id: PKGBUILD 142936 2011-11-18 15:46:22Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgbase=glibmm pkgname=('glibmm' 'glibmm-docs') -pkgver=2.30.0 +pkgver=2.30.1 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('LGPL') makedepends=('glib2' 'libsigc++2.0' 'pkgconfig') -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) options=('!libtool') -url="http://gtkmm.sourceforge.net/" -sha256sums=('a7ad3fc34c2ba108511738a6ecbf9396edeb26776b2f9b5f4490551509ee0db4') +url="http://www.gtkmm.org/" +sha256sums=('69582b584666cab1dc4253faffee548054730bc058e28466871e6a954d7ff897') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr make } @@ -23,13 +23,13 @@ build() { package_glibmm() { pkgdesc="Glib-- (glibmm) is a C++ interface for glib" depends=('glib2' 'libsigc++2.0') - cd "${srcdir}/${pkgbase}-${pkgver}" + cd "$srcdir/$pkgbase-$pkgver" sed -i -e 's/^doc_subdirs/#doc_subdirs/' Makefile - make DESTDIR="${pkgdir}" install + make DESTDIR="$pkgdir" install } package_glibmm-docs() { pkgdesc="Developer documentation for glibmm" - cd "${srcdir}/${pkgbase}-${pkgver}/docs" - make DESTDIR="${pkgdir}" install + cd "$srcdir/$pkgbase-$pkgver/docs" + make DESTDIR="$pkgdir" install } diff --git a/extra/gnome-keyring/PKGBUILD b/extra/gnome-keyring/PKGBUILD index fe639422f..9274a5956 100644 --- a/extra/gnome-keyring/PKGBUILD +++ b/extra/gnome-keyring/PKGBUILD @@ -1,8 +1,8 @@ -#$Id: PKGBUILD 140897 2011-10-20 05:42:44Z ibiru $ +#$Id: PKGBUILD 142880 2011-11-17 18:34:39Z ibiru $ # Maintainer: Jan De Groot <jgc@archlinux.org> pkgname=gnome-keyring -pkgver=3.2.1 +pkgver=3.2.2 pkgrel=1 pkgdesc="GNOME Password Management daemon" arch=(i686 x86_64 'mips64el') @@ -14,7 +14,7 @@ options=('!libtool' '!emptydirs') url="http://www.gnome.org" install=gnome-keyring.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('49872dad0c22e495f65be226d6effa053605df9cdc7cb06781aa37d3ff36b8a9') +sha256sums=('f4cdc2c492a9b0157d59439310093e611e1f718a16f7ee2391ac03aadacfaaa3') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gnome-keyring/gnome-keyring.install b/extra/gnome-keyring/gnome-keyring.install index 37d76c56a..e899ab5a2 100644 --- a/extra/gnome-keyring/gnome-keyring.install +++ b/extra/gnome-keyring/gnome-keyring.install @@ -1,9 +1,9 @@ post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - update-mime-database usr/share/mime 1> /dev/null - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + glib-compile-schemas /usr/share/glib-2.0/schemas + update-mime-database /usr/share/mime 1> /dev/null + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor update-desktop-database -q - setcap cap_ipc_lock=ep usr/bin/gnome-keyring-daemon + setcap cap_ipc_lock=ep /usr/bin/gnome-keyring-daemon } post_upgrade() { diff --git a/extra/gtk-vnc/PKGBUILD b/extra/gtk-vnc/PKGBUILD index 0b322c6ba..a962a152b 100644 --- a/extra/gtk-vnc/PKGBUILD +++ b/extra/gtk-vnc/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 138088 2011-09-16 07:43:49Z ibiru $ +# $Id: PKGBUILD 142786 2011-11-15 06:28:23Z eric $ # Maintainer: # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Allan McRae <mcrae_allan@hotmail.com> # Contributor: lp76 <l.peduto@gmail.com> pkgname=gtk-vnc -pkgver=0.4.3 -pkgrel=2 +pkgver=0.4.4 +pkgrel=1 pkgdesc="A VNC viewer widget for GTK" arch=('i686' 'x86_64' 'mips64el') url="http://live.gnome.org/gtk-vnc" license=('LGPL') -depends=('gtk3') +depends=('libgcrypt' 'gtk3') optdepends=('gtk2: GTK2 widget') -makedepends=('intltool' 'pygtk' 'pygobject2-devel' 'gtk-doc' 'gtk2') +makedepends=('intltool' 'pygtk' 'pygobject2-devel' 'gtk-doc' 'gtk2' 'vala' 'gobject-introspection') options=('!libtool') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('b9870d923d636d2e7547267d01c8cafdc06ad5b5b4987003ea3cd567bfbb6377') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('c93fdb53c78b52a1cfa067c1a0be0b93d4adfc17ccea1215f20eeab2818308b7') build() { cd "$srcdir" diff --git a/extra/gtk2/PKGBUILD b/extra/gtk2/PKGBUILD index 67d84ecd1..02209a249 100644 --- a/extra/gtk2/PKGBUILD +++ b/extra/gtk2/PKGBUILD @@ -1,24 +1,27 @@ -# $Id: PKGBUILD 142534 2011-11-11 18:06:50Z ibiru $ +# $Id: PKGBUILD 142844 2011-11-16 23:13:07Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gtk2 pkgname=('gtk2' 'gtk-update-icon-cache') pkgver=2.24.8 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://www.gtk.org/" makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'shared-mime-info' 'cairo' 'libcups' 'gdk-pixbuf2' 'gobject-introspection') options=('!libtool' '!docs') license=('LGPL') -source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${pkgver}.tar.xz - xid-collision-debug.patch) +source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-$pkgver.tar.xz + xid-collision-debug.patch + revert-iconview.patch) sha256sums=('8a3b29f667933cf52eea2db7b066723edbc80443ca9c75b7cd7cbe8c8b90b93c' - 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558') + 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558' + '517b3d0797b27324b8fa042ce4b653334ff3b55e48b921de3485505b9ca99fba') build() { - cd "${srcdir}/gtk+-${pkgver}" - patch -Np1 -i "${srcdir}/xid-collision-debug.patch" + cd "$srcdir/gtk+-$pkgver" + patch -Np1 -i "$srcdir/xid-collision-debug.patch" + patch -Np1 -i "$srcdir/revert-iconview.patch" CXX=/bin/false ./configure --prefix=/usr \ --sysconfdir=/etc \ @@ -37,19 +40,19 @@ package_gtk2() { depends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'shared-mime-info' 'cairo' 'libcups' 'gtk-update-icon-cache') backup=(etc/gtk-2.0/gtkrc) - cd "${srcdir}/gtk+-${pkgver}" + cd "$srcdir/gtk+-$pkgver" - make DESTDIR="${pkgdir}" install + make DESTDIR="$pkgdir" install sed -i "s#env python#env python2#" $pkgdir/usr/bin/gtk-builder-convert - echo 'gtk-fallback-icon-theme = "gnome"' > "${pkgdir}/etc/gtk-2.0/gtkrc" + echo 'gtk-fallback-icon-theme = "gnome"' > "$pkgdir/etc/gtk-2.0/gtkrc" #split this out to use with gtk3 too - rm ${pkgdir}/usr/bin/gtk-update-icon-cache + rm $pkgdir/usr/bin/gtk-update-icon-cache } package_gtk-update-icon-cache() { pkgdesc="The GTK+ update icon cache tool" depends=('gdk-pixbuf2') - cd "${srcdir}/gtk+-${pkgver}/gtk" + cd "$srcdir/gtk+-$pkgver/gtk" - install -D -m755 gtk-update-icon-cache ${pkgdir}/usr/bin/gtk-update-icon-cache + install -D -m755 gtk-update-icon-cache $pkgdir/usr/bin/gtk-update-icon-cache } diff --git a/extra/gtk2/revert-iconview.patch b/extra/gtk2/revert-iconview.patch new file mode 100644 index 000000000..e16fc38e3 --- /dev/null +++ b/extra/gtk2/revert-iconview.patch @@ -0,0 +1,30 @@ +From 5c3bb1839cac52828756f9ddb98f49d586853991 Mon Sep 17 00:00:00 2001 +From: Cosimo Cecchi <cosimoc@gnome.org> +Date: Wed, 16 Nov 2011 22:38:45 +0000 +Subject: Revert "iconview: layout items immediately when setting a GtkTreeModel" + +It makes GtkIconView segfault on GTK 2.24. + +gtk_icon_view_expose() calls gtk_icon_view_layout() first thing if +there's a layout queued anyway, so we wouldn't end up in the same +situation causing the crash the original patch is supposed to fix. + +This reverts commit 5a03f4a6a50237d86959f596dda143dfc2f040d1. + +https://bugzilla.gnome.org/show_bug.cgi?id=663138 +--- +diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c +index 62877fa..54b3f3b 100644 +--- a/gtk/gtkiconview.c ++++ b/gtk/gtkiconview.c +@@ -5423,7 +5423,7 @@ gtk_icon_view_set_model (GtkIconView *icon_view, + + gtk_icon_view_build_items (icon_view); + +- gtk_icon_view_layout (icon_view); ++ gtk_icon_view_queue_layout (icon_view); + } + + g_object_notify (G_OBJECT (icon_view), "model"); +-- +cgit v0.9.0.2 diff --git a/extra/gtkhtml4/PKGBUILD b/extra/gtkhtml4/PKGBUILD index 7ffd4199c..9f5764c6d 100644 --- a/extra/gtkhtml4/PKGBUILD +++ b/extra/gtkhtml4/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 140927 2011-10-20 05:43:44Z ibiru $ +# $Id: PKGBUILD 142883 2011-11-17 18:34:43Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gtkhtml4 _pkgbasename=gtkhtml -pkgver=4.2.1 +pkgver=4.2.2 pkgrel=1 pkgdesc="A lightweight HTML renderer/editor widget for GTK3" arch=(i686 x86_64 'mips64el') @@ -13,7 +13,7 @@ makedepends=('intltool') url="http://www.gnome.org" options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/${_pkgbasename}/${pkgver%.*}/${_pkgbasename}-${pkgver}.tar.xz) -sha256sums=('e72fb264bae45f2a340818c645248c29eaa2acf3d2bb3c2316ae296a0d438558') +sha256sums=('e20bb5d461e9ae9d3a8d4e13d544db1813707810ded7cbde9287485f2394dd2c') build() { cd "${srcdir}/${_pkgbasename}-${pkgver}" diff --git a/extra/gucharmap/PKGBUILD b/extra/gucharmap/PKGBUILD index 0a0575363..51ab892ac 100644 --- a/extra/gucharmap/PKGBUILD +++ b/extra/gucharmap/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 140931 2011-10-20 05:43:50Z ibiru $ +# $Id: PKGBUILD 142885 2011-11-17 18:34:47Z ibiru $ # Maintainer: Jan De Groot <jgc@archlinux.org> pkgname=gucharmap -pkgver=3.2.1 +pkgver=3.2.2 pkgrel=1 pkgdesc="Gnome Unicode Charmap" arch=('i686' 'x86_64' 'mips64el') @@ -12,11 +12,11 @@ depends=('gconf' 'hicolor-icon-theme') makedepends=('gtk-doc' 'intltool' 'gobject-introspection') options=('!libtool' '!emptydirs') install=gucharmap.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('b06f376e5baaa41f0236d659bd6d03e3b38759198257a60affb6ddb2e111beff') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('da1e422d387ff4df8bfb61e8a340483f88b0d23e4309a776848dbeb4093a5a21') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ --disable-scrollkeeper --enable-introspection @@ -24,10 +24,10 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make -j1 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install + cd "$srcdir/$pkgname-$pkgver" + make -j1 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gucharmap ${pkgdir}/etc/gconf/schemas/*.schemas - rm -f ${pkgdir}/etc/gconf/schemas/*.schemas + install -m755 -d "$pkgdir/usr/share/gconf/schemas" + gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain gucharmap $pkgdir/etc/gconf/schemas/*.schemas + rm -f $pkgdir/etc/gconf/schemas/*.schemas } diff --git a/extra/libcroco/PKGBUILD b/extra/libcroco/PKGBUILD index 051d67b70..044155702 100644 --- a/extra/libcroco/PKGBUILD +++ b/extra/libcroco/PKGBUILD @@ -1,26 +1,26 @@ -# $Id: PKGBUILD 137630 2011-09-10 08:40:20Z pierre $ +# $Id: PKGBUILD 142887 2011-11-17 18:34:50Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libcroco -pkgver=0.6.2 -pkgrel=2 -pkgdesc="GNOME CSS2 parsing and manipulation toolkit" +pkgver=0.6.3 +pkgrel=1 +pkgdesc="A CSS parsing library" arch=('x86_64' 'i686' 'mips64el') depends=('glib2' 'libxml2') -makedepends=('intltool' 'pkgconfig') +makedepends=('intltool') license=('LGPL') options=('!libtool') -source=("http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.6/${pkgname}-${pkgver}.tar.bz2") +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/0.6/$pkgname-$pkgver.tar.xz) url="http://www.gnome.org" -md5sums=('1429c597aa4b75fc610ab3a542c99209') +sha256sums=('8b7c565bf3eae1dff0a09d128fc3726acc1a492a7de23b25dce803a4f93d42c1') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr --disable-static make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } diff --git a/extra/libdvdcss/PKGBUILD b/extra/libdvdcss/PKGBUILD index fffcd698a..06764d19f 100644 --- a/extra/libdvdcss/PKGBUILD +++ b/extra/libdvdcss/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 102948 2010-12-13 12:51:30Z stephane $ +# $Id: PKGBUILD 142850 2011-11-17 01:39:31Z eric $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: arjan <arjan@archlinux.org> # Contributor Sarah Hay <sarahhay@mb.sympatico.ca> pkgname=libdvdcss -pkgver=1.2.10 -pkgrel=2 +pkgver=1.2.11 +pkgrel=1 pkgdesc="A portable abstraction library for DVD decryption" url="http://www.videolan.org/libdvdcss" arch=('i686' 'x86_64' 'mips64el') @@ -13,8 +13,7 @@ license=('GPL') depends=('glibc') options=('!libtool') source=(http://download.videolan.org/pub/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('7c933d011e34c218048d48f0c1a8b4ff56798dcd') - +sha512sums=('32dec992cf2f352a09c4edc39ea16101fc9005f3aecc43460aa1b5834c104d3f2c1efc81051339fa18fd4f33cfa949fd17ffe84414519a92b91d0d8a1ae4c467') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/libffado/60-ffado.rules b/extra/libffado/60-ffado.rules new file mode 100644 index 000000000..6ab8ef851 --- /dev/null +++ b/extra/libffado/60-ffado.rules @@ -0,0 +1,27 @@ +SUBSYSTEM!="firewire", GOTO="ffado_end" + +ATTR{vendor}=="0x000166", GROUP="audio", ENV{ID_FFADO}="1" # TC GROUP A/S +ATTR{vendor}=="0x0001f2", GROUP="audio", ENV{ID_FFADO}="1" # Mark of the Unicorn, Inc. +ATTR{vendor}=="0x0003db", GROUP="audio", ENV{ID_FFADO}="1" # Apogee Electronics Corp. +ATTR{vendor}=="0x000595", GROUP="audio", ENV{ID_FFADO}="1" # Alesis Corporation +ATTR{vendor}=="0x0007f5", GROUP="audio", ENV{ID_FFADO}="1" # Bridgeco Co AG +ATTR{vendor}=="0x000a92", GROUP="audio", ENV{ID_FFADO}="1" # Presonus Corporation +ATTR{vendor}=="0x000aac", GROUP="audio", ENV{ID_FFADO}="1" # TerraTec Electronic GmbH +ATTR{vendor}=="0x000d6c", GROUP="audio", ENV{ID_FFADO}="1" # M-Audio +ATTR{vendor}=="0x000f1b", GROUP="audio", ENV{ID_FFADO}="1" # Ego Systems Inc. +ATTR{vendor}=="0x000ff2", GROUP="audio", ENV{ID_FFADO}="1" # Loud Technologies Inc. +ATTR{vendor}=="0x001260", GROUP="audio", ENV{ID_FFADO}="1" # Stanton Magnetics,inc. +ATTR{vendor}=="0x00130e", GROUP="audio", ENV{ID_FFADO}="1" # Focusrite Audio Engineering Limited +ATTR{vendor}=="0x001486", GROUP="audio", ENV{ID_FFADO}="1" # Echo Digital Audio Corporation +ATTR{vendor}=="0x001564", GROUP="audio", ENV{ID_FFADO}="1" # BEHRINGER Spezielle Studiotechnik GmbH +ATTR{vendor}=="0x001c2d", GROUP="audio", ENV{ID_FFADO}="1" # FlexRadio Systems +ATTR{vendor}=="0x001c6a", GROUP="audio", ENV{ID_FFADO}="1" # Weiss Engineering Ltd. +ATTR{vendor}=="0x0040ab", GROUP="audio", ENV{ID_FFADO}="1" # ROLAND DG CORPORATION + +# The devices below abuse another Vendor's ID, and therefore we need more advanced rules for those. + +ATTR{vendor}=="0x00000a", ATTR{model}=="0x030000", ATTR{units}=="*0x00a02d:0x010001*", GROUP="audio", ENV{ID_FFADO}="1" # CME, Matrix K FW +ATTR{vendor}=="0x00000f", ATTR{model}=="0x01006?", ATTR{units}=="*0x00a02d:0x010001*", GROUP="audio", ENV{ID_FFADO}="1" # Mackie, Onyx Firewire +ATTR{vendor}=="0x000a35", ATTR{units}=="0x000a35:0x00000[12]", GROUP="audio", ENV{ID_FFADO}="1" # RME + +LABEL="ffado_end" diff --git a/extra/libffado/PKGBUILD b/extra/libffado/PKGBUILD index 5db7a3de8..29ecf2e1e 100644 --- a/extra/libffado/PKGBUILD +++ b/extra/libffado/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 106834 2011-01-19 12:28:15Z andrea $ -# Maintainer: Ray Rashif <schivmeister@gmail.com> +# $Id: PKGBUILD 142989 2011-11-19 21:35:53Z schiv $ +# Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: galiyosha@gmail.com # Contributor: Jon Kristian Nilsen <jokr.nilsen@gmail.com> pkgname=libffado pkgver=2.0.1 -pkgrel=3 +pkgrel=5 pkgdesc="Driver for FireWire audio devices" arch=('i686' 'x86_64' 'mips64el') url="http://www.ffado.org/" @@ -14,12 +14,13 @@ depends=('libiec61883' 'libavc1394' 'libsigc++' 'libxml++' 'alsa-lib' 'dbus') [ "$CARCH" = "mips64el" ] || { makedepends=('scons' 'python2-qt') -optdepends=('python2-qt: mixer applet') -} -[ "$CARCH" = "mips64el" ] && \ -makedepends=('scons') -source=(http://www.ffado.org/files/$pkgname-$pkgver.tar.gz) -md5sums=('786f31facd417e6207e429f50af0e15e') +optdepends=('python2: ffado-diag' + 'python2-qt: mixer applet') +provides=('ffado') +source=("http://www.ffado.org/files/$pkgname-$pkgver.tar.gz" + '60-ffado.rules') +md5sums=('786f31facd417e6207e429f50af0e15e' + 'f03a3e950801c4405b8934084651bca8') build() { cd "$srcdir/$pkgname-$pkgver" @@ -46,7 +47,12 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" - scons DESTDIR="$pkgdir/" WILL_DEAL_WITH_XDG_MYSELF="True" install + scons DESTDIR="$pkgdir" WILL_DEAL_WITH_XDG_MYSELF="True" install + + # add audio device rules + # see https://bugs.archlinux.org/task/26342 + install -Dm644 "$srcdir/60-ffado.rules" \ + "$pkgdir/lib/udev/rules.d/60-ffado.rules" # python2 fix for i in $(grep '^#!.*bin.*python' -R "$pkgdir" | sed 's/:.*//'); do diff --git a/extra/libfprint/PKGBUILD b/extra/libfprint/PKGBUILD index e86ec45dc..b5b2ab225 100644 --- a/extra/libfprint/PKGBUILD +++ b/extra/libfprint/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 142461 2011-11-10 09:30:27Z heftig $ +# $Id: PKGBUILD 142730 2011-11-14 08:43:18Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Thomas Baechler <thomas@archlinux.org> pkgname=libfprint pkgver=0.4.0 -pkgrel=1 +pkgrel=2 pkgdesc="Library for fingerprint readers" arch=(i686 x86_64) url="http://www.freedesktop.org/wiki/Software/fprint/libfprint" @@ -18,8 +18,9 @@ md5sums=('858a0f0d7abd21ac494f9bec904dc156') build() { cd "$srcdir/$_snap" - ./autogen.sh --prefix=/usr --sysconfdir=/etc --disable-static \ - --disable-examples-build --disable-x11-examples-build + sed -i '\|^./configure|,+1d' autogen.sh + ./autogen.sh + ./configure --prefix=/usr --sysconfdir=/etc --disable-static make } diff --git a/extra/libgnome-keyring/PKGBUILD b/extra/libgnome-keyring/PKGBUILD index 208d460dd..3b12c60d2 100644 --- a/extra/libgnome-keyring/PKGBUILD +++ b/extra/libgnome-keyring/PKGBUILD @@ -1,8 +1,8 @@ -#$Id: PKGBUILD 139377 2011-10-01 18:59:51Z ibiru $ +#$Id: PKGBUILD 142889 2011-11-17 18:34:54Z ibiru $ #Maintainer: Jan De Groot <jgc@archlinux.org> pkgname=libgnome-keyring -pkgver=3.2.0 +pkgver=3.2.2 pkgrel=1 pkgdesc="GNOME keyring client library" arch=(i686 x86_64 'mips64el') @@ -12,7 +12,7 @@ makedepends=('intltool' 'pkgconfig') options=('!libtool' '!emptydirs') url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('0516403432b06ecc173c9f9dbe3eaa87b2c7a230806fcac4dfd73ad998e928f5') +sha256sums=('2bcbe47b1960737866835a516056c36d1a3d82d5ad101c70d5a87e1ad616adb3') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/libmygpo-qt/PKGBUILD b/extra/libmygpo-qt/PKGBUILD index d9d149aff..682d26792 100644 --- a/extra/libmygpo-qt/PKGBUILD +++ b/extra/libmygpo-qt/PKGBUILD @@ -1,8 +1,9 @@ -# $Id: PKGBUILD 137565 2011-09-09 17:36:39Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# $Id: PKGBUILD 142810 2011-11-15 16:35:49Z andrea $ +# Maintainer: +# Contributor: Andrea Scarpino <andrea@archlinux.org> pkgname=libmygpo-qt -pkgver=1.0.4 +pkgver=1.0.5 pkgrel=1 pkgdesc="A C++/Qt client library for gpodder.net" arch=('i686' 'x86_64' 'mips64el') @@ -11,13 +12,13 @@ license=('LGPL2.1') depends=('qjson') makedepends=('cmake') source=("http://stefan.derkits.at/files/${pkgname}/${pkgname}.${pkgver}.tar.gz") -md5sums=('9c840d6a7dc96055c6eb5a7d36d02a7c') +md5sums=('37af04b1e944f982e35b69c04b5d1b0f') build() { cd "${srcdir}" mkdir build cd build - cmake ../${pkgname} \ + cmake ../${pkgname}.${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr make diff --git a/extra/librsvg/PKGBUILD b/extra/librsvg/PKGBUILD index dee391f52..42c12b653 100644 --- a/extra/librsvg/PKGBUILD +++ b/extra/librsvg/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 138210 2011-09-18 16:29:47Z ibiru $ +# $Id: PKGBUILD 142891 2011-11-17 18:34:59Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=librsvg -pkgver=2.34.1 -pkgrel=2 -pkgdesc="SAX-based renderer for SVG files into a GdkPixbuf" +pkgver=2.34.2 +pkgrel=1 +pkgdesc="A SVG viewing library" arch=(i686 x86_64 'mips64el') license=('LGPL') depends=('gdk-pixbuf2' 'pango' 'libcroco') @@ -13,19 +13,19 @@ optdepends=('gtk2: for rsvg-view support') options=('!libtool' '!emptydirs') url="http://librsvg.sourceforge.net/" install=librsvg.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.34/${pkgname}-${pkgver}.tar.xz) -sha256sums=('4f2ab987eed2943b5a0ce3dde1672d2bc87123bee66d885dd7307eb7ede756db') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/2.34/$pkgname-$pkgver.tar.xz) +sha256sums=('5de701325b84c0a15ab6892f49ffd6471722044bfe0b350725bf420642ee4464') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' rsvg.in - ./configure --prefix=/usr --libexecdir=/usr/lib/${pkgname} \ + ./configure --prefix=/usr --libexecdir=/usr/lib/$pkgname \ --with-croco --disable-static \ --with-svgz make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } diff --git a/extra/lua/PKGBUILD b/extra/lua/PKGBUILD index 7bad05215..bba4715fa 100644 --- a/extra/lua/PKGBUILD +++ b/extra/lua/PKGBUILD @@ -1,30 +1,30 @@ -# $Id: PKGBUILD 138070 2011-09-16 01:15:44Z eric $ +# $Id: PKGBUILD 142952 2011-11-19 04:33:22Z eric $ # Maintainer: Juergen Hoetzel <juergen@archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> pkgname=lua pkgver=5.1.4 -pkgrel=8 -pkgdesc="A powerful light-weight programming language designed for extending applications." +pkgrel=9 +_patchver=5.1.4-4 +pkgdesc="A powerful light-weight programming language designed for extending applications" arch=('i686' 'x86_64' 'mips64el') url="http://www.lua.org/" depends=('readline') license=('MIT') options=('!makeflags' '!emptydirs') -source=("http://www.lua.org/ftp/${pkgname}-${pkgver}.tar.gz" - 'http://www.lua.org/ftp/patch-lua-5.1.4-3' - 'lua-arch.patch' - 'lua-5.1-cflags.diff') +source=(http://www.lua.org/ftp/${pkgname}-${pkgver}.tar.gz + http://www.lua.org/ftp/patch-lua-${_patchver} + lua-arch.patch lua-5.1-cflags.diff) md5sums=('d0870f2de55d59c1c8419f36e8fac150' - '998ef7886183f61d3a5ca891a9ce6a79' + '329d8695e3e6f1267190e220559f7b6c' '6c5953f63904bf20a0183cdab05b80de' '249582bf1fd861ccf492d2c35a9fe732') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -p0 -i "${srcdir}/patch-lua-${_patchver}" -d src patch -p1 -i "${srcdir}/lua-arch.patch" - patch -i "${srcdir}/patch-lua-5.1.4-3" -d src - [ "$CARCH" == "x86_64" ] && patch -Np1 -i ../lua-5.1-cflags.diff + [ "$CARCH" == "x86_64" ] && patch -p1 -i "${srcdir}/lua-5.1-cflags.diff" [ "$CARCH" == "x86_64" ] && export CFLAGS="$CFLAGS -fPIC" make INSTALL_DATA="cp -d" TO_LIB="liblua.a liblua.so liblua.so.5.1" LUA_SO=liblua.so \ INSTALL_TOP="${pkgdir}/usr" INSTALL_MAN="${pkgdir}/usr/share/man/man1" \ @@ -36,10 +36,10 @@ package() { make INSTALL_DATA="cp -d" TO_LIB="liblua.a liblua.so liblua.so.5.1" LUA_SO=liblua.so \ INSTALL_TOP="${pkgdir}/usr" INSTALL_MAN="${pkgdir}/usr/share/man/man1" \ install - install -D -m 644 etc/lua.pc "${pkgdir}/usr/lib/pkgconfig/lua.pc" + install -D -m644 etc/lua.pc "${pkgdir}/usr/lib/pkgconfig/lua.pc" install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/COPYRIGHT" # Install the documentation - mkdir -p "${pkgdir}/usr/share/doc/lua" - cp -R doc/* "${pkgdir}/usr/share/doc/lua" + install -d "${pkgdir}/usr/share/doc/lua" + install -m644 doc/*.{gif,png,css,html} "${pkgdir}/usr/share/doc/lua" } diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD index 9689c7c03..18cb3e9ce 100644 --- a/extra/mesa/PKGBUILD +++ b/extra/mesa/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 141617 2011-10-31 20:42:28Z andyrtr $ +# $Id: PKGBUILD 142908 2011-11-18 07:55:25Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase=mesa -pkgname=('mesa' 'libgl' 'libglapi' 'libgles' 'libegl' 'ati-dri' 'intel-dri' 'unichrome-dri' 'mach64-dri' 'mga-dri' 'r128-dri' 'savage-dri' 'sis-dri' 'tdfx-dri' 'nouveau-dri') # 'llvm-dri') +pkgname=('mesa' 'libgl' 'libglapi' 'libgles' 'libegl' 'khrplatform-devel' 'ati-dri' 'intel-dri' 'unichrome-dri' 'mach64-dri' 'mga-dri' 'r128-dri' 'savage-dri' 'sis-dri' 'tdfx-dri' 'nouveau-dri') # 'llvm-dri') [[ "$CARCH" = "mips64el" ]] && pkgname=('mesa' 'libglapi' 'libgl' 'libgles') # prepare 7.12/8.0 #pkgname=('mesa' 'libgl' 'libglapi' 'libgles' 'libegl' 'ati-dri' 'intel-dri' 'nouveau-dri') # 'llvm-dri') @@ -16,9 +16,9 @@ if [ "${_git}" = "true" ]; then #pkgver=7.10.99.git20110709 pkgver=7.11 else - pkgver=7.11 + pkgver=7.11.1 fi -pkgrel=4 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') makedepends=('glproto>=1.4.14' 'libdrm>=2.4.26' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.4.3' 'libxt>=1.1.1' 'gcc-libs>=4.6.1' 'python2' 'libxml2' 'imake' 'udev') @@ -31,8 +31,8 @@ if [ "${_git}" = "true" ]; then #source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-1ae00c5960af83bea9545a18a1754bad83d5cbd0.tar.bz2') source=(${source[@]} "MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-ef9f16f6322a89fb699fbe3da868b10f9acaef98.tar.bz2") else - #source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2" - source=(${source[@]} "MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-4464ee1a9aa3745109cee23531e3fb2323234d07.tar.bz2" + source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2" + #source=(${source[@]} "MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-4464ee1a9aa3745109cee23531e3fb2323234d07.tar.bz2" ) fi [ "$CARCH" = "mips64el" ] && \ @@ -144,7 +144,7 @@ package_libglapi() { } package_libgles() { - depends=('libglapi') + depends=('libglapi' 'khrplatform-devel') pkgdesc="Mesa GLES libraries and headers" cd ${srcdir}/?esa-* @@ -165,7 +165,7 @@ package_libgles() { } package_libegl() { - depends=('libglapi' 'libdrm' 'libxext' 'libxfixes' 'udev') + depends=('libglapi' 'libdrm' 'libxext' 'libxfixes' 'udev' 'khrplatform-devel') pkgdesc="Mesa EGL libraries and headers" cd ${srcdir}/?esa-* @@ -175,7 +175,6 @@ package_libegl() { install -m755 -d "${pkgdir}/usr/include" install -m755 -d "${pkgdir}/usr/include/" install -m755 -d "${pkgdir}/usr/include/EGL" - install -m755 -d "${pkgdir}/usr/include/KHR" install -m755 -d "${pkgdir}/usr/share" install -m755 -d "${pkgdir}/usr/share/doc" install -m755 -d "${pkgdir}/usr/share/doc/libegl" @@ -184,13 +183,24 @@ package_libegl() { bin/minstall lib/egl/* "${pkgdir}/usr/lib/egl/" bin/minstall src/egl/main/egl.pc "${pkgdir}/usr/lib/pkgconfig/" bin/minstall include/EGL/* "${pkgdir}/usr/include/EGL/" - bin/minstall include/KHR/khrplatform.h "${pkgdir}/usr/include/KHR/" bin/minstall docs/egl.html "${pkgdir}/usr/share/doc/libegl/" install -m755 -d "${pkgdir}/usr/share/licenses/libegl" install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libegl/" } +package_khrplatform-devel() { + depends=('') + pkgdesc="Khronos platform development package" + + cd ${srcdir}/?esa-* + install -m755 -d "${pkgdir}/usr/include/KHR" + bin/minstall include/KHR/khrplatform.h "${pkgdir}/usr/include/KHR/" + + install -m755 -d "${pkgdir}/usr/share/licenses/khrplatform-devel" + install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/khrplatform-devel/" +} + package_mesa() { depends=('libgl' 'libx11>=1.4.3' 'libxt>=1.1.1' 'gcc-libs>=4.6') [ "$CARCH" = "mips64el" ] || depends+=('dri2proto>=2.6' 'glproto>=1.4.14') #dri2proto + glproto needed for gl.pc diff --git a/extra/midori/PKGBUILD b/extra/midori/PKGBUILD index 75be8d734..7bc946085 100644 --- a/extra/midori/PKGBUILD +++ b/extra/midori/PKGBUILD @@ -1,24 +1,24 @@ -# $Id: PKGBUILD 140480 2011-10-15 10:32:49Z andyrtr $ +# $Id: PKGBUILD 142825 2011-11-16 00:02:11Z eric $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: rabyte <rabyte.at.gmail.dot.com> # Contributor: Johannes Krampf <wuischke.at.amule.dot.org> pkgname=midori -pkgver=0.4.1 +pkgver=0.4.2 pkgrel=1 pkgdesc="A lightweight web browser based on Gtk WebKit" arch=('i686' 'x86_64' 'mips64el') url="http://www.twotoasts.de/index.php?/pages/midori_summary.html" license=('LGPL2.1') install=midori.install -depends=('libwebkit>=1.3.13' 'libunique' 'hicolor-icon-theme' 'desktop-file-utils' 'libnotify>=0.7.1' 'libxss' 'sqlite3' 'glib2') +depends=('libwebkit>=1.3.13' 'libunique' 'hicolor-icon-theme' 'desktop-file-utils' 'libnotify>=0.7.1' 'libxss') makedepends=('libxml2' 'intltool' 'gtk-doc' 'librsvg' 'python2>=2.7.1' 'vala') # 'git' optdepends=('vala: for use in extensions') -source=(http://archive.xfce.org/src/apps/$pkgname/0.4/$pkgname-$pkgver.tar.bz2) -md5sums=('33dde203cd71ae2b1d2adcc7f5739f65') +source=(http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2) +md5sums=('4ec9c3daa332ebe865cba6aa8256ef63') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" # python2 export PYTHON=/usr/bin/python2 @@ -35,6 +35,6 @@ build() { } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/midori/midori.install b/extra/midori/midori.install index 8cee6c198..4da5511fd 100644 --- a/extra/midori/midori.install +++ b/extra/midori/midori.install @@ -1,7 +1,6 @@ post_install() { - -gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor -update-desktop-database -q + update-desktop-database -q + gtk-update-icon-cache -f -q -t usr/share/icons/hicolor } post_upgrade() { @@ -9,6 +8,5 @@ post_upgrade() { } post_remove() { -update-desktop-database -q -gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor + post_install $1 } diff --git a/extra/nouveau-drm-lts/PKGBUILD b/extra/nouveau-drm-lts/PKGBUILD index 691795b0c..87d374541 100644 --- a/extra/nouveau-drm-lts/PKGBUILD +++ b/extra/nouveau-drm-lts/PKGBUILD @@ -1,12 +1,13 @@ -# $Id: PKGBUILD 126820 2011-06-07 13:57:50Z tpowa $ +# $Id: PKGBUILD 142808 2011-11-15 14:48:15Z tpowa $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: buddabrod <buddabrod@gmail.com> pkgname=nouveau-drm-lts _snapdate=20100313 pkgver=0.0.16_${_snapdate} # see master/drivers/gpu/drm/nouveau/nouveau_drv.h for version -_kernver='2.6.32-lts' -pkgrel=6 +_extramodules=extramodules-2.6.32-lts +_kernver="$(cat /lib/modules/${_extramodules}/version)" +pkgrel=7 pkgdesc="nvidia opensource X driver" arch=('i686' 'x86_64' 'mips64el') url="http://nouveau.freedesktop.org/" @@ -34,14 +35,14 @@ build() { } package() { - install -D -m 0644 ${srcdir}/master/drivers/gpu/drm/drm.ko ${pkgdir}/lib/modules/${_kernver}/updates/drm.ko - install -D -m 0644 ${srcdir}/master/drivers/gpu/drm/drm_kms_helper.ko ${pkgdir}/lib/modules/${_kernver}/updates/drm_kms_helper.ko - install -D -m 0644 ${srcdir}/master/drivers/gpu/drm/nouveau/nouveau.ko ${pkgdir}/lib/modules/${_kernver}/kernel/drivers/video/nouveau.ko - install -D -m 0644 ${srcdir}/master/drivers/gpu/drm/ttm/ttm.ko ${pkgdir}/lib/modules/${_kernver}/updates/ttm.ko - install -D -m 0644 ${srcdir}/master/drivers/gpu/drm/i2c/ch7006.ko ${pkgdir}/lib/modules/${_kernver}/updates/ch7006.ko + install -D -m 0644 ${srcdir}/master/drivers/gpu/drm/drm.ko ${pkgdir}/lib/modules/${_extramodules}/updates/drm.ko + install -D -m 0644 ${srcdir}/master/drivers/gpu/drm/drm_kms_helper.ko ${pkgdir}/lib/modules/${_extramodules}/updates/drm_kms_helper.ko + install -D -m 0644 ${srcdir}/master/drivers/gpu/drm/nouveau/nouveau.ko ${pkgdir}/lib/modules/${_extramodules}/kernel/drivers/video/nouveau.ko + install -D -m 0644 ${srcdir}/master/drivers/gpu/drm/ttm/ttm.ko ${pkgdir}/lib/modules/${_extramodules}/updates/ttm.ko + install -D -m 0644 ${srcdir}/master/drivers/gpu/drm/i2c/ch7006.ko ${pkgdir}/lib/modules/${_extramodules}/updates/ch7006.ko # install script - sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" ${startdir}/nouveau-drm.install + sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" ${startdir}/nouveau-drm.install # gzip -9 modules find "$pkgdir" -name '*.ko' -exec gzip -9 {} \; } diff --git a/extra/nouveau-drm-lts/nouveau-drm.install b/extra/nouveau-drm-lts/nouveau-drm.install index beadaa563..2aa581d47 100644 --- a/extra/nouveau-drm-lts/nouveau-drm.install +++ b/extra/nouveau-drm-lts/nouveau-drm.install @@ -1,6 +1,6 @@ post_install() { - KERNEL_VERSION='2.6.32-lts' - depmod -v $KERNEL_VERSION > /dev/null 2>&1 + EXTRAMODULES='extramodules-2.6.32-lts' + depmod $(cat /lib/modules/$EXTRAMODULES/version) echo "if you are running kms in early mode please rebuild your initrd" } @@ -10,7 +10,7 @@ post_upgrade() { } post_remove() { - KERNEL_VERSION='2.6.32-lts' - depmod -v $KERNEL_VERSION > /dev/null 2>&1 + EXTRAMODULES='extramodules-2.6.32-lts' + depmod $(cat /lib/modules/$EXTRAMODULES/version) } diff --git a/extra/openconnect/PKGBUILD b/extra/openconnect/PKGBUILD index 9be938be0..c27dbcd5e 100644 --- a/extra/openconnect/PKGBUILD +++ b/extra/openconnect/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141220 2011-10-26 15:42:44Z ibiru $ +# $Id: PKGBUILD 142902 2011-11-17 19:06:36Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=openconnect -pkgver=3.13 +pkgver=3.14 pkgrel=1 epoch=1 pkgdesc="Open client for Cisco AnyConnect VPN" @@ -12,17 +12,17 @@ url="http://www.infradead.org/openconnect.html" depends=('libxml2' 'openssl' 'libproxy') makedepends=('intltool') options=('!libtool' '!emptydirs') -source=(ftp://ftp.infradead.org/pub/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('4364a779bfce66de243f39eeb7a39c1f') +source=(ftp://ftp.infradead.org/pub/$pkgname/$pkgname-$pkgver.tar.gz) +md5sums=('c7e73dfa58c7c49683c93800a3506a0f') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr \ --disable-static make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } diff --git a/extra/oxygen-gtk/PKGBUILD b/extra/oxygen-gtk/PKGBUILD index 061915e98..d6af29ab2 100644 --- a/extra/oxygen-gtk/PKGBUILD +++ b/extra/oxygen-gtk/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 140513 2011-10-16 08:02:52Z eric $ +# $Id: PKGBUILD 142925 2011-11-18 11:11:32Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: birdflesh <antkoul at gmail dot com> pkgname=oxygen-gtk -pkgver=1.1.4 +pkgver=1.1.5 pkgrel=1 pkgdesc="Port of the default KDE widget theme (Oxygen) to GTK" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('LGPL') depends=('gtk2') makedepends=('cmake') source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('61a7424e77785501df27b5c050e5f287') +md5sums=('d20902809e634c820bebdfea49de19a1') build() { cd "${srcdir}" diff --git a/extra/perl-tk/PKGBUILD b/extra/perl-tk/PKGBUILD index 4fbeb965a..241d4705d 100644 --- a/extra/perl-tk/PKGBUILD +++ b/extra/perl-tk/PKGBUILD @@ -1,44 +1,41 @@ -# $Id: PKGBUILD 124660 2011-05-23 20:07:22Z remy $ +# $Id: PKGBUILD 142966 2011-11-19 08:36:20Z eric $ # Maintainer: François Charette <francois ατ archlinux δοτ org> # Contributor: Jason Chu <jchu@xentac.net> # Contributor: Juergen Hoetzel <juergen@archlinux.org> pkgname=perl-tk _cpanname=Tk -pkgver=804.029 -pkgrel=3 +pkgver=804.030 +pkgrel=1 pkgdesc="A graphical user interface toolkit for Perl" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/${_cpanname}" license=('PerlArtistic' 'GPL' 'custom') -depends=('libx11' 'libpng' 'libjpeg' 'tk' 'perl') +depends=('libpng' 'libjpeg' 'tk' 'perl') options=('!emptydirs') replaces=('perltk') provides=('perltk') -source=(http://www.cpan.org/authors/id/S/SR/SREZIC/${_cpanname}-${pkgver}.tar.gz) -md5sums=('f4aebe6fcdb309a8480514f2ccf8117c') +source=(http://www.cpan.org/authors/id/S/SR/SREZIC/${_cpanname}-${pkgver}.tar.gz) +md5sums=('13275e85f99ee467a86d9598a437abff') build() { - cd $srcdir/${_cpanname}-$pkgver + cd "$srcdir/${_cpanname}-$pkgver" PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - /bin/chmod -R u+w * - # The Xlib header is wrong... - sed -i 's/XKeycodeToKeysym\(.*\)unsigned int/XKeycodeToKeysym\1KeyCode/' pTk/Xlib.h make } #check() { -# cd $srcdir/${_cpanname}-$pkgver +# cd "$srcdir/${_cpanname}-$pkgver" # make test #} package() { - cd $srcdir/${_cpanname}-$pkgver - make install DESTDIR=$pkgdir + cd "$srcdir/${_cpanname}-$pkgver" + make install DESTDIR="$pkgdir" # license install -D -m644 pTk/license.terms \ - ${startdir}/pkg/usr/share/licenses/${pkgname}/tk.license + "${pkgdir}/usr/share/licenses/${pkgname}/tk.license" install -D -m644 pTk/Tix.license \ - ${startdir}/pkg/usr/share/licenses/${pkgname}/tix.license + "${pkgdir}/usr/share/licenses/${pkgname}/tix.license" } diff --git a/extra/proftpd/PKGBUILD b/extra/proftpd/PKGBUILD index 8389f3206..94cf43c5c 100644 --- a/extra/proftpd/PKGBUILD +++ b/extra/proftpd/PKGBUILD @@ -1,29 +1,30 @@ -# $Id: PKGBUILD 138532 2011-09-27 03:18:03Z eric $ +# $Id: PKGBUILD 142778 2011-11-15 04:26:53Z eric $ # Maintainer: -# Contributor: Eric Belanger <eric@archlinux.org> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=proftpd -pkgver=1.3.3f +pkgver=1.3.4a pkgrel=1 +epoch=1 pkgdesc="A high-performance, scalable FTP server" arch=('i686' 'x86_64' 'mips64el') url="http://www.proftpd.org" license=('GPL') depends=('libldap' 'libmysqlclient' 'postgresql-libs') backup=('etc/proftpd.conf' 'etc/conf.d/proftpd') -source=("ftp://ftp.proftpd.org/distrib/source/${pkgname}-${pkgver}.tar.bz2" +source=(ftp://ftp.proftpd.org/distrib/source/${pkgname}-${pkgver}.tar.bz2{,.asc} 'proftpd' 'proftpd.logrotate' 'proftpd.conf.d') -md5sums=('e9416d2aa7ac1246af4fc8a80fd73f27' - '99f6f9a989e70e3fa50809fc2bbbbb0a' - 'ddb09eb13131becdf0e081eef413116b' - '71d5932b0461c318ed68c2c0c2660736') +sha1sums=('18ea33d8b9f858b6e735cc81af900f0eebee8d25' + '195b06e28e503f5e5ef355c3332884cc5e7954a9' + 'b7819d725817e55b69c73e2572c21a05db48cc86' + '83c38ec40efb7cc09d9824b98e65cd948a195cc6' + 'f34f60cb4fb1f4af7be7aca427cbad3cad22bbb9') build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr \ - --mandir=/usr/share/man \ + --libexecdir=/usr/lib \ --disable-pam \ --with-modules=mod_quotatab:mod_quotatab_sql:mod_quotatab_file:mod_tls:mod_ldap:mod_sql:mod_sql_mysql:mod_sql_postgres \ --sysconfdir=/etc \ @@ -41,12 +42,10 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install + sed -i 's|nogroup|nobody|g' "${pkgdir}/etc/proftpd.conf" + install -Dm644 ../proftpd.logrotate "${pkgdir}/etc/logrotate.d/proftpd" install -Dm644 ../proftpd.conf.d "${pkgdir}/etc/conf.d/proftpd" install -Dm755 ../proftpd "${pkgdir}/etc/rc.d/proftpd" install -Dm755 contrib/xferstats.holger-preiss "${pkgdir}/usr/bin/ftpstats" - - cd "${pkgdir}/etc" - sed -i 's|nogroup|nobody|g' proftpd.conf - rmdir "${pkgdir}/usr/libexec" } diff --git a/extra/racket/PKGBUILD b/extra/racket/PKGBUILD index 4e5384815..d978a1808 100644 --- a/extra/racket/PKGBUILD +++ b/extra/racket/PKGBUILD @@ -1,22 +1,20 @@ -# $Id: PKGBUILD 135654 2011-08-17 02:18:35Z eric $ +# $Id: PKGBUILD 142774 2011-11-15 00:48:27Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=racket -pkgver=5.1.3 +pkgver=5.2 pkgrel=1 pkgdesc="A programming language environment (formerly known as PLT Scheme) suitable for tasks ranging from scripting to application development" arch=('i686' 'x86_64' 'mips64el') url="http://racket-lang.org/" license=('LGPL') -depends=('gtk2' 'libffi' 'desktop-file-utils') +depends=('gtk2' 'desktop-file-utils') makedepends=('gsfonts') options=('!strip') install=racket.install source=(http://download.racket-lang.org/installers/${pkgver}/racket/${pkgname}-${pkgver}-src-unix.tgz \ drracket.desktop) -md5sums=('6c33caf6ee49a422be053effaf630941' - '9223c9736ead677431542b41271c7b3c') -sha1sums=('7face74729cee8b36ce3df44b36b04ca23b4c986' +sha1sums=('f88007c12d7e5f2773b122d3652c8cd1d15da8c3' 'a20808f6b250225704856f82a544681a962a299d') build() { diff --git a/extra/raptor/PKGBUILD b/extra/raptor/PKGBUILD index 5953b4fe1..ae413b356 100644 --- a/extra/raptor/PKGBUILD +++ b/extra/raptor/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 134573 2011-08-06 08:14:08Z andrea $ +# $Id: PKGBUILD 142784 2011-11-15 06:17:05Z andrea $ # Maintainer: Andreas Radke <andyrtr at archlinux.org> # Contributor: eric <eric@archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> pkgname=raptor -pkgver=2.0.4 +pkgver=2.0.5 pkgrel=1 pkgdesc="A C library that parses RDF/XML/N-Triples into RDF triples" arch=('i686' 'x86_64' 'mips64el') url="http://librdf.org/raptor" -depends=('libxml2>=2.7.8' 'curl>=7.21.7' 'zlib>=1.2.5' 'libxslt>=1.1.26') +depends=('curl>=7.22.0' 'libxslt>=1.1.26') license=('LGPL') options=('!libtool') source=("http://librdf.org/dist/source/raptor2-$pkgver.tar.gz") -md5sums=('46eff4b20f8752d1146a3e0c8b2168dd') +md5sums=('ffa2aa82c83dbd5b1f77835348ed2c2a') build() { cd "${srcdir}"/raptor2-${pkgver} @@ -28,4 +28,3 @@ package() { cd "${srcdir}"/raptor2-${pkgver} make prefix="${pkgdir}"/usr install } -md5sums=('0373efb8d85dc872bc7bb5b1c69299fb') diff --git a/extra/rasqal/PKGBUILD b/extra/rasqal/PKGBUILD index a9c2053e1..5e58afc6f 100644 --- a/extra/rasqal/PKGBUILD +++ b/extra/rasqal/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 136218 2011-08-24 20:33:47Z andyrtr $ +# $Id: PKGBUILD 142916 2011-11-18 08:48:56Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Lawrence Lee <valheru@facticius.net> pkgname=rasqal epoch=1 -pkgver=0.9.27 +pkgver=0.9.28 pkgrel=1 pkgdesc="A free C library that handles Resource Description Framework (RDF) query syntaxes, query construction and query execution returning result bindings" url="http://librdf.org/rasqal" @@ -13,7 +13,7 @@ arch=('i686' 'x86_64' 'mips64el') depends=('raptor>=2.0.3' 'mpfr') options=('!libtool') source=(http://download.librdf.org/source/${pkgname}-${pkgver}.tar.gz) -md5sums=('dd48b9a80947a6136fbdb79276d476e2') +md5sums=('a3662b8d9efef9d8ef0a3c182450fba2') build() { cd ${srcdir}/${pkgname}-${pkgver} @@ -23,6 +23,11 @@ build() { make } +check() { + cd ${srcdir}/${pkgname}-${pkgver} + make -k check || /bin/true # fails some checks - should be reported upstream +} + package() { cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install diff --git a/extra/seahorse/PKGBUILD b/extra/seahorse/PKGBUILD index 4dac5ba85..d5df7b1c8 100644 --- a/extra/seahorse/PKGBUILD +++ b/extra/seahorse/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 140951 2011-10-20 05:44:14Z ibiru $ +# $Id: PKGBUILD 142894 2011-11-17 18:35:07Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Michel Brabants <michel.linux@tiscali.be> pkgname=seahorse -pkgver=3.2.1 +pkgver=3.2.2 pkgrel=1 pkgdesc="GNOME application for managing PGP keys." arch=(i686 x86_64 'mips64el') @@ -18,7 +18,7 @@ groups=('gnome-extra') install=seahorse.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz seahorse-ssh-askpass.sh) -sha256sums=('84f1df80055ca66179a023130e179de44053e7df91c1f6c7fd536563fac832b2' +sha256sums=('25146aa4c4bb4c375ec1afec524e1907852989bd1b0c9e12490326616ac6a7e9' '1792ab2c0bbad446b8fad0a0c9008a75f60a9666c895d37d2adcd827e49fafbb') build() { diff --git a/extra/telepathy-farstream/PKGBUILD b/extra/telepathy-farstream/PKGBUILD index 0e722ddeb..f4fc586b5 100644 --- a/extra/telepathy-farstream/PKGBUILD +++ b/extra/telepathy-farstream/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139433 2011-10-01 19:01:24Z ibiru $ +# $Id: PKGBUILD 142940 2011-11-18 18:23:32Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=telepathy-farstream -pkgver=0.1.1 +pkgver=0.1.2 pkgrel=1 pkgdesc="A telepathy-backend to use stream engine." arch=(mips64el) @@ -11,8 +11,8 @@ license=('LGPL2.1') depends=('telepathy-glib' 'farsight2') makedepends=('libxslt' 'python2') options=('!libtool') -source=(http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('da9179ee104bfb839cd813f66c23c066') +source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) +md5sums=('f858fc02e1981bb8ccd29c2bed567e50') build() { cd "$srcdir/$pkgname-$pkgver" @@ -26,7 +26,7 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir/" install + make DESTDIR="$pkgdir" install } # vim:set ts=2 sw=2 et: diff --git a/extra/tomboy/PKGBUILD b/extra/tomboy/PKGBUILD index aa850f7c4..c04a71226 100644 --- a/extra/tomboy/PKGBUILD +++ b/extra/tomboy/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139441 2011-10-01 19:01:37Z ibiru $ +# $Id: PKGBUILD 142896 2011-11-17 18:35:10Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=tomboy -pkgver=1.8.0 +pkgver=1.8.3 pkgrel=1 pkgdesc="Desktop note-taking application for Linux and Unix" arch=('i686' 'x86_64' 'mips64el') @@ -13,14 +13,14 @@ makedepends=('intltool' 'pkgconfig' 'gnome-doc-utils') options=('!libtool' '!emptydirs' '!makeflags') groups=('gnome-extra') install=tomboy.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.8/${pkgname}-${pkgver}.tar.xz) -sha256sums=('4f3808a8c0ef94440a2ca005e41b095a417bfd22dc081e2e55e5de69b4e4df70') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/1.8/$pkgname-$pkgver.tar.xz) +sha256sums=('3f704bac772a54cf668aca769c766bc1fb9ebc8823a903ef108927805c020bea') build() { - export MONO_SHARED_DIR="${srcdir}/.wabi" - mkdir -p "${MONO_SHARED_DIR}" + export MONO_SHARED_DIR="$srcdir/.wabi" + mkdir -p "$MONO_SHARED_DIR" - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-scrollkeeper \ --disable-update-mimedb @@ -28,10 +28,10 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 install + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 install - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain tomboy ${pkgdir}/etc/gconf/schemas/*.schemas - rm -f ${pkgdir}/etc/gconf/schemas/*.schemas + install -m755 -d "$pkgdir/usr/share/gconf/schemas" + gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain tomboy $pkgdir/etc/gconf/schemas/*.schemas + rm -f $pkgdir/etc/gconf/schemas/*.schemas } diff --git a/extra/transcode/PKGBUILD b/extra/transcode/PKGBUILD index be7152f11..bb4583fd4 100644 --- a/extra/transcode/PKGBUILD +++ b/extra/transcode/PKGBUILD @@ -1,63 +1,43 @@ -# $Id: PKGBUILD 142644 2011-11-12 17:15:42Z ibiru $ +# $Id: PKGBUILD 142856 2011-11-17 07:09:40Z eric $ # Maintainer: # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: roberto <roberto@archlinux.org> pkgname=transcode _sripver=0.3-4 -pkgver=1.1.5 -pkgrel=7 +pkgver=1.1.6 +pkgrel=1 pkgdesc="A video/DVD ripper and encoder for the terminal/console" arch=('i686' 'x86_64' 'mips64el') url="http://tcforge.berlios.de/" license=('GPL') depends=('gawk' 'imagemagick' 'lzo2' 'libdvdread' 'ffmpeg' 'mjpegtools' 'libmpeg2' 'libxaw' 'libxml2' 'libxv' 'a52dec') -makedepends=('nasm') -options=('!libtool' '!makeflags') -source=(http://download2.berlios.de/tcforge/${pkgname}-${pkgver}.tar.bz2 +makedepends=('nasm' 'v4l-utils') +options=('!libtool') +source=(https://bitbucket.org/france/transcode-tcforge/downloads/${pkgname}-${pkgver}.tar.bz2 http://downloads.sourceforge.net/sourceforge/subtitleripper/subtitleripper-${_sripver}.tgz - transcode-1.1.5-jpeg-7.patch transcode-1.1.5-mpa.patch transcode-1.1.5-ffmpeg.patch) -sha1sums=('48c36e06ca0cd1cdc1a9c6a241e231f896eefd26' + subtitleripper-0.3.4-linkingorder.patch subtitleripper-0.3.4-respect-ldflags.patch) +sha1sums=('e176622b2c2834b006cda3c368ab521407d375c4' 'd93ff3578dd5f722c8f4ef16bc0903eec5781a0d' - '9e380c00a3b31725dc3ec483fa7bf5e3d8a8a977' - '6f45d9167c3aa15a83cb29545749f55eb1f1e5a2' - '2d3bb4486394ee55540e772f134e193874e5c2b4') + 'fa05aa1770d9350d90b7cf315aa7c4a1fd921ac7' + '591943a33235342a66c3df0625a164a1479c09ae') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -p0 < ../transcode-1.1.5-jpeg-7.patch - patch -p1 < ../transcode-1.1.5-mpa.patch - patch -p1 < ../transcode-1.1.5-ffmpeg.patch - - # building from here + sed -i 's|linux/videodev.h|libv4l1-videodev.h|' configure ./configure --prefix=/usr \ - --enable-sse=no --enable-sse2=no --enable-altivec=no --enable-mmx \ + --disable-sse --disable-sse2 --disable-altivec --enable-mmx \ --enable-lame --enable-ogg --enable-vorbis --enable-theora \ --enable-libdv --enable-libxml2 --enable-v4l \ --enable-imagemagick --enable-libjpeg --enable-lzo --enable-mjpegtools \ --enable-sdl --enable-freetype2 --enable-a52 --enable-libpostproc \ - --enable-xvid --enable-x264 --enable-alsa \ - --enable-libmpeg2 --enable-libmpeg2convert \ - --with-libxml2-prefix=/usr \ - --with-mjpegtools-prefix=/usr \ - --with-imagemagick-prefix=/usr \ - --with-libdv-includes=/usr \ - --with-libpostproc-includes=/usr/include/libpostproc \ - --with-ogg-prefix=/usr \ - --with-lame-libs=/usr \ - --with-lzo-libs=/usr/lib \ - --with-libavcodec-prefix=/usr \ - --with-libavcodec-includes=/usr/include \ - --with-libavcodec-libs=/usr/lib - + --enable-xvid --enable-x264 --enable-alsa --enable-libmpeg2 --enable-libmpeg2convert make - ############################################################################## - # this imports the latest subtitleripper sources and replaces the internal - mkdir contrib - mv "${srcdir}/subtitleripper" contrib/subrip - # removes dependency on libppm, make it dependend on netpbm just failed, argh... - cd contrib/subrip + + cd "${srcdir}/subtitleripper" + patch -p1 -i "${srcdir}/subtitleripper-0.3.4-linkingorder.patch" + patch -p1 -i "${srcdir}/subtitleripper-0.3.4-respect-ldflags.patch" sed -e 's|^\(.*lppm.*\)$|#\1|' \ -e 's|^\(.*D_HAVE_LIB_PPM.*\)$|#\1|' \ -e 's/DEFINES :=/DEFINES = -DHAVE_GETLINE/' \ @@ -69,7 +49,7 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - cd contrib/subrip + cd "${srcdir}/subtitleripper" install -m 755 pgm2txt "${pkgdir}/usr/bin/" install -m 755 srttool "${pkgdir}/usr/bin/" install -m 755 subtitle2pgm "${pkgdir}/usr/bin/" diff --git a/extra/transcode/subtitleripper-0.3.4-linkingorder.patch b/extra/transcode/subtitleripper-0.3.4-linkingorder.patch new file mode 100644 index 000000000..7efe22346 --- /dev/null +++ b/extra/transcode/subtitleripper-0.3.4-linkingorder.patch @@ -0,0 +1,28 @@ +Index: subtitleripper/Makefile +=================================================================== +--- subtitleripper.orig/Makefile ++++ subtitleripper/Makefile +@@ -70,19 +70,19 @@ vobsub2pgm.o: vobsub2pgm.c vobsub.h spud + # Target + subtitle2pgm: subtitle2pgm.o spudec.o + @echo "Linking $@" +- @$(CC) $(LIBS) $^ -o $@ ++ @$(CC) $^ -o $@ $(LIBS) + + subtitle2vobsub: subtitle2vobsub.o vobsub.o + @echo "Linking $@" +- @$(CC) $(LIBS) $^ -o $@ ++ @$(CC) $^ -o $@ $(LIBS) + + srttool: srttool.o + @echo "Linking $@" +- @$(CC) $(LIBS) -g $^ -o $@ ++ @$(CC) -g $^ -o $@ $(LIBS) + + vobsub2pgm: vobsub2pgm.o vobsub.o spudec.o + @echo "Linking $@" +- @$(CC) $(LIBS) -g $^ -o $@ ++ @$(CC) -g $^ -o $@ $(LIBS) + + .PHONY: clean dist rpm + clean: diff --git a/extra/transcode/subtitleripper-0.3.4-respect-ldflags.patch b/extra/transcode/subtitleripper-0.3.4-respect-ldflags.patch new file mode 100644 index 000000000..2af11d257 --- /dev/null +++ b/extra/transcode/subtitleripper-0.3.4-respect-ldflags.patch @@ -0,0 +1,28 @@ +Index: subtitleripper/Makefile +=================================================================== +--- subtitleripper.orig/Makefile ++++ subtitleripper/Makefile +@@ -70,19 +70,19 @@ vobsub2pgm.o: vobsub2pgm.c vobsub.h spud + # Target + subtitle2pgm: subtitle2pgm.o spudec.o + @echo "Linking $@" +- @$(CC) $^ -o $@ $(LIBS) ++ @$(CC) $(LDFLAGS) $^ -o $@ $(LIBS) + + subtitle2vobsub: subtitle2vobsub.o vobsub.o + @echo "Linking $@" +- @$(CC) $^ -o $@ $(LIBS) ++ @$(CC) $(LDFLAGS) $^ -o $@ $(LIBS) + + srttool: srttool.o + @echo "Linking $@" +- @$(CC) -g $^ -o $@ $(LIBS) ++ @$(CC) $(LDFLAGS) $^ -o $@ $(LIBS) + + vobsub2pgm: vobsub2pgm.o vobsub.o spudec.o + @echo "Linking $@" +- @$(CC) -g $^ -o $@ $(LIBS) ++ @$(CC) $(LDFLAGS) $^ -o $@ $(LIBS) + + .PHONY: clean dist rpm + clean: diff --git a/extra/varnish/PKGBUILD b/extra/varnish/PKGBUILD index 9cbeb3b04..11053221d 100644 --- a/extra/varnish/PKGBUILD +++ b/extra/varnish/PKGBUILD @@ -5,20 +5,21 @@ # Contributor: Roberto Alsina <ralsina@kde.org> pkgname=varnish -pkgver=3.0.1 -pkgrel=1 +pkgver=3.0.2 +pkgrel=2 pkgdesc="High-performance HTTP accelerator" arch=(mips64el) url="http://www.varnish-cache.org/" license=('BSD') depends=('gcc' 'libedit' 'pcre') -backup=('etc/conf.d/varnish') +backup=('etc/conf.d/varnish' + 'etc/varnish/default.vcl') install=$pkgname.install options=('!libtool') source=("http://repo.varnish-cache.org/source/$pkgname-$pkgver.tar.gz" "$pkgname.conf.d" "rc.$pkgname") -md5sums=('d01d9c1f2da2b2a1b18299a0b44c8580' +md5sums=('c8eae0aabbe66b6daabdf3a1f58cd47a' 'd42eebc7f0ac429d9740125ff1e61daf' '18b7747020ecfe2eac7445971a7014e3') diff --git a/extra/vinagre/PKGBUILD b/extra/vinagre/PKGBUILD index a8bf6cf0e..5f141bb08 100644 --- a/extra/vinagre/PKGBUILD +++ b/extra/vinagre/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 140957 2011-10-20 05:44:20Z ibiru $ +# $Id: PKGBUILD 142898 2011-11-17 18:35:12Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Allan McRae <mcrae_allan@hotmail.com> # Contributor: lp76 <l.peduto@gmail.com> pkgname=vinagre -pkgver=3.2.1 +pkgver=3.2.2 pkgrel=1 pkgdesc="A VNC Client for the GNOME Desktop" arch=('i686' 'x86_64' 'mips64el') @@ -17,11 +17,11 @@ optdepends=('openssh: SSH plugin' makedepends=('gnome-doc-utils' 'intltool' 'rdesktop' 'openssh') groups=('gnome-extra') options=('!emptydirs' '!libtool') -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('077dc011d048e9ed7a683ed74dc027c5c7e47d0b95b99acb493bf99fff22369c') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('1533cc447177f8d6c9cfe45d61b05904efbf66c86b86b4c332e972ff965d76bd') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" #building with as-needed breaks rdp #https://bugzilla.gnome.org/show_bug.cgi?id=653558 @@ -32,6 +32,6 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } diff --git a/extra/vino/PKGBUILD b/extra/vino/PKGBUILD index 13592bdf8..2cbfc7219 100644 --- a/extra/vino/PKGBUILD +++ b/extra/vino/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 140959 2011-10-20 05:44:23Z ibiru $ +# $Id: PKGBUILD 142900 2011-11-17 18:35:14Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=vino -pkgver=3.2.1 +pkgver=3.2.2 pkgrel=1 pkgdesc="a VNC server for the GNOME desktop" arch=('i686' 'x86_64' 'mips64el') @@ -13,11 +13,11 @@ groups=('gnome-extra') url="http://www.gnome.org" options=(!emptydirs) install=vino.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('b8c5a59914886b8676fb512da380114adb896264c46a36d3f123cf459ba799df') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('51089c35b5187c37ebcd4f8ad921123f9a56713316876531189a3f3765dc87d1') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/vino \ --localstatedir=/var \ @@ -28,6 +28,6 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } diff --git a/extra/wireshark/PKGBUILD b/extra/wireshark/PKGBUILD index c9d010fa4..a12445446 100644 --- a/extra/wireshark/PKGBUILD +++ b/extra/wireshark/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 141895 2011-11-02 20:35:14Z guillaume $ +# $Id: PKGBUILD 142976 2011-11-19 11:40:12Z guillaume $ # Maintainer: Guillaume ALAUX <guillaume at alaux dot net> # Contributor: Florian Pritz <bluewind at jabber dot ccc dot de> pkgname=(wireshark-cli wireshark-gtk) pkgbase=wireshark -pkgver=1.6.3 +pkgver=1.6.4 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('GPL2') @@ -11,7 +11,7 @@ makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls' 'li url="http://www.wireshark.org/" options=(!libtool) source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2) -md5sums=('5012c75c379ffd47fbcf395d9a6e417e') +md5sums=('a348521c514fcdd890d974f2a0b59db3') build() { cd "${srcdir}/${pkgbase}-${pkgver}" @@ -37,7 +37,7 @@ package_wireshark-cli() { #wireshark uid group is 150 chgrp 150 "${pkgdir}/usr/bin/dumpcap" chmod 754 "${pkgdir}/usr/bin/dumpcap" - rm "$pkgdir/usr/bin/wireshark" + rm "${pkgdir}/usr/bin/wireshark" } package_wireshark-gtk() { diff --git a/extra/xf86-input-joystick/PKGBUILD b/extra/xf86-input-joystick/PKGBUILD index 0a6fe5e38..7c8fa0ab0 100644 --- a/extra/xf86-input-joystick/PKGBUILD +++ b/extra/xf86-input-joystick/PKGBUILD @@ -1,25 +1,28 @@ -# $Id: PKGBUILD 140358 2011-10-11 21:29:48Z jgc $ +# $Id: PKGBUILD 142923 2011-11-18 09:36:49Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-input-joystick pkgver=1.6.0 -pkgrel=2 +pkgrel=3 pkgdesc="X.Org Joystick input driver" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc') -makedepends=('xorg-server-devel>=1.10.99.902') -conflicts=('xorg-server<1.10.99.902') +makedepends=('xorg-server-devel>=1.11.0') +conflicts=('xorg-server<1.11.0') groups=('xorg-drivers' 'xorg') options=('!libtool') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 + git-fixes.patch 50-joystick.conf) sha1sums=('3b9aed1b8128e1fbd947fdcdd5e16efccad1c780' + '7812a34013a2333641bd7c5d044c46179490cb32' 'e1ff3699a0470c6bb78a53f718df9d8521621e11') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/git-fixes.patch" ./configure --prefix=/usr make } diff --git a/extra/xf86-input-joystick/git-fixes.patch b/extra/xf86-input-joystick/git-fixes.patch new file mode 100644 index 000000000..b3afa06cc --- /dev/null +++ b/extra/xf86-input-joystick/git-fixes.patch @@ -0,0 +1,399 @@ +From 204dcb86368b011824fc5006f87b9e394d03a394 Mon Sep 17 00:00:00 2001 +From: Terry Lambert <tlambert@chromium.org> +Date: Sat, 16 Jul 2011 00:23:22 +0000 +Subject: Return proper default for unknown values in pInfo->device_control. + +Signed-off-by: Terry Lambert <tlambert@chromium.org> +Reviewed-by: Stephane Marchesin <marcheu@chromium.org> +Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> +--- +diff --git a/src/jstk.c b/src/jstk.c +index ec6b79a..6db0e7c 100644 +--- a/src/jstk.c ++++ b/src/jstk.c +@@ -419,8 +419,7 @@ jstkDeviceControlProc(DeviceIntPtr pJstk, + + default: + ErrorF("unsupported mode=%d\n", what); +- return !Success; +- break; ++ return BadValue; + } /* switch (what) */ + return Success; + } +diff --git a/src/jstk_key.c b/src/jstk_key.c +index 3c471ce..d699dcd 100644 +--- a/src/jstk_key.c ++++ b/src/jstk_key.c +@@ -169,6 +169,8 @@ jstkKeyboardDeviceControlProc(DeviceIntPtr dev, + DBG(2, ErrorF("jstkKeyboardDeviceControlProc what=DEVICE_CLOSE\n")); + dev->public.on = FALSE; + break; ++ default: ++ return BadValue; + } + + return Success; +-- +cgit v0.9.0.2-2-gbebe +From b3b62328cf3f36c20c54a298f8a921e6eef42c4d Mon Sep 17 00:00:00 2001 +From: Devin J. Pohly <djpohly+xorg@gmail.com> +Date: Sat, 03 Sep 2011 23:00:07 +0000 +Subject: unify capitalization of joystick properties + +the axis keys high/low properties were inconsistently capitalized, +leading to potential confusion as to why one works but not the other. + +Signed-off-by: Devin J. Pohly <djpohly+xorg@gmail.com> +Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> +--- +diff --git a/include/joystick-properties.h b/include/joystick-properties.h +index 49ef800..36f4082 100644 +--- a/include/joystick-properties.h ++++ b/include/joystick-properties.h +@@ -99,7 +99,7 @@ typedef enum _JSTK_MAPPING { + + /** Scancodes for axis in high position */ + /* 8 bit, 4 per axis */ +-#define JSTK_PROP_AXIS_KEYS_HIGH "Axis keys (high)" ++#define JSTK_PROP_AXIS_KEYS_HIGH "Axis Keys (high)" + + /** Set the mapping of each button to + none, x, y, zx, zy, button, key, speed_multiply, +-- +cgit v0.9.0.2-2-gbebe +From b607c4ebeea4122694f02ba87f06e4cdb23114f1 Mon Sep 17 00:00:00 2001 +From: Sascha Hlusiak <saschahlusiak@arcor.de> +Date: Sat, 15 Oct 2011 22:47:52 +0000 +Subject: label buttons and axes + +Buttons are labeled "Button %d", starting with 0 and representing the button in X _after_ mapping. +Mapping can be changed while running so the labels will be constant. + +Axes are labeled "Axis %d", starting with 1, representing the _physical_ axis that reports the valuator +data. The raw valuators can't be dynamically mapped, the first two valuators always are labeled "Rel X" +and "Rel Y", representing the aggregated post-calculation data from all axes. + +Signed-off-by: Sascha Hlusiak <saschahlusiak@arcor.de> +--- +diff --git a/man/joystick.man b/man/joystick.man +index da92ceb..b401de5 100644 +--- a/man/joystick.man ++++ b/man/joystick.man +@@ -140,7 +140,11 @@ Neither + .B mode + nor + .B axis +-needs to be set to generate extra valuator events. ++needs to be set to generate extra valuator events. The axis will be labelled according to it's physical axis number, beginning with ++.I 1 ++, i.e. ++.I \*qAxis 1\*q ++for the first axis (being the 3rd valuator). + Default: not set. + .TP 7 + .BI "\*qaxis="[<factor>]<axis> \*q +@@ -318,6 +322,28 @@ and the second and fourth axis to the arrow keys + The keys for the first two axes will be generated in an interval according to the value of the axis. The autorepeat speed of the first axis will be half the speed of that of the second axis. + The keys for the third and fourth axis are generated once when the axis moves out of the deadzone and when it moves back into the deadzone. X.Org will autorepeat those keys according to current keyboard settings. + ++.SH "XI2 Events" ++If you only care about raw events instead of using the joystick as a mouse replacement, don't forget to unmap and add valuators to all axes and map the remaining buttons: ++ ++.nf ++.BI " Option \*qMapAxis1\*q \*q" "mode=none valuator" \*q ++.BI " Option \*qMapAxis2\*q \*q" "mode=none valuator" \*q ++.BI " Option \*qMapAxis3\*q \*q" "mode=none valuator" \*q ++.BI " Option \*qMapAxis4\*q \*q" "mode=none valuator" \*q ++\ \ ... ++.BI " Option \*qMapButton1\*q \*q" "button=1" \*q ++.BI " Option \*qMapButton2\*q \*q" "button=2" \*q ++.BI " Option \*qMapButton3\*q \*q" "button=3" \*q ++.BI " Option \*qMapButton4\*q \*q" "button=4" \*q ++.BI " Option \*qMapButton5\*q \*q" "button=5" \*q ++\ \ ... ++.fi ++ ++You might also want to set the device "floating" to stop it from reporting core events: ++.nf ++.BI " Option \*qFloating\*q \*q" "true" \*q ++.fi ++ + .SH "NOTES" + Configuration through + .I InputClass +diff --git a/src/jstk.c b/src/jstk.c +index 6db0e7c..772683f 100644 +--- a/src/jstk.c ++++ b/src/jstk.c +@@ -1,5 +1,5 @@ + /* +- * Copyright 2007-2009 by Sascha Hlusiak. <saschahlusiak@freedesktop.org> ++ * Copyright 2007-2011 by Sascha Hlusiak. <saschahlusiak@freedesktop.org> + * Copyright 1995-1999 by Frederic Lepied, France. <Lepied@XFree86.org> + * + * Permission to use, copy, modify, distribute, and sell this software and its +@@ -21,7 +21,6 @@ + * PERFORMANCE OF THIS SOFTWARE. + */ + +- + #ifdef HAVE_CONFIG_H + #include "config.h" + #endif +@@ -300,6 +299,7 @@ jstkDeviceControlProc(DeviceIntPtr pJstk, + switch (what) { + case DEVICE_INIT: { + int m; ++ char str[32]; + CARD8 buttonmap[BUTTONMAP_SIZE+1]; + DBG(1, ErrorF("jstkDeviceControlProc what=INIT\n")); + /* Probe device and return if error */ +@@ -312,11 +312,14 @@ jstkDeviceControlProc(DeviceIntPtr pJstk, + } + + for (m=0; m<=BUTTONMAP_SIZE; m++) { ++ sprintf(str, "Button %d", m); ++ + buttonmap[m] = m; +- } ++ btn_labels[m] = MakeAtom(str, strlen(str), TRUE); ++ } ++ ++ + +- +- + if (InitButtonClassDeviceStruct(pJstk, BUTTONMAP_SIZE, + btn_labels, + buttonmap) == FALSE) { +@@ -331,7 +334,9 @@ jstkDeviceControlProc(DeviceIntPtr pJstk, + if (priv->axis[i].valuator != -1) + { + DBG(3, ErrorF("Axis %d will be valuator %d\n", i, m)); ++ sprintf(str, "Axis %d", i + 1); + priv->axis[i].valuator = m++; ++ axes_labels[i] = MakeAtom(str, strlen(str), TRUE); + } + + if (InitValuatorClassDeviceStruct(pJstk, m, axes_labels, +@@ -719,7 +724,6 @@ static XF86ModuleVersionInfo jstkVersionRec = + /* a tool */ + }; + +- + /* + *************************************************************************** + * +@@ -732,3 +736,6 @@ _X_EXPORT XF86ModuleData joystickModuleData = { + jstkDriverPlug, + jstkDriverUnplug + }; ++ ++/* vim: set filetype=c.doxygen ts=4 et: */ ++ +-- +cgit v0.9.0.2-2-gbebe +From e0193debf8f5a72b0a06977d5dea3365ad9cafbe Mon Sep 17 00:00:00 2001 +From: Peter Hutterer <peter.hutterer@who-t.net> +Date: Mon, 31 Oct 2011 04:27:22 +0000 +Subject: Fix option type for option duplication + +xf86OptionListDuplicate() duplicates an XF86Option list, not an InputOption +list. + +Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> +Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> +--- +diff --git a/src/jstk_key.c b/src/jstk_key.c +index d699dcd..e842941 100644 +--- a/src/jstk_key.c ++++ b/src/jstk_key.c +@@ -253,26 +253,26 @@ jstkKeyboardHotplug(InputInfoPtr pInfo, int flags) + int rc; + char name[512] = {0}; + InputAttributes *attrs = NULL; +- InputOption *options; + InputOption *iopts = NULL, *tmp; + DeviceIntPtr dev; ++ XF86OptionPtr opts; + + /* duplicate option list, append to name */ +- options = xf86OptionListDuplicate(pInfo->options); ++ opts = xf86OptionListDuplicate(pInfo->options); + strcpy(name, pInfo->name); + strcat(name, " (keys)"); +- options = xf86ReplaceStrOption(options, "Name", name); +- options = xf86ReplaceStrOption(options, "_source", "_driver/joystick"); ++ opts = xf86ReplaceStrOption(opts, "Name", name); ++ opts = xf86ReplaceStrOption(opts, "_source", "_driver/joystick"); + +- while(options) ++ while(opts) + { + tmp = calloc(1, sizeof(InputOption)); + +- tmp->key = xf86OptionName(options); +- tmp->value = xf86OptionValue(options); ++ tmp->key = xf86OptionName(opts); ++ tmp->value = xf86OptionValue(opts); + tmp->next = iopts; + iopts = tmp; +- options = xf86NextOption(options); ++ opts = xf86NextOption(opts); + } + + /* duplicate attribute list */ +-- +cgit v0.9.0.2-2-gbebe +From 7ccf3a75292d71104c976bf6afb389cccaac1a7d Mon Sep 17 00:00:00 2001 +From: Peter Hutterer <peter.hutterer@who-t.net> +Date: Mon, 31 Oct 2011 04:33:08 +0000 +Subject: Deal with opaque input option types. + +ABI 14 made the InputOption type opaque, move the existing code to ifdefs +and use the new function calls otherwise. + +Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> +Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> +Reviewed-by: Chase Douglas <chase.douglas@canonical.com> +--- +diff --git a/src/jstk_key.c b/src/jstk_key.c +index e842941..a71275a 100644 +--- a/src/jstk_key.c ++++ b/src/jstk_key.c +@@ -247,13 +247,46 @@ int jstkKeyboardPreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags) + return Success; + } + ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 14 ++static InputOption* ++input_option_new(InputOption* list, char *key, char *value) ++{ ++ InputOption *tmp; ++ ++ tmp = calloc(1, sizeof(*tmp)); ++ tmp->key = key; ++ tmp->value = value; ++ tmp->next = list; ++ ++ return tmp; ++} ++ ++static void ++input_option_free_list(InputOption **list) ++{ ++ InputOption *iopts = *list; ++ ++ while(iopts) ++ { ++ InputOption *tmp = iopts->next; ++ free(iopts->key); ++ free(iopts->value); ++ free(iopts); ++ iopts = tmp; ++ } ++ ++ *list = NULL; ++} ++ ++#endif ++ + InputInfoPtr + jstkKeyboardHotplug(InputInfoPtr pInfo, int flags) + { + int rc; + char name[512] = {0}; + InputAttributes *attrs = NULL; +- InputOption *iopts = NULL, *tmp; ++ InputOption *iopts = NULL; + DeviceIntPtr dev; + XF86OptionPtr opts; + +@@ -266,12 +299,9 @@ jstkKeyboardHotplug(InputInfoPtr pInfo, int flags) + + while(opts) + { +- tmp = calloc(1, sizeof(InputOption)); +- +- tmp->key = xf86OptionName(opts); +- tmp->value = xf86OptionValue(opts); +- tmp->next = iopts; +- iopts = tmp; ++ iopts = input_option_new(iopts, ++ xf86OptionName(opts), ++ xf86OptionValue(opts)); + opts = xf86NextOption(opts); + } + +@@ -280,14 +310,7 @@ jstkKeyboardHotplug(InputInfoPtr pInfo, int flags) + + rc = NewInputDeviceRequest(iopts, attrs, &dev); + +- while(iopts) +- { +- tmp = iopts->next; +- free(iopts->key); +- free(iopts->value); +- free(iopts); +- iopts = tmp; +- } ++ input_option_free_list(&iopts); + + FreeInputAttributes(attrs); + +-- +cgit v0.9.0.2-2-gbebe +From 411c1838456c055d3f911c54ed58bb11a6bf0da3 Mon Sep 17 00:00:00 2001 +From: Sascha Hlusiak <saschahlusiak@arcor.de> +Date: Sun, 13 Nov 2011 17:04:25 +0000 +Subject: man: valuators are not added automatically + +--- +diff --git a/man/joystick.man b/man/joystick.man +index b401de5..9f38ceb 100644 +--- a/man/joystick.man ++++ b/man/joystick.man +@@ -129,9 +129,6 @@ can be one of: + + .B none, relative, accelerated, absolute + +-Every axis which's mode is not +-.B none +-will be reported as an additional valuator. + .TP 7 + .B \*qvaluator\*q + Send extra valuator events for this axis. The valuators will be numbered ascending, starting with 2 (valuator 0 and 1 are reserved for pointer movement). The range of the valuators is always +-- +cgit v0.9.0.2-2-gbebe +From b217fabdef1714ed4898e08de4c2a6b9cc8d4f0f Mon Sep 17 00:00:00 2001 +From: Sascha Hlusiak <saschahlusiak@arcor.de> +Date: Sun, 13 Nov 2011 19:36:07 +0000 +Subject: Copy pInfo->driver to option list to fix hotplugging of keyboard device + +udev does copy the Driver line to the list of options, but when manually +specifying the driver in xorg.conf, the option "Driver" is unset. Because we +do hotplug a sub-device from within the core device, we need the "Driver" +option to be present in the list. + +This should fix archlinux bug #23577: + https://bugs.archlinux.org/task/23577 + +Thanks to Malek for coming up with a fix. + +Signed-off-by: Sascha Hlusiak <contact@saschahlusiak.de> +--- +diff --git a/src/jstk_key.c b/src/jstk_key.c +index a71275a..241b15d 100644 +--- a/src/jstk_key.c ++++ b/src/jstk_key.c +@@ -296,6 +296,7 @@ jstkKeyboardHotplug(InputInfoPtr pInfo, int flags) + strcat(name, " (keys)"); + opts = xf86ReplaceStrOption(opts, "Name", name); + opts = xf86ReplaceStrOption(opts, "_source", "_driver/joystick"); ++ opts = xf86AddNewOption(opts, "Driver", pInfo->driver); + + while(opts) + { +-- +cgit v0.9.0.2-2-gbebe diff --git a/extra/xf86-input-wacom/PKGBUILD b/extra/xf86-input-wacom/PKGBUILD index 1933dab48..24604d845 100644 --- a/extra/xf86-input-wacom/PKGBUILD +++ b/extra/xf86-input-wacom/PKGBUILD @@ -1,23 +1,23 @@ -# $Id: PKGBUILD 140370 2011-10-11 21:30:03Z jgc $ +# $Id: PKGBUILD 142834 2011-11-16 13:12:15Z heftig $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: M Rawash <mrawash@gmail.com> pkgname=xf86-input-wacom -pkgver=0.11.1 -pkgrel=3 +pkgver=0.12.0 +pkgrel=1 pkgdesc="X.Org Wacom tablet driver" arch=('i686' 'x86_64' 'mips64el') url="http://linuxwacom.sourceforge.net/" license=('GPL') backup=('etc/X11/xorg.conf.d/50-wacom.conf') -depends=('libxi' 'libxrandr') -makedepends=('xorg-server-devel>=1.10.99.902' 'libxext' 'libxi') -conflicts=('xorg-server<1.10.99.902') +depends=('libxi' 'libxrandr' 'libxinerama') +makedepends=('xorg-server-devel>=1.11.0' 'libxext') +conflicts=('xorg-server<1.11.0') options=(!libtool) source=(http://downloads.sourceforge.net/project/linuxwacom/${pkgname}/${pkgname}-${pkgver}.tar.bz2 70-wacom.rules) -md5sums=('0aec4a338cc583ed497b6af68d6d80ab' +md5sums=('e1c41d143d5040982ae050c7ef9039e3' '10db4f8272286690255c1bcc18bfdd92') build() { diff --git a/extra/xine-lib/PKGBUILD b/extra/xine-lib/PKGBUILD index 8f1468f0f..9eab2ca68 100644 --- a/extra/xine-lib/PKGBUILD +++ b/extra/xine-lib/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 142648 2011-11-12 17:15:49Z ibiru $ +# $Id: PKGBUILD 142780 2011-11-15 05:34:03Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=xine-lib -pkgver=1.1.19 -pkgrel=6 +pkgver=1.1.20 +pkgrel=1 pkgdesc="A multimedia playback engine" arch=('i686' 'x86_64' 'mips64el') url="http://www.xine-project.org" @@ -25,28 +25,15 @@ optdepends=('imagemagick: for using the imagemagick plugin' \ 'libmng: for using the mng plugin' \ 'aalib: for using the aalib plugin') options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.xz - xine-lib-1.1.1-configure-no-mcpu-march.patch xine-lib-1.1.19-xvmc.patch - xine-lib-1.1.19-ffmpeg.patch) -sha1sums=('f65f762d2e16adf04b9d715c91ee0bc02c322a7d' - '121a8358d7919b2e51067412373f52848290338a' - '920bf27e6e3523dfe4cc9c802ff713e9688a3f34' - 'd70f14c3dbb59b65c581575fa1fe13aeeb38f1b1') +source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.xz) +sha1sums=('1dbd48e14113739101429391d45f65ebbf6519fc') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -p0 -i "${srcdir}/xine-lib-1.1.1-configure-no-mcpu-march.patch" - patch -p0 -i "${srcdir}/xine-lib-1.1.19-xvmc.patch" - patch -p1 -i "${srcdir}/xine-lib-1.1.19-ffmpeg.patch" sed -i 's|linux/videodev.h|libv4l1-videodev.h|' \ - configure.ac src/input/input_v4l.c src/video_out/video_out_syncfb.h - - libtoolize --force --copy - aclocal -I m4 - autoconf - automake --add-missing - - ./configure --prefix=/usr --with-wavpack --with-external-ffmpeg --with-external-libfaad + configure src/input/input_v4l.c src/video_out/video_out_syncfb.h + ./configure --prefix=/usr --with-wavpack --with-external-ffmpeg --with-external-libfaad \ + --disable-optimizations make } diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD index 72cbd6bd9..5be04a4a5 100644 --- a/extra/xorg-server/PKGBUILD +++ b/extra/xorg-server/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 142252 2011-11-07 09:31:56Z andyrtr $ +# $Id: PKGBUILD 142918 2011-11-18 09:17:26Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=xorg-server pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel') pkgver=1.11.2 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') license=('custom') url="http://xorg.freedesktop.org" -makedepends=('pixman' 'libx11' 'mesa' 'libgl' 'xcmiscproto' 'xtrans' 'bigreqsproto' 'randrproto' 'inputproto' 'fontsproto' 'videoproto' 'compositeproto' 'recordproto' 'scrnsaverproto' 'resourceproto' 'xineramaproto' 'libxkbfile' 'libxfont' 'renderproto' 'libpciaccess' 'libxv' 'xf86dgaproto' 'libxmu' 'libxrender' 'libxi' 'dmxproto' 'libxaw' 'libdmx' 'libxtst' 'libxres' 'xorg-xkbcomp' 'xorg-util-macros' 'xorg-font-util' 'glproto') +makedepends=('pixman' 'libx11' 'mesa' 'libgl' 'xcmiscproto' 'xtrans' 'bigreqsproto' 'randrproto' 'inputproto' 'fontsproto' 'videoproto' 'compositeproto' 'recordproto' 'scrnsaverproto' 'resourceproto' 'xineramaproto' 'libxkbfile' 'libxfont' 'renderproto' 'libpciaccess' 'libxv' 'xf86dgaproto' 'libxmu' 'libxrender' 'libxi' 'dmxproto' 'libxaw' 'libdmx' 'libxtst' 'libxres' 'xorg-xkbcomp' 'xorg-util-macros' 'xorg-font-util' 'glproto' 'udev' 'libgcrypt') [ "$CARCH" = "mips64el" ] || makedepends+=('xf86driproto' 'dri2proto') options=('!libtool') source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2 @@ -16,6 +16,8 @@ source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2 autoconfig-sis.patch revert-trapezoids.patch git-fixes.patch + xserver-1.11.2-record-crasher.patch + Xi-allow-passive-keygrabs-on-the-XIAll-Master-Device.patch xvfb-run xvfb-run.1 10-quirks.conf) @@ -23,7 +25,9 @@ md5sums=('8796fff441e5435ee36a72579008af24' '6c7e87d63ac4b535e19a80c89d0cf091' 'f8194638ca4872c2b0a67862a70bcebf' 'f6c84f4936f8e00abdfbd9fb4eda83fb' - 'b9cdb3855cc2b2e974a98b9a20d1ec2b' + '6fb42ec979ecd6125b6599f54dc00d14' + '3f9de4dbfee2da90167192d8ca9eb2b4' + '47f9b979fe38043b42ff86eeee6fd0d0' '52fd3effd80d7bc6c1660d4ecf23d31c' '376c70308715cd2643f7bff936d9934b' 'd4f7dfc6be4ef4e2c6dd7632a9d88abe') @@ -43,6 +47,14 @@ build() { # Add post-release patches from 1.11 branch patch -Np1 -i "${srcdir}/git-fixes.patch" + # From Fedora. + # Upstream URL: http://patchwork.freedesktop.org/patch/7866/ + patch -Np1 -i "${srcdir}/xserver-1.11.2-record-crasher.patch" + + # From Fedora. + # Upstream URL: https://bugs.freedesktop.org/show_bug.cgi?id=42298 + patch -Np1 -i "${srcdir}/Xi-allow-passive-keygrabs-on-the-XIAll-Master-Device.patch" + autoreconf -fi if [ "$CARCH" = "mips64el" ]; then ./configure --prefix=/usr \ diff --git a/extra/xorg-server/Xi-allow-passive-keygrabs-on-the-XIAll-Master-Device.patch b/extra/xorg-server/Xi-allow-passive-keygrabs-on-the-XIAll-Master-Device.patch new file mode 100644 index 000000000..8bddb2945 --- /dev/null +++ b/extra/xorg-server/Xi-allow-passive-keygrabs-on-the-XIAll-Master-Device.patch @@ -0,0 +1,31 @@ +From 97f2af5876dab0dfab06be735416f3fc950ed39e Mon Sep 17 00:00:00 2001 +From: Peter Hutterer <peter.hutterer@who-t.net> +Date: Thu, 27 Oct 2011 11:03:39 +1000 +Subject: [PATCH] Xi: allow passive keygrabs on the XIAll(Master)Devices fake + devices + +They don't have a KeyClassRec, but we must still allow passive grabs on +them. + +Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> +Tested-by: Bastien Nocera <hadess@hadess.net> +--- + Xi/exevents.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/Xi/exevents.c b/Xi/exevents.c +index 053c76f..edf2c39 100644 +--- a/Xi/exevents.c ++++ b/Xi/exevents.c +@@ -1495,7 +1495,7 @@ GrabKey(ClientPtr client, DeviceIntPtr dev, DeviceIntPtr modifier_device, + rc = CheckGrabValues(client, param); + if (rc != Success) + return rc; +- if (k == NULL) ++ if ((dev->id != XIAllDevices && dev->id != XIAllMasterDevices) && k == NULL) + return BadMatch; + if (grabtype == GRABTYPE_XI) + { +-- +1.7.7 + diff --git a/extra/xorg-server/git-fixes.patch b/extra/xorg-server/git-fixes.patch index 9629b3040..27da61eca 100644 --- a/extra/xorg-server/git-fixes.patch +++ b/extra/xorg-server/git-fixes.patch @@ -115,3 +115,47 @@ index 31ed505..dce3f84 100644 miSetPixmapDepths (); -- cgit v0.9.0.2-2-gbebe +From 34bb83b9df20ff63dbb147ed661f39efb8bae8e4 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer <peter.hutterer@who-t.net> +Date: Mon, 24 Oct 2011 02:00:32 +0000 +Subject: dix: block signals when closing all devices + +When closing down all devices, we manually unset master for all attached +devices, but the device's sprite info still points to the master's sprite +info. This leaves us a window where the master is freed already but the +device isn't yet. A signal during that window causes dereference of the +already freed spriteInfo in mieqEnqueue's EnqueueScreen macro. + +Simply block signals when removing all devices. It's not like we're really +worrying about high-responsive input at this stage. + +https://bugzilla.redhat.com/show_bug.cgi?id=737031 + +Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> +Reviewed-by: Julien Cristau <jcristau@debian.org> +(cherry picked from commit d7c44a7c9760449bef263413ad3b20f19b1dc95a) +--- +diff --git a/dix/devices.c b/dix/devices.c +index 0ccf252..cbdd4ea 100644 +--- a/dix/devices.c ++++ b/dix/devices.c +@@ -982,6 +982,8 @@ CloseDownDevices(void) + { + DeviceIntPtr dev; + ++ OsBlockSignals(); ++ + /* Float all SDs before closing them. Note that at this point resources + * (e.g. cursors) have been freed already, so we can't just call + * AttachDevice(NULL, dev, NULL). Instead, we have to forcibly set master +@@ -1004,6 +1006,8 @@ CloseDownDevices(void) + inputInfo.keyboard = NULL; + inputInfo.pointer = NULL; + XkbDeleteRulesDflts(); ++ ++ OsReleaseSignals(); + } + + /** +-- +cgit v0.9.0.2-2-gbebe diff --git a/extra/xorg-server/xserver-1.11.2-record-crasher.patch b/extra/xorg-server/xserver-1.11.2-record-crasher.patch new file mode 100644 index 000000000..3af207bb9 --- /dev/null +++ b/extra/xorg-server/xserver-1.11.2-record-crasher.patch @@ -0,0 +1,241 @@ +From patchwork Tue Nov 8 18:22:13 2011 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 8bit +Subject: Save major/minor opcodes in ClientRec for RecordAReply +Date: Tue, 08 Nov 2011 18:22:13 -0000 +From: Keith Packard <keithp@keithp.com> +X-Patchwork-Id: 7866 +Message-Id: <1320776533-3120-1-git-send-email-keithp@keithp.com> +To: xorg-devel@lists.freedesktop.org + +The record extension needs the major and minor opcodes in the reply +hook, but the request buffer may have been freed by the time the hook +is invoked. Saving the request major and minor codes as the request is +executed avoids fetching from the defunct request buffer. + +This patch also eliminates the public MinorOpcodeOfRequest function, +making it static to dispatch. Usages of that function have been +replaced with direct access to the new ClientRec field. + +Signed-off-by: Keith Packard <keithp@keithp.com> +Reviewed-by: Rami Ylimäki <rami.ylimaki@vincit.fi> + +--- +Here's what I was thinking of to fix this -- just record the major and +minor opcodes of the request in the ClientRec during Dispatch and then +using those fields in RecordAReply instead of fetching the discarded +request buffer. + +This is entirely untested; I don't know how to make the old code break. + + Xext/security.c | 4 +--- + Xext/xselinux_hooks.c | 4 ++-- + dix/dispatch.c | 31 ++++++++++++++++++++++--------- + dix/extension.c | 14 -------------- + include/dixstruct.h | 1 + + include/extension.h | 2 -- + record/record.c | 8 +++----- + 7 files changed, 29 insertions(+), 35 deletions(-) + +[ fedora: technically this is an ABI breaker since it's changing ClientRec, + but hopefully not in a way that matters. If it does matter, easiest thing + to do is have Record add a hook for XaceHookDispatch. - ajax ] + +diff --git a/Xext/security.c b/Xext/security.c +index 08d8158..b0d82ab 100644 +--- a/Xext/security.c ++++ b/Xext/security.c +@@ -148,9 +148,7 @@ SecurityLabelInitial(void) + static _X_INLINE const char * + SecurityLookupRequestName(ClientPtr client) + { +- int major = ((xReq *)client->requestBuffer)->reqType; +- int minor = MinorOpcodeOfRequest(client); +- return LookupRequestName(major, minor); ++ return LookupRequestName(client->majorOp, client->minorOp); + } + + +diff --git a/Xext/xselinux_hooks.c b/Xext/xselinux_hooks.c +index f1d8e5d..0d4c9ab 100644 +--- a/Xext/xselinux_hooks.c ++++ b/Xext/xselinux_hooks.c +@@ -263,8 +263,8 @@ SELinuxAudit(void *auditdata, + if (client) { + REQUEST(xReq); + if (stuff) { +- major = stuff->reqType; +- minor = MinorOpcodeOfRequest(client); ++ major = client->majorOp; ++ minor = client->minorOp; + } + } + if (audit->id) +diff --git a/dix/dispatch.c b/dix/dispatch.c +index 6e33615..3600acd 100644 +--- a/dix/dispatch.c ++++ b/dix/dispatch.c +@@ -337,7 +337,20 @@ DisableLimitedSchedulingLatency(void) + SmartScheduleLatencyLimited = 0; + } + +-#define MAJOROP ((xReq *)client->requestBuffer)->reqType ++static inline unsigned short ++MinorOpcodeOfRequest(ClientPtr client) ++{ ++ unsigned char major; ++ ExtensionEntry *ext; ++ ++ major = ((xReq *)client->requestBuffer)->reqType; ++ if (major < EXTENSION_BASE) ++ return 0; ++ ext = GetExtensionEntry(major); ++ if (!ext) ++ return 0; ++ return ext->MinorOpcode (client); ++} + + void + Dispatch(void) +@@ -419,21 +432,23 @@ Dispatch(void) + } + + client->sequence++; ++ client->majorOp = ((xReq *)client->requestBuffer)->reqType; ++ client->minorOp = MinorOpcodeOfRequest(client); + #ifdef XSERVER_DTRACE +- XSERVER_REQUEST_START(LookupMajorName(MAJOROP), MAJOROP, ++ XSERVER_REQUEST_START(LookupMajorName(client->majorOp), client->majorOp, + ((xReq *)client->requestBuffer)->length, + client->index, client->requestBuffer); + #endif + if (result > (maxBigRequestSize << 2)) + result = BadLength; + else { +- result = XaceHookDispatch(client, MAJOROP); ++ result = XaceHookDispatch(client, client->majorOp); + if (result == Success) +- result = (* client->requestVector[MAJOROP])(client); ++ result = (* client->requestVector[client->majorOp])(client); + XaceHookAuditEnd(client, result); + } + #ifdef XSERVER_DTRACE +- XSERVER_REQUEST_DONE(LookupMajorName(MAJOROP), MAJOROP, ++ XSERVER_REQUEST_DONE(LookupMajorName(client->majorOp), client->majorOp, + client->sequence, client->index, result); + #endif + +@@ -444,8 +459,8 @@ Dispatch(void) + } + else if (result != Success) + { +- SendErrorToClient(client, MAJOROP, +- MinorOpcodeOfRequest(client), ++ SendErrorToClient(client, client->majorOp, ++ client->minorOp, + client->errorValue, result); + break; + } +@@ -466,8 +481,6 @@ Dispatch(void) + SmartScheduleLatencyLimited = 0; + } + +-#undef MAJOROP +- + static int VendorRelease = VENDOR_RELEASE; + static char *VendorString = VENDOR_NAME; + +diff --git a/dix/extension.c b/dix/extension.c +index c7bbac5..b677cdb 100644 +--- a/dix/extension.c ++++ b/dix/extension.c +@@ -228,20 +228,6 @@ StandardMinorOpcode(ClientPtr client) + return ((xReq *)client->requestBuffer)->data; + } + +-unsigned short +-MinorOpcodeOfRequest(ClientPtr client) +-{ +- unsigned char major; +- +- major = ((xReq *)client->requestBuffer)->reqType; +- if (major < EXTENSION_BASE) +- return 0; +- major -= EXTENSION_BASE; +- if (major >= NumExtensions) +- return 0; +- return (*extensions[major]->MinorOpcode)(client); +-} +- + void + CloseDownExtensions(void) + { +diff --git a/include/dixstruct.h b/include/dixstruct.h +index 6cc9614..0a85f40 100644 +--- a/include/dixstruct.h ++++ b/include/dixstruct.h +@@ -122,6 +122,7 @@ typedef struct _Client { + + DeviceIntPtr clientPtr; + ClientIdPtr clientIds; ++ unsigned short majorOp, minorOp; + } ClientRec; + + /* +diff --git a/include/extension.h b/include/extension.h +index 29a11c3..9249951 100644 +--- a/include/extension.h ++++ b/include/extension.h +@@ -52,8 +52,6 @@ _XFUNCPROTOBEGIN + + extern _X_EXPORT unsigned short StandardMinorOpcode(ClientPtr /*client*/); + +-extern _X_EXPORT unsigned short MinorOpcodeOfRequest(ClientPtr /*client*/); +- + extern _X_EXPORT Bool EnableDisableExtension(char *name, Bool enable); + + extern _X_EXPORT void EnableDisableExtensionError(char *name, Bool enable); +diff --git a/record/record.c b/record/record.c +index 68311ac..4a0fe23 100644 +--- a/record/record.c ++++ b/record/record.c +@@ -546,7 +546,7 @@ RecordARequest(ClientPtr client) + } + else /* extension, check minor opcode */ + { +- int minorop = MinorOpcodeOfRequest(client); ++ int minorop = client->minorOp; + int numMinOpInfo; + RecordMinorOpPtr pMinorOpInfo = pRCAP->pRequestMinOpInfo; + +@@ -603,12 +603,9 @@ RecordAReply(CallbackListPtr *pcbl, pointer nulldata, pointer calldata) + RecordContextPtr pContext; + RecordClientsAndProtocolPtr pRCAP; + int eci; +- int majorop; + ReplyInfoRec *pri = (ReplyInfoRec *)calldata; + ClientPtr client = pri->client; +- REQUEST(xReq); + +- majorop = stuff->reqType; + for (eci = 0; eci < numEnabledContexts; eci++) + { + pContext = ppAllContexts[eci]; +@@ -616,6 +613,7 @@ RecordAReply(CallbackListPtr *pcbl, pointer nulldata, pointer calldata) + NULL); + if (pRCAP) + { ++ int majorop = client->majorOp; + if (pContext->continuedReply) + { + RecordAProtocolElement(pContext, client, XRecordFromServer, +@@ -635,7 +633,7 @@ RecordAReply(CallbackListPtr *pcbl, pointer nulldata, pointer calldata) + } + else /* extension, check minor opcode */ + { +- int minorop = MinorOpcodeOfRequest(client); ++ int minorop = client->minorOp; + int numMinOpInfo; + RecordMinorOpPtr pMinorOpInfo = pRCAP->pReplyMinOpInfo; + assert (pMinorOpInfo); diff --git a/extra/yasm/PKGBUILD b/extra/yasm/PKGBUILD index 16ec9e273..88c6e535b 100644 --- a/extra/yasm/PKGBUILD +++ b/extra/yasm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 98381 2010-11-08 19:21:18Z andrea $ -# Maintainer: +# $Id: PKGBUILD 142979 2011-11-19 15:19:43Z roman $ +# Maintainer: Роман Кирилич (Roman Kyrylych) <roman@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> # Contributor: Vinay S Shastry <vinayshastry@gmail.com> pkgname=yasm -pkgver=1.1.0 +pkgver=1.2.0 pkgrel=1 pkgdesc="A rewrite of NASM to allow for multiple syntax supported (NASM, TASM, GAS, etc.)" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ url="http://www.tortall.net/projects/yasm/" depends=('glibc') source=(http://www.tortall.net/projects/yasm/releases/${pkgname}-${pkgver}.tar.gz) options=('!libtool') -md5sums=('8392e5f2235c2c2a981e1a633f2698cb') +md5sums=('4cfc0686cf5350dd1305c4d905eb55a6') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/libre/audacious-plugins-libre/PKGBUILD b/libre/audacious-plugins-libre/PKGBUILD index 006c39cdf..e0607a940 100644 --- a/libre/audacious-plugins-libre/PKGBUILD +++ b/libre/audacious-plugins-libre/PKGBUILD @@ -5,12 +5,12 @@ # Parabola maintainer: Brendan Tildesley pkgname=audacious-plugins-libre -pkgver=3.0.4 +pkgver=3.1 pkgrel=1 pkgdesc='Plugins for Audacious without unfree plugins' url='http://audacious-media-player.org/' arch=('i686' 'x86_64' 'mips64el') -license=('GPL' 'LGPL' 'custom') +license=('GPL' 'GPL3' 'LGPL' 'custom') # Licensing issues: # The plugins 'scrobbler', stereoplugin', 'wavepack' and 'plugin_echo' have no license notice @@ -27,7 +27,7 @@ conflicts=("${pkgname%-libre}") makedepends=("audacious>=${pkgver}" 'oss' 'alsa-lib' 'pulseaudio' 'jack2' 'lame' 'libvorbis' 'flac' - 'mpg123' 'faad2' 'ffmpeg' 'fluidsynth' 'libcdio' 'libsidplay' 'wavpack' + 'mpg123' 'faad2' 'ffmpeg' 'libmodplug' 'fluidsynth' 'libcdio' 'libsidplay' 'wavpack' 'libnotify' 'lirc-utils' 'curl' 'libmtp' 'neon' 'libmms' 'libcue') @@ -42,6 +42,7 @@ optdepends=('oss: Open Sound System v4 output' 'mpg123: MP3 input' 'faad2: AAC input' 'ffmpeg: ffaudio input' + 'libmodplug: modplug input' 'fluidsynth: MIDI FluidSynth backend input' 'libcdio: CD Digital Audio input' 'libsidplay: Commodore 64 audio input' @@ -56,11 +57,10 @@ optdepends=('oss: Open Sound System v4 output' 'libmms: libmms-based mms transport' 'libcue: CUE playlist format') -# Temporary source location -source=("http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.gz") -sha1sums=('eaf3fa55987ed60d1c99983453d2b89a30087b7e') +source=("http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.xz") +sha1sums=('d5f2ef19cda220d6fa7dd26c514c5c22c8dd7b42') -# Retrieve upstream & remove plugins 'psf' & 'usf' due to unfree license. Repackage as -libre +# Retrieve upstream & remove plugins 'psf' & 'usf' due to issues mentioned above. Repackage as -libre mksource(){ [ -f ${pkgname%-libre}-$pkgver.tar.gz ] || wget http://distfiles.atheme.org/${pkgname%-libre}-$pkgver.tar.gz tar xzf ${pkgname%-libre}-${pkgver}.tar.gz @@ -69,9 +69,9 @@ mksource(){ sed -i s/enable_psf=yes/enable_psf=no/ ${pkgname%-libre}-$pkgver/configure mv -v ${pkgname%-libre}-$pkgver ${pkgname}-$pkgver - tar czf ${pkgname}-${pkgver}.tar.gz ${pkgname}-${pkgver}/ + tar cJf ${pkgname}-${pkgver}.tar.xz ${pkgname}-${pkgver}/ rm -rf ${pkgname}-${pkgver} - echo "${pkgname}-${pkgver}.tar.gz is your new -libre source package." + echo "${pkgname}-${pkgver}.tar.xz is your new -libre source package." } @@ -90,10 +90,8 @@ build() { head -n 17 compressor/compressor.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.compressor head -n 17 crossfade/crossfade.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.crossfade head -n 18 crystalizer/crystalizer.c | cut -c 4- | tail -n 17 > ${tmpdir}/LICENSE.crystalizer - head -n 17 daemon/daemon.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.daemon head -n 22 dockalbumart/dockalbumart.c | cut -c 4- | tail -n 21 > ${tmpdir}/LICENSE.dockalbumart head -n 18 lyricwiki/lyricwiki.c | cut -c 4- | tail -n 17 > ${tmpdir}/LICENSE.lyricwiki - head -n 17 mixdown/mixdown.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.mixdown head -n 19 mpg123/mpg123.c | cut -c 4- | tail -n 18 > ${tmpdir}/LICENSE.mpg123 head -n 17 openal/openal.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.openal head -n 17 resample/resample.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.resample @@ -111,10 +109,8 @@ build() { install -m644 LICENSE.compressor $l install -m644 LICENSE.crossfade $l install -m644 LICENSE.crystalizer $l - install -m644 LICENSE.daemon $l install -m644 LICENSE.dockalbumart $l install -m644 LICENSE.lyricwiki $l - install -m644 LICENSE.mixdown $l install -m644 LICENSE.mpg123 $l install -m644 LICENSE.openal $l install -m644 LICENSE.resample $l @@ -123,8 +119,11 @@ build() { install -m644 LICENSE.voice_removal $l install -m644 LICENSE.xfs $l popd - [[ ${CARCH} == x86_64 ]] && _extraopts='' || _extraopts='--disable-sse2' - ./configure --prefix=/usr ${_extraopts} + + ./configure --prefix=/usr \ + --enable-amidiplug \ + --disable-adplug + make } diff --git a/libre/mplayer-libre/PKGBUILD b/libre/mplayer-libre/PKGBUILD index 8798778d5..d5f6be604 100644 --- a/libre/mplayer-libre/PKGBUILD +++ b/libre/mplayer-libre/PKGBUILD @@ -5,7 +5,7 @@ _pkgbase=mplayer pkgbase=mplayer-libre pkgname=('mplayer-libre' 'mencoder-libre') -pkgver=34174 +pkgver=34344 pkgrel=1 arch=('i686' 'x86_64') makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'cdparanoia' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient' @@ -18,9 +18,9 @@ makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'cdparanoia' 'libxinerama' 'sdl 'libpulse' 'fribidi' 'unzip' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass') license=('GPL') url="http://www.mplayerhq.hu/" -options=(!buildflags !emptydirs !distcc) +options=(!buildflags !emptydirs) source=(ftp://ftp.archlinux.org/other/${_pkgbase}/${_pkgbase}-${pkgver}.tar.xz mplayer.desktop) -md5sums=('73225e0be6c5db51d7cbf2a0dd1d25a2' +md5sums=('e4016248418b8f9d55b540d68b6cfee2' 'c0d6ef795cf6de48e3b87ff7c23f0319') build() { @@ -39,6 +39,7 @@ build() { --disable-mga \ --disable-ass-internal \ --enable-xvmc \ + --enable-radio \ --language=all \ --confdir=/etc/mplayer [ "$CARCH" = "i686" ] && sed 's|-march=i486|-march=i686|g' -i config.mak diff --git a/libre/texlive-bin-libre/PKGBUILD b/libre/texlive-bin-libre/PKGBUILD index 55cf77538..dd1c32a40 100644 --- a/libre/texlive-bin-libre/PKGBUILD +++ b/libre/texlive-bin-libre/PKGBUILD @@ -5,11 +5,11 @@ pkgname=texlive-bin-libre pkgver=2011.1 _luatex_ver=0.70.1 -pkgrel=3 +pkgrel=4 pkgdesc="TeX Live binaries" license=('GPL') arch=('i686' 'x86_64' 'mips64el') -depends=('t1lib' 'gd' 'libgraphite' 'poppler>=0.18' 'libsigsegv' 'zziplib') +depends=('t1lib' 'gd' 'libgraphite' 'poppler>=0.18.1' 'libsigsegv' 'zziplib') makedepends=('perl' 'clisp' 'ffcall' 'pkg-config') optdepends=('ed: for texconfig') provides=('lcdf-typetools' 'kpathsea' 'xindy' 'pdfjam' 'texlive-bin') @@ -22,10 +22,10 @@ source=('texmf.cnf' 'fix-fontforge-encoding.patch' '09-texlive-fonts.conf' 'archlinux-build.patch' - 'ftp://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-source-20110724.tar.xz' - 'ftp://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-texmf-20110724.tar.xz' + 'http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-source-20110724.tar.xz' + 'http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-texmf-20110724.tar.xz' # "http://foundry.supelec.fr/gf/download/frsrelease/392/1730/luatex-beta-${_luatex_ver}.tar.bz2" - 'ftp://ftp.archlinux.org/other/texlive/luatex-svn4356.tar.xz' + 'http://ftp.archlinux.org/other/texlive/luatex-svn4356.tar.xz' ) backup=(etc/texmf/web2c/texmf.cnf \ etc/texmf/chktex/chktexrc \ diff --git a/libre/ununrar/PKGBUILD b/libre/ununrar/PKGBUILD new file mode 100644 index 000000000..050cfb484 --- /dev/null +++ b/libre/ununrar/PKGBUILD @@ -0,0 +1,22 @@ +# Maintainer: Michał Masłowski <mtjm@mtjm.eu> + +pkgname=ununrar +pkgver=0.0a0dev20110715 +pkgrel=1 +pkgdesc="An unrar-compatible interface to Unarchiver" +arch=('any') +url="http://hg.mtjm.eu/ununrar/" +license=('AGPL') +depends=('python2' 'python2-distribute' 'unarchiver') +provides=('unrar' 'unrar-libre') +conflicts=('unrar' 'unrar-libre') +options=(!emptydirs) +source=("http://mtjm.eu/releases/Ununrar-${pkgver}.tar.gz") +sha512sums=('ea2a6805c16be3aad81b18e5e9e044d73ca2f8f87ce078c35e64cdffb12d5f0e4c96e66901af54f388349edbb88c6252ed0e0329e9813cce5e7b9b480802cf44') + +package() { + cd "$srcdir/Ununrar-$pkgver" + python2 setup.py install --root=$pkgdir/ --optimize=1 +} + +# vim:set ts=2 sw=2 et: diff --git a/social/tinc/PKGBUILD b/social/tinc/PKGBUILD index d91909319..87d3415e9 100644 --- a/social/tinc/PKGBUILD +++ b/social/tinc/PKGBUILD @@ -1,14 +1,18 @@ pkgname=tinc pkgver=1.0.16 -pkgrel=2 +pkgrel=3 pkgdesc="VPN (Virtual Private Network) daemon" arch=(i686 x86_64 mips64el) url="http://www.tinc-vpn.org/" license=('GPL') depends=('lzo2' 'zlib' 'openssl') +backup=(etc/conf.d/tincd.conf) source=(http://www.tinc-vpn.org/packages/tinc-$pkgver.tar.gz tincd.conf tincd.rcd) +md5sums=('f1c7ed94878725fb2cf4efb02bf160da' + 'd4a42b4a474448c64dc8f5100480f569' + '89a91a80c1dee4b365958bd9e6242d5a') build() { cd "$srcdir/$pkgname-$pkgver" @@ -27,6 +31,3 @@ package() { install -Dm755 $srcdir/tincd.rcd $pkgdir/etc/rc.d/tincd install -Dm755 $srcdir/tincd.conf $pkgdir/etc/conf.d/tincd.conf } -md5sums=('f1c7ed94878725fb2cf4efb02bf160da' - 'b1b0c4a37c007aa8703128269ea9a3e8' - '89a91a80c1dee4b365958bd9e6242d5a') diff --git a/social/tinc/tincd.conf b/social/tinc/tincd.conf index 3b8a867be..e86139b44 100644 --- a/social/tinc/tincd.conf +++ b/social/tinc/tincd.conf @@ -1,2 +1,2 @@ NETNAME=yournetname -OPTIONS="-R -U nobody" +OPTIONS="-R -U nobody -L" diff --git a/staging/gdbm/PKGBUILD b/staging/gdbm/PKGBUILD new file mode 100644 index 000000000..f803182bc --- /dev/null +++ b/staging/gdbm/PKGBUILD @@ -0,0 +1,57 @@ +# $Id: PKGBUILD 142942 2011-11-19 00:37:18Z stephane $ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +# Contributor: Allan McRae <allan@archlinux.org> +# Contributor: judd <jvinet@zeroflux.org> + +pkgname=gdbm +pkgver=1.10 +pkgrel=1 +pkgdesc="GNU database library" +url="http://www.gnu.org/software/gdbm/gdbm.html" +license=('GPL') +arch=('i686' 'x86_64') +depends=('glibc' 'sh') +source=(ftp://ftp.gnu.org/gnu/gdbm/${pkgname}-${pkgver}.tar.gz + gdbm-1.10-zeroheaders.patch) +options=('!libtool' '!makeflags') +install=gdbm.install +md5sums=('88770493c2559dc80b561293e39d3570' + 'ac255b10452005237836cd2d3a470733') +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # Prevent gdbm from storing uninitialized memory content + # to database files. This patch improves security, as the + # uninitialized memory might contain sensitive informations + # from other applications. + # https://bugzilla.redhat.com/show_bug.cgi?id=4457 + # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=208927 + patch -Np1 -i ../gdbm-1.10-zeroheaders.patch + + ./configure --prefix=/usr \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --enable-libgdbm-compat + + make prefix=/usr +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make prefix="${pkgdir}"/usr \ + manprefix="${pkgdir}"/usr/share/man \ + man3dir="${pkgdir}"/usr/share/man/man3 \ + infodir="${pkgdir}"/usr/share/info \ + install + + # create symlinks for compatibility + install -dm755 "${pkgdir}"/usr/include/gdbm + ln -sf ../gdbm.h "${pkgdir}"/usr/include/gdbm/gdbm.h + ln -sf ../ndbm.h "${pkgdir}"/usr/include/gdbm/ndbm.h + ln -sf ../dbm.h "${pkgdir}"/usr/include/gdbm/dbm.h +} diff --git a/staging/gdbm/gdbm-1.10-zeroheaders.patch b/staging/gdbm/gdbm-1.10-zeroheaders.patch new file mode 100644 index 000000000..a268f6bdf --- /dev/null +++ b/staging/gdbm/gdbm-1.10-zeroheaders.patch @@ -0,0 +1,33 @@ +diff -up gdbm-1.10/src/falloc.c.zeroheaders gdbm-1.10/src/falloc.c +--- gdbm-1.10/src/falloc.c.zeroheaders 2011-11-11 11:59:11.000000000 +0100 ++++ gdbm-1.10/src/falloc.c 2011-11-14 17:34:32.487604027 +0100 +@@ -255,7 +255,7 @@ push_avail_block (GDBM_FILE dbf) + + + /* Split the header block. */ +- temp = (avail_block *) malloc (av_size); ++ temp = (avail_block *) calloc (1, av_size); + if (temp == NULL) _gdbm_fatal (dbf, _("malloc error")); + /* Set the size to be correct AFTER the pop_avail_block. */ + temp->size = dbf->header->avail.size; +diff -up gdbm-1.10/src/gdbmopen.c.zeroheaders gdbm-1.10/src/gdbmopen.c +--- gdbm-1.10/src/gdbmopen.c.zeroheaders 2011-11-11 19:39:42.000000000 +0100 ++++ gdbm-1.10/src/gdbmopen.c 2011-11-14 17:33:24.867608650 +0100 +@@ -264,7 +264,7 @@ gdbm_open (const char *file, int block_s + (dbf->header->block_size - sizeof (hash_bucket)) + / sizeof (bucket_element) + 1; + dbf->header->bucket_size = dbf->header->block_size; +- dbf->bucket = (hash_bucket *) malloc (dbf->header->bucket_size); ++ dbf->bucket = (hash_bucket *) calloc (1, dbf->header->bucket_size); + if (dbf->bucket == NULL) + { + gdbm_close (dbf); +@@ -456,7 +456,7 @@ _gdbm_init_cache(GDBM_FILE dbf, size_t s + for(index = 0; index < size; index++) + { + (dbf->bucket_cache[index]).ca_bucket +- = (hash_bucket *) malloc (dbf->header->bucket_size); ++ = (hash_bucket *) calloc (1, dbf->header->bucket_size); + if ((dbf->bucket_cache[index]).ca_bucket == NULL) + { + gdbm_errno = GDBM_MALLOC_ERROR; diff --git a/staging/gdbm/gdbm.install b/staging/gdbm/gdbm.install new file mode 100644 index 000000000..2d1ce2c5a --- /dev/null +++ b/staging/gdbm/gdbm.install @@ -0,0 +1,21 @@ +infodir=/usr/share/info +filelist=(gdbm.info) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + usr/bin/install-info $infodir/$file $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 + usr/bin/install-info --delete $infodir/$file $infodir/dir 2> /dev/null + done +} + diff --git a/staging/lighttpd/PKGBUILD b/staging/lighttpd/PKGBUILD new file mode 100644 index 000000000..0608d34ce --- /dev/null +++ b/staging/lighttpd/PKGBUILD @@ -0,0 +1,67 @@ +# $Id: PKGBUILD 142958 2011-11-19 06:20:53Z pierre $ +# Maintainer: Pierre Schmitz <pierre@archlinux.de> + +pkgname=lighttpd +pkgver=1.4.29 +pkgrel=3 +pkgdesc='a secure, fast, compliant and very flexible web-server' +license=('custom') +arch=('i686' 'x86_64') +url="http://www.lighttpd.net/" +depends=('pcre' 'bzip2' 'libldap' 'util-linux') +makedepends=('fcgi' 'libmysqlclient' 'lua' 'libxml2' 'e2fsprogs' 'sqlite3' 'gdbm' 'pkgconfig') +optdepends=('libxml2: mod_webdav' + 'lua: mod_cml/mod_magnet' + 'libmysqlclient: mod_mysql_vhost' + 'sqlite3: mod_webdav') +backup=('etc/lighttpd/lighttpd.conf' 'etc/logrotate.d/lighttpd') +options=('!libtool' 'emptydirs') +source=("http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.bz2" + "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.bz2.asc" + 'lighttpd.rc.d' 'lighttpd.logrotate.d' 'lighttpd.conf') +md5sums=('e6e67b09986cb504db630b5a86b2dd76' + 'de2afb4ed6a088fd7fa5f13c387a08f0' + '268386e71f5748dc1d887b9a0ab65589' + '913e2157fa78d990c32146f387d44c2b' + 'acdaa94299e6299cb5085e6d88babeca') + +build() { + cd $srcdir/$pkgname-$pkgver + + ./configure --prefix=/usr \ + --libexecdir=/usr/lib/lighttpd/modules \ + --sysconfdir=/etc/lighttpd \ + --with-mysql \ + --with-ldap \ + --with-attr \ + --with-openssl \ + --with-kerberos5 \ + --without-fam \ + --with-webdav-props \ + --with-webdav-locks \ + --with-gdbm \ + --with-memcache \ + --with-lua + make +} + +check() { + cd $srcdir/$pkgname-$pkgver + make check +} + +package() { + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install + + install -D -m755 $srcdir/lighttpd.rc.d $pkgdir/etc/rc.d/lighttpd + install -D -m644 $srcdir/lighttpd.logrotate.d $pkgdir/etc/logrotate.d/lighttpd + install -D -m644 $srcdir/lighttpd.conf $pkgdir/etc/lighttpd/lighttpd.conf + install -d -m755 -o http -g http $pkgdir/var/{log,cache}/lighttpd/ + + pushd doc/config >/dev/null + find . -type f ! -name 'Makefile*' -exec install -D -m644 {} ${pkgdir}/usr/share/doc/lighttpd/config/{} \; + popd >/dev/null + + install -D -m644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING +} diff --git a/staging/lighttpd/lighttpd.conf b/staging/lighttpd/lighttpd.conf new file mode 100644 index 000000000..4ca1b23a4 --- /dev/null +++ b/staging/lighttpd/lighttpd.conf @@ -0,0 +1,12 @@ +# This is a minimal example config +# See /usr/share/doc/lighttpd +# and http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ConfigurationOptions + +server.port = 80 +server.username = "http" +server.groupname = "http" +server.document-root = "/srv/http" +server.errorlog = "/var/log/lighttpd/error.log" +dir-listing.activate = "enable" +index-file.names = ( "index.html" ) +mimetype.assign = ( ".html" => "text/html", ".txt" => "text/plain", ".jpg" => "image/jpeg", ".png" => "image/png" ) diff --git a/staging/lighttpd/lighttpd.logrotate.d b/staging/lighttpd/lighttpd.logrotate.d new file mode 100644 index 000000000..5ff32a0c5 --- /dev/null +++ b/staging/lighttpd/lighttpd.logrotate.d @@ -0,0 +1,6 @@ +/var/log/lighttpd/*log { + missingok + postrotate + /etc/rc.d/lighttpd reload >/dev/null || true + endscript +} diff --git a/staging/lighttpd/lighttpd.rc.d b/staging/lighttpd/lighttpd.rc.d new file mode 100644 index 000000000..88f0a1474 --- /dev/null +++ b/staging/lighttpd/lighttpd.rc.d @@ -0,0 +1,132 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + + +pid_file='/var/run/lighttpd/lighttpd-angel.pid' + +get_pid() { + if [ -r "${pid_file}" ]; then + cat "${pid_file}" + else + pgrep -f /usr/sbin/lighttpd-angel + fi +} + +test_config() { + stat_busy 'Checking configuration' + if [ $(id -u) -ne 0 ]; then + stat_append '(This script must be run as root)' + stat_die + fi + + if [ ! -r /etc/lighttpd/lighttpd.conf ]; then + stat_append '(/etc/lighttpd/lighttpd.conf not found)' + stat_die + fi + + /usr/sbin/lighttpd -t -f /etc/lighttpd/lighttpd.conf >/dev/null 2>&1 + if [ $? -gt 0 ]; then + stat_append '(error in /etc/lighttpd/lighttpd.conf)' + stat_die + fi + + local piddir=$(dirname "${pid_file}") + if [ ! -d "${piddir}" ]; then + install -d -m755 -o http -g http "${piddir}" + fi + + stat_done +} + +start() { + stat_busy 'Starting lighttpd' + + local PID=$(get_pid) + if [ -z "$PID" ]; then + nohup /usr/sbin/lighttpd-angel -D -f /etc/lighttpd/lighttpd.conf >>/var/log/lighttpd/lighttpd-angel.log 2>&1 & + if [ $? -gt 0 ]; then + stat_die + else + echo $! > "${pid_file}" + add_daemon lighttpd + stat_done + fi + else + stat_die + fi +} + +stop() { + stat_busy 'Stopping lighttpd' + local PID=$(get_pid) + [ -n "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + [ -f "${pid_file}" ] && rm -f "${pid_file}" + rm_daemon lighttpd + stat_done + fi +} + +gracefull-stop() { + stat_busy 'Stopping lighttpd gracefully' + local PID=$(get_pid) + [ -n "$PID" ] && kill -INT $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + [ -f "${pid_file}" ] && rm -f "${pid_file}" + rm_daemon lighttpd + stat_done + fi +} + +reload() { + stat_busy 'Reloading lighttpd' + local PID=$(get_pid) + [ -n "$PID" ] && kill -HUP $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_die + else + stat_done + fi +} + + +case "$1" in + start) + test_config + start + ;; + stop) + test_config + stop + ;; + gracefull-stop) + test_config + stop + ;; + reload) + test_config + reload + ;; + restart) + test_config + stop + while [ -n "$(get_pid)" ]; do + sleep 1 + done + start + ;; + status) + stat_busy 'Checking lighttpd status' + ck_status lighttpd + ;; + *) + echo "usage: $0 {start|stop|gracefull-stop|reload|restart|status}" +esac + +exit 0 diff --git a/staging/mutt/PKGBUILD b/staging/mutt/PKGBUILD new file mode 100644 index 000000000..27f213111 --- /dev/null +++ b/staging/mutt/PKGBUILD @@ -0,0 +1,48 @@ +# $Id: PKGBUILD 142948 2011-11-19 03:29:27Z bisson $ +# Contributor: tobias [tobias [at] archlinux.org] +# Maintainer: Gaetan Bisson <bisson@archlinux.org> + +pkgname=mutt +pkgver=1.5.21 +pkgrel=6 +pkgdesc='Small but very powerful text-based mail client' +url='http://www.mutt.org/' +license=('GPL') +backup=('etc/Muttrc') +arch=('i686' 'x86_64') +optdepends=('smtp-forwarder: to send mail') +depends=('gpgme' 'ncurses' 'openssl' 'libsasl' 'gdbm' 'libidn' 'mime-types' 'krb5') +source=("ftp://ftp.mutt.org/mutt/devel/${pkgname}-${pkgver}.tar.gz") +sha1sums=('a8475f2618ce5d5d33bff85c0affdf21ab1d76b9') + +install=install + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --enable-gpgme \ + --enable-pop \ + --enable-imap \ + --enable-smtp \ + --enable-hcache \ + --with-curses=/usr \ + --with-regex \ + --with-gss=/usr \ + --with-ssl=/usr \ + --with-sasl \ + --with-idn \ + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + rm "${pkgdir}"/usr/bin/{flea,muttbug} + rm "${pkgdir}"/usr/share/man/man1/{flea,muttbug}.1 + rm "${pkgdir}"/etc/mime.types{,.dist} + install -Dm644 contrib/gpg.rc "${pkgdir}"/etc/Muttrc.gpg.dist +} diff --git a/staging/mutt/install b/staging/mutt/install new file mode 100644 index 000000000..d65675c06 --- /dev/null +++ b/staging/mutt/install @@ -0,0 +1,8 @@ +post_install() { + cat <<EOF + +==> For GPG support, add the following to your muttrc: +==> source /etc/Muttrc.gpg.dist + +EOF +} diff --git a/staging/php/PKGBUILD b/staging/php/PKGBUILD new file mode 100644 index 000000000..732d0d577 --- /dev/null +++ b/staging/php/PKGBUILD @@ -0,0 +1,365 @@ +# $Id: PKGBUILD 142956 2011-11-19 06:17:19Z pierre $ +# Maintainer: Pierre Schmitz <pierre@archlinux.de> + +pkgbase=php +pkgname=('php' + 'php-cgi' + 'php-apache' + 'php-fpm' + 'php-embed' + 'php-pear' + 'php-enchant' + 'php-gd' + 'php-intl' + 'php-ldap' + 'php-mcrypt' + 'php-mssql' + 'php-odbc' + 'php-pgsql' + 'php-pspell' + 'php-snmp' + 'php-sqlite' + 'php-tidy' + 'php-xsl') +pkgver=5.3.8 +_suhosinver=5.3.7-0.9.10 +pkgrel=5 +arch=('i686' 'x86_64') +license=('PHP') +url='http://www.php.net' +makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix' + 'sqlite3' 'unixodbc' 'net-snmp' 'libzip' 'enchant' 'file' 'freetds' + 'libmcrypt' 'tidyhtml' 'aspell' 'libltdl' 'libpng' 'libjpeg' 'icu' + 'curl' 'libxslt' 'openssl' 'bzip2' 'db' 'gmp' 'freetype2') +source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2" + "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz" + "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz.sig" + 'php.ini.patch' 'apache.conf' 'rc.d.php-fpm' 'php-fpm.conf.in.patch' + 'logrotate.d.php-fpm') +md5sums=('704cd414a0565d905e1074ffdc1fadfb' + '08582e502fed8221c6577042ca45ddb8' + '5bf4473f658404aa9a97bf026ecef8e9' + '65606c606df97a0760dfe5aaf9893afc' + 'dec2cbaad64e3abf4f0ec70e1de4e8e9' + 'b01be5f816988fcee7e78225836e5e27' + '09005dabd90c48ddd392b3dbf05f8a82' + '07c4e412909ac65a44ec90e7a2c4bade') + +build() { + phpconfig="--srcdir=../${pkgbase}-${pkgver} \ + --prefix=/usr \ + --sysconfdir=/etc/php \ + --localstatedir=/var \ + --with-layout=GNU \ + --with-config-file-path=/etc/php \ + --with-config-file-scan-dir=/etc/php/conf.d \ + --enable-inline-optimization \ + --disable-debug \ + --disable-rpath \ + --disable-static \ + --enable-shared \ + --mandir=/usr/share/man \ + --without-pear \ + " + + phpextensions="--enable-bcmath=shared \ + --enable-calendar=shared \ + --enable-dba=shared \ + --enable-exif=shared \ + --enable-ftp=shared \ + --enable-gd-native-ttf \ + --enable-intl=shared \ + --enable-json=shared \ + --enable-mbregex \ + --enable-mbstring \ + --enable-pdo \ + --enable-phar=shared \ + --enable-posix=shared \ + --enable-session \ + --enable-shmop=shared \ + --enable-soap=shared \ + --enable-sockets=shared \ + --enable-sqlite-utf8 \ + --enable-sysvmsg=shared \ + --enable-sysvsem=shared \ + --enable-sysvshm=shared \ + --enable-xml \ + --enable-zip=shared \ + --with-bz2=shared \ + --with-curl=shared \ + --with-db4=/usr \ + --with-enchant=shared,/usr \ + --with-freetype-dir=shared,/usr \ + --with-gd=shared \ + --with-gdbm=shared \ + --with-gettext=shared \ + --with-gmp=shared \ + --with-iconv=shared \ + --with-icu-dir=/usr \ + --with-imap-ssl=shared \ + --with-imap=shared \ + --with-jpeg-dir=shared,/usr \ + --with-ldap=shared \ + --with-ldap-sasl \ + --with-mcrypt=shared \ + --with-mhash \ + --with-mssql=shared \ + --with-mysql-sock=/var/run/mysqld/mysqld.sock \ + --with-mysql=shared,mysqlnd \ + --with-mysqli=shared,mysqlnd \ + --with-openssl=shared \ + --with-pcre-regex=/usr \ + --with-pdo-mysql=shared,mysqlnd \ + --with-pdo-odbc=shared,unixODBC,/usr \ + --with-pdo-pgsql=shared \ + --with-pdo-sqlite=shared,/usr \ + --with-pgsql=shared \ + --with-png-dir=shared,/usr \ + --with-pspell=shared \ + --with-regex=php \ + --with-snmp=shared \ + --with-sqlite3=shared,/usr \ + --with-sqlite=shared \ + --with-tidy=shared \ + --with-unixODBC=shared,/usr \ + --with-xmlrpc=shared \ + --with-xsl=shared \ + --with-zlib \ + --without-db2 \ + --without-db3 \ + " + + EXTENSION_DIR=/usr/lib/php/modules + export EXTENSION_DIR + PEAR_INSTALLDIR=/usr/share/pear + export PEAR_INSTALLDIR + + cd ${srcdir}/${pkgbase}-${pkgver} + + # apply suhosin patch + patch -p1 -i ${srcdir}/suhosin-patch-${_suhosinver}.patch + + # adjust paths + patch -p0 -i ${srcdir}/php.ini.patch + patch -p0 -i ${srcdir}/php-fpm.conf.in.patch + + # php + mkdir ${srcdir}/build-php + cd ${srcdir}/build-php + ln -s ../${pkgbase}-${pkgver}/configure + ./configure ${phpconfig} \ + --disable-cgi \ + --with-readline \ + --enable-pcntl \ + ${phpextensions} + make + + # cgi and fcgi + # reuse the previous run; this will save us a lot of time + cp -a ${srcdir}/build-php ${srcdir}/build-cgi + cd ${srcdir}/build-cgi + ./configure ${phpconfig} \ + --disable-cli \ + --enable-cgi \ + ${phpextensions} + make + + # apache + cp -a ${srcdir}/build-php ${srcdir}/build-apache + cd ${srcdir}/build-apache + ./configure ${phpconfig} \ + --disable-cli \ + --with-apxs2 \ + ${phpextensions} + make + + # fpm + cp -a ${srcdir}/build-php ${srcdir}/build-fpm + cd ${srcdir}/build-fpm + ./configure ${phpconfig} \ + --disable-cli \ + --enable-fpm \ + --with-fpm-user=http \ + --with-fpm-group=http \ + ${phpextensions} + make + + # embed + cp -a ${srcdir}/build-php ${srcdir}/build-embed + cd ${srcdir}/build-embed + ./configure ${phpconfig} \ + --disable-cli \ + --enable-embed=shared \ + ${phpextensions} + make + + # pear + cp -a ${srcdir}/build-php ${srcdir}/build-pear + cd ${srcdir}/build-pear + ./configure ${phpconfig} \ + --disable-cgi \ + --with-readline \ + --enable-pcntl \ + --with-pear \ + ${phpextensions} + make +} + +# check() { +# cd ${srcdir}/build-php +# make test +# } + +package_php() { + pkgdesc='An HTML-embedded scripting language' + depends=('pcre' 'libxml2' 'bzip2' 'curl') + replaces=('php-fileinfo' 'php-gmp' 'php-curl') + provides=('php-fileinfo' 'php-gmp' 'php-curl') + conflicts=('php-fileinfo' 'php-gmp' 'php-curl') + backup=('etc/php/php.ini') + + cd ${srcdir}/build-php + make -j1 INSTALL_ROOT=${pkgdir} install + install -d -m755 ${pkgdir}/usr/share/pear + # install php.ini + install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/php.ini-production ${pkgdir}/etc/php/php.ini + install -d -m755 ${pkgdir}/etc/php/conf.d/ + + # remove static modules + rm -f ${pkgdir}/usr/lib/php/modules/*.a + # remove modules provided by sub packages + rm -f ${pkgdir}/usr/lib/php/modules/{enchant,gd,intl,ldap,mcrypt,mssql,odbc,pdo_odbc,pgsql,pdo_pgsql,pspell,snmp,sqlite3,pdo_sqlite,tidy,xsl}.so + # remove empty directory + rmdir ${pkgdir}/usr/include/php/include +} + +package_php-cgi() { + pkgdesc='CGI and FCGI SAPI for PHP' + depends=('php') + + install -D -m755 ${srcdir}/build-cgi/sapi/cgi/php-cgi ${pkgdir}/usr/bin/php-cgi +} + +package_php-apache() { + pkgdesc='Apache SAPI for PHP' + depends=('php' 'apache') + backup=('etc/httpd/conf/extra/php5_module.conf') + + install -D -m755 ${srcdir}/build-apache/libs/libphp5.so ${pkgdir}/usr/lib/httpd/modules/libphp5.so + install -D -m644 ${srcdir}/apache.conf ${pkgdir}/etc/httpd/conf/extra/php5_module.conf +} + +package_php-fpm() { + pkgdesc='FastCGI Process Manager for PHP' + depends=('php') + backup=('etc/php/php-fpm.conf') + + install -D -m755 ${srcdir}/build-fpm/sapi/fpm/php-fpm ${pkgdir}/usr/sbin/php-fpm + install -D -m644 ${srcdir}/build-fpm/sapi/fpm/php-fpm.8 ${pkgdir}/usr/share/man/man8/php-fpm.8 + install -D -m644 ${srcdir}/build-fpm/sapi/fpm/php-fpm.conf ${pkgdir}/etc/php/php-fpm.conf + install -D -m755 ${srcdir}/rc.d.php-fpm ${pkgdir}/etc/rc.d/php-fpm + install -D -m644 ${srcdir}/logrotate.d.php-fpm ${pkgdir}/etc/logrotate.d/php-fpm + install -d -m755 ${pkgdir}/etc/php/fpm.d +} + +package_php-embed() { + pkgdesc='Embed SAPI for PHP' + depends=('php') + + install -D -m755 ${srcdir}/build-embed/libs/libphp5.so ${pkgdir}/usr/lib/libphp5.so + install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/sapi/embed/php_embed.h ${pkgdir}/usr/include/php/sapi/embed/php_embed.h +} + +package_php-pear() { + pkgdesc='PHP Extension and Application Repository' + depends=('php') + backup=('etc/php/pear.conf') + + cd ${srcdir}/build-pear + make -j1 install-pear INSTALL_ROOT=${pkgdir} + local i + while read i; do + [ ! -e "$i" ] || rm -rf "$i" + done < <(find ${pkgdir} -name '.*') +} + +package_php-enchant() { + depends=('php' 'enchant') + pkgdesc='enchant module for PHP' + install -D -m755 ${srcdir}/build-php/modules/enchant.so ${pkgdir}/usr/lib/php/modules/enchant.so +} + +package_php-gd() { + depends=('php' 'libpng' 'libjpeg' 'freetype2') + pkgdesc='gd module for PHP' + install -D -m755 ${srcdir}/build-php/modules/gd.so ${pkgdir}/usr/lib/php/modules/gd.so +} + +package_php-intl() { + depends=('php' 'icu') + pkgdesc='intl module for PHP' + install -D -m755 ${srcdir}/build-php/modules/intl.so ${pkgdir}/usr/lib/php/modules/intl.so +} + +package_php-ldap() { + depends=('php' 'libldap') + pkgdesc='ldap module for PHP' + install -D -m755 ${srcdir}/build-php/modules/ldap.so ${pkgdir}/usr/lib/php/modules/ldap.so +} + +package_php-mcrypt() { + depends=('php' 'libmcrypt' 'libltdl') + pkgdesc='mcrypt module for PHP' + install -D -m755 ${srcdir}/build-php/modules/mcrypt.so ${pkgdir}/usr/lib/php/modules/mcrypt.so +} + +package_php-mssql() { + depends=('php' 'freetds') + pkgdesc='mssql module for PHP' + install -D -m755 ${srcdir}/build-php/modules/mssql.so ${pkgdir}/usr/lib/php/modules/mssql.so +} + +package_php-odbc() { + depends=('php' 'unixodbc') + pkgdesc='ODBC modules for PHP' + install -D -m755 ${srcdir}/build-php/modules/odbc.so ${pkgdir}/usr/lib/php/modules/odbc.so + install -D -m755 ${srcdir}/build-php/modules/pdo_odbc.so ${pkgdir}/usr/lib/php/modules/pdo_odbc.so +} + +package_php-pgsql() { + depends=('php' 'postgresql-libs') + pkgdesc='PostgreSQL modules for PHP' + install -D -m755 ${srcdir}/build-php/modules/pgsql.so ${pkgdir}/usr/lib/php/modules/pgsql.so + install -D -m755 ${srcdir}/build-php/modules/pdo_pgsql.so ${pkgdir}/usr/lib/php/modules/pdo_pgsql.so +} + +package_php-pspell() { + depends=('php' 'aspell') + pkgdesc='pspell module for PHP' + install -D -m755 ${srcdir}/build-php/modules/pspell.so ${pkgdir}/usr/lib/php/modules/pspell.so +} + +package_php-snmp() { + depends=('php' 'net-snmp') + pkgdesc='snmp module for PHP' + install -D -m755 ${srcdir}/build-php/modules/snmp.so ${pkgdir}/usr/lib/php/modules/snmp.so +} + +package_php-sqlite() { + depends=('php' 'sqlite3') + pkgdesc='sqlite3 module for PHP' + install -D -m755 ${srcdir}/build-php/modules/sqlite3.so ${pkgdir}/usr/lib/php/modules/sqlite3.so + install -D -m755 ${srcdir}/build-php/modules/pdo_sqlite.so ${pkgdir}/usr/lib/php/modules/pdo_sqlite.so +} + +package_php-tidy() { + depends=('php' 'tidyhtml') + pkgdesc='tidy module for PHP' + install -D -m755 ${srcdir}/build-php/modules/tidy.so ${pkgdir}/usr/lib/php/modules/tidy.so +} + +package_php-xsl() { + depends=('php' 'libxslt') + pkgdesc='xsl module for PHP' + install -D -m755 ${srcdir}/build-php/modules/xsl.so ${pkgdir}/usr/lib/php/modules/xsl.so +} diff --git a/staging/php/apache.conf b/staging/php/apache.conf new file mode 100644 index 000000000..c3ca0aad5 --- /dev/null +++ b/staging/php/apache.conf @@ -0,0 +1,13 @@ +# Required modules: dir_module, php5_module + +<IfModule dir_module> + <IfModule php5_module> + DirectoryIndex index.php index.html + <FilesMatch "\.php$"> + SetHandler application/x-httpd-php + </FilesMatch> + <FilesMatch "\.phps$"> + SetHandler application/x-httpd-php-source + </FilesMatch> + </IfModule> +</IfModule> diff --git a/staging/php/logrotate.d.php-fpm b/staging/php/logrotate.d.php-fpm new file mode 100644 index 000000000..7a1ba2597 --- /dev/null +++ b/staging/php/logrotate.d.php-fpm @@ -0,0 +1,6 @@ +/var/log/php-fpm.log { + missingok + postrotate + /etc/rc.d/php-fpm logrotate >/dev/null || true + endscript +} diff --git a/staging/php/php-fpm.conf.in.patch b/staging/php/php-fpm.conf.in.patch new file mode 100644 index 000000000..b4dd32f96 --- /dev/null +++ b/staging/php/php-fpm.conf.in.patch @@ -0,0 +1,80 @@ +--- sapi/fpm/php-fpm.conf.in 2011-07-04 23:22:56.000000000 +0200 ++++ sapi/fpm/php-fpm.conf.in 2011-08-12 16:56:23.686606725 +0200 +@@ -12,7 +12,7 @@ + ; Relative path can also be used. They will be prefixed by: + ; - the global prefix if it's been set (-p arguement) + ; - @prefix@ otherwise +-;include=etc/fpm.d/*.conf ++;include=/etc/php/fpm.d/*.conf + + ;;;;;;;;;;;;;;;;;; + ; Global Options ; +@@ -22,7 +22,7 @@ + ; Pid file + ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@ + ; Default Value: none +-;pid = run/php-fpm.pid ++pid = run/php-fpm/php-fpm.pid + + ; Error log file + ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@ +@@ -102,7 +102,8 @@ + ; specific port; + ; '/path/to/unix/socket' - to listen on a unix socket. + ; Note: This value is mandatory. +-listen = 127.0.0.1:9000 ++;listen = 127.0.0.1:9000 ++listen = /var/run/php-fpm/php-fpm.sock + + ; Set listen(2) backlog. A value of '-1' means unlimited. + ; Default Value: 128 (-1 on FreeBSD and OpenBSD) +@@ -121,9 +122,9 @@ + ; BSD-derived systems allow connections regardless of permissions. + ; Default Values: user and group are set as the running user + ; mode is set to 0666 +-;listen.owner = @php_fpm_user@ +-;listen.group = @php_fpm_group@ +-;listen.mode = 0666 ++listen.owner = @php_fpm_user@ ++listen.group = @php_fpm_group@ ++listen.mode = 0660 + + ; Unix user/group of processes + ; Note: The user is mandatory. If the group is not set, the default user's group +@@ -163,23 +164,23 @@ + ; The number of child processes created on startup. + ; Note: Used only when pm is set to 'dynamic' + ; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2 +-;pm.start_servers = 20 ++pm.start_servers = 20 + + ; The desired minimum number of idle server processes. + ; Note: Used only when pm is set to 'dynamic' + ; Note: Mandatory when pm is set to 'dynamic' +-;pm.min_spare_servers = 5 ++pm.min_spare_servers = 5 + + ; The desired maximum number of idle server processes. + ; Note: Used only when pm is set to 'dynamic' + ; Note: Mandatory when pm is set to 'dynamic' +-;pm.max_spare_servers = 35 ++pm.max_spare_servers = 35 + + ; The number of requests each child process should execute before respawning. + ; This can be useful to work around memory leaks in 3rd party libraries. For + ; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. + ; Default Value: 0 +-;pm.max_requests = 500 ++pm.max_requests = 500 + + ; The URI to view the FPM status page. If this value is not set, no URI will be + ; recognized as a status page. By default, the status page shows the following +@@ -333,7 +334,7 @@ + ; Chdir to this directory at the start. + ; Note: relative path can be used. + ; Default Value: current directory or / when chroot +-;chdir = /var/www ++;chdir = /srv/http + + ; Redirect worker stdout and stderr into main error log. If not set, stdout and + ; stderr will be redirected to /dev/null according to FastCGI specs. diff --git a/staging/php/php.ini.patch b/staging/php/php.ini.patch new file mode 100644 index 000000000..46c842921 --- /dev/null +++ b/staging/php/php.ini.patch @@ -0,0 +1,126 @@ +--- php.ini-production 2011-02-09 01:25:44.000000000 +0100 ++++ php.ini-production 2011-03-19 11:11:44.496987763 +0100 +@@ -376,7 +376,7 @@ + ; or per-virtualhost web server configuration file. This directive is + ; *NOT* affected by whether Safe Mode is turned On or Off. + ; http://php.net/open-basedir +-;open_basedir = ++open_basedir = /srv/http/:/home/:/tmp/:/usr/share/pear/ + + ; This directive allows you to disable certain functions for security reasons. + ; It receives a comma-delimited list of function names. This directive is +@@ -781,7 +781,7 @@ + ;;;;;;;;;;;;;;;;;;;;;;;;; + + ; UNIX: "/path1:/path2" +-;include_path = ".:/php/includes" ++include_path = ".:/usr/share/pear" + ; + ; Windows: "\path1;\path2" + ;include_path = ".;c:\php\includes" +@@ -804,7 +804,7 @@ + + ; Directory in which the loadable extensions (modules) reside. + ; http://php.net/extension-dir +-; extension_dir = "./" ++extension_dir = "/usr/lib/php/modules/" + ; On windows: + ; extension_dir = "ext" + +@@ -938,53 +938,49 @@ + ; If you only provide the name of the extension, PHP will look for it in its + ; default extension directory. + ; +-; Windows Extensions +-; Note that ODBC support is built in, so no dll is needed for it. +-; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5) +-; extension folders as well as the separate PECL DLL download (PHP 5). +-; Be sure to appropriately set the extension_dir directive. +-; +-;extension=php_bz2.dll +-;extension=php_curl.dll +-;extension=php_fileinfo.dll +-;extension=php_gd2.dll +-;extension=php_gettext.dll +-;extension=php_gmp.dll +-;extension=php_intl.dll +-;extension=php_imap.dll +-;extension=php_interbase.dll +-;extension=php_ldap.dll +-;extension=php_mbstring.dll +-;extension=php_exif.dll ; Must be after mbstring as it depends on it +-;extension=php_mysql.dll +-;extension=php_mysqli.dll +-;extension=php_oci8.dll ; Use with Oracle 10gR2 Instant Client +-;extension=php_oci8_11g.dll ; Use with Oracle 11g Instant Client +-;extension=php_openssl.dll +-;extension=php_pdo_firebird.dll +-;extension=php_pdo_mssql.dll +-;extension=php_pdo_mysql.dll +-;extension=php_pdo_oci.dll +-;extension=php_pdo_odbc.dll +-;extension=php_pdo_pgsql.dll +-;extension=php_pdo_sqlite.dll +-;extension=php_pgsql.dll +-;extension=php_pspell.dll +-;extension=php_shmop.dll +- +-; The MIBS data available in the PHP distribution must be installed. +-; See http://www.php.net/manual/en/snmp.installation.php +-;extension=php_snmp.dll +- +-;extension=php_soap.dll +-;extension=php_sockets.dll +-;extension=php_sqlite.dll +-;extension=php_sqlite3.dll +-;extension=php_sybase_ct.dll +-;extension=php_tidy.dll +-;extension=php_xmlrpc.dll +-;extension=php_xsl.dll +-;extension=php_zip.dll ++;extension=bcmath.so ++;extension=bz2.so ++;extension=calendar.so ++extension=curl.so ++;extension=dba.so ++;extension=enchant.so ++;extension=exif.so ++;extension=ftp.so ++;extension=gd.so ++extension=gettext.so ++;extension=gmp.so ++;extension=iconv.so ++;extension=imap.so ++;extension=intl.so ++extension=json.so ++;extension=ldap.so ++;extension=mcrypt.so ++;extension=mssql.so ++;extension=mysqli.so ++;extension=mysql.so ++;extension=odbc.so ++;extension=openssl.so ++;extension=pdo_mysql.so ++;extension=pdo_odbc.so ++;extension=pdo_pgsql.so ++;extension=pdo_sqlite.so ++;extension=pgsql.so ++;extension=phar.so ++;extension=posix.so ++;extension=pspell.so ++;extension=shmop.so ++;extension=snmp.so ++;extension=soap.so ++;extension=sockets.so ++;extension=sqlite3.so ++;extension=sqlite.so ++;extension=sysvmsg.so ++;extension=sysvsem.so ++;extension=sysvshm.so ++;extension=tidy.so ++;extension=xmlrpc.so ++;extension=xsl.so ++;extension=zip.so + + ;;;;;;;;;;;;;;;;;;; + ; Module Settings ; diff --git a/staging/php/rc.d.php-fpm b/staging/php/rc.d.php-fpm new file mode 100644 index 000000000..54bcf4d5b --- /dev/null +++ b/staging/php/rc.d.php-fpm @@ -0,0 +1,158 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + + +wait_for_pid () { + try=0 + while test $try -lt 35 ; do + case "$1" in + 'created') + if [ -f "$2" ] ; then + try='' + break + fi + ;; + 'removed') + if [ ! -f "$2" ] ; then + try='' + break + fi + ;; + esac + + stat_append '.' + try=`expr $try + 1` + sleep 1 + done +} + +test_config() { + stat_busy 'Checking configuration' + if [ $(id -u) -ne 0 ]; then + stat_append '(This script must be run as root)' + stat_die + fi + + if [ ! -r /etc/php/php-fpm.conf ]; then + stat_append '(/etc/php/php-fpm.conf not found)' + stat_die + fi + + local test=$(/usr/sbin/php-fpm -t 2>&1) + if [ $? -gt 0 ]; then + stat_append '(error in /etc/php/php-fpm.conf)' + stat_die + elif echo $test | grep -qi 'error'; then + stat_append '(error in /etc/php/php.ini)' + stat_die + fi + + [ -d /var/run/php-fpm ] || install -d -m755 /var/run/php-fpm + + stat_done +} + +case "$1" in + start) + test_config + stat_busy 'Starting php-fpm' + + /usr/sbin/php-fpm + + if [ "$?" != 0 ] ; then + stat_fail + exit 1 + fi + + wait_for_pid created /var/run/php-fpm/php-fpm.pid + + if [ -n "$try" ] ; then + stat_fail + exit 1 + else + add_daemon php-fpm + stat_done + fi + ;; + + stop) + test_config + stat_busy 'Gracefully shutting down php-fpm' + + if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then + stat_fail + exit 1 + fi + + kill -QUIT `cat /var/run/php-fpm/php-fpm.pid` + + wait_for_pid removed /var/run/php-fpm.pid + + if [ -n "$try" ] ; then + stat_fail + exit 1 + else + rm_daemon php-fpm + stat_done + fi + ;; + + force-quit) + stat_busy 'Terminating php-fpm' + + if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then + stat_fail + exit 1 + fi + + kill -TERM `cat /var/run/php-fpm/php-fpm.pid` + + wait_for_pid removed /var/run/php-fpm/php-fpm.pid + + if [ -n "$try" ] ; then + stat_fail + exit 1 + else + rm_daemon php-fpm + stat_done + fi + ;; + + restart) + $0 stop + $0 start + ;; + + reload) + test_config + stat_busy 'Reload service php-fpm' + + if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then + stat_fail + exit 1 + fi + + kill -USR2 `cat /var/run/php-fpm/php-fpm.pid` + stat_done + ;; + + logrotate) + stat_busy 'Reopen php-fpm log' + + if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then + stat_fail + exit 1 + fi + + kill -USR1 `cat /var/run/php-fpm/php-fpm.pid` + stat_done + ;; + + *) + echo "usage: $0 {start|stop|force-quit|restart|reload|logrotate}" + exit 1 + ;; + +esac diff --git a/staging/ruby/PKGBUILD b/staging/ruby/PKGBUILD new file mode 100644 index 000000000..b922793b6 --- /dev/null +++ b/staging/ruby/PKGBUILD @@ -0,0 +1,46 @@ +# $Id: PKGBUILD 142960 2011-11-19 07:06:33Z eric $ +# Maintainer: +# Contributor: Allan McRae <allan@archlinux.org> +# Contributor: John Proctor <jproctor@prium.net> +# Contributor: Jeramy Rutley <jrutley@gmail.com> + +pkgbase=ruby +pkgname=('ruby' 'ruby-docs') +pkgver=1.9.3_p0 +pkgrel=2 +pkgdesc="An object-oriented language for quick and easy programming" +arch=('i686' 'x86_64') +url="http://www.ruby-lang.org/en/" +license=('BSD' 'custom') +makedepends=('openssl' 'tk' 'libffi' 'doxygen' 'graphviz' 'libyaml') +options=('!emptydirs' '!makeflags') +source=(ftp://ftp.ruby-lang.org/pub/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver//_/-}.tar.bz2) +sha1sums=('f63c116411b981ef54c2caeefb9ccc4d71a5d2cf') + +build() { + cd "${srcdir}/${pkgbase}-${pkgver//_/-}" + DOXYGEN=/usr/bin/doxygen PKG_CONFIG=/usr/bin/pkg-config ./configure --prefix=/usr --sysconfdir=/etc \ + --enable-shared --enable-pthread --disable-rpath + make +} + +package_ruby() { + depends=('openssl' 'libffi' 'libyaml') + provides=('rubygems' 'rake') + conflicts=('rake') + optdepends=('tk: for Ruby/TK') + + cd "${srcdir}/${pkgbase}-${pkgver//_/-}" + make DESTDIR="${pkgdir}" install-nodoc + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -D -m644 BSDL "${pkgdir}/usr/share/licenses/${pkgname}/BSDL" +} + +package_ruby-docs() { + pkgdesc="Documentation files for ruby" + + cd "${srcdir}/${pkgbase}-${pkgver//_/-}" + make DESTDIR="${pkgdir}" install-doc install-capi + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -D -m644 BSDL "${pkgdir}/usr/share/licenses/${pkgname}/BSDL" +} diff --git a/staging/subversion/PKGBUILD b/staging/subversion/PKGBUILD new file mode 100644 index 000000000..de0ff770f --- /dev/null +++ b/staging/subversion/PKGBUILD @@ -0,0 +1,100 @@ +# $Id: PKGBUILD 142970 2011-11-19 08:55:29Z pierre $ +# Maintainer: Paul Mattal <paul@archlinux.org> +# Contributor: Jason Chu <jason@archlinux.org> + +pkgname=subversion +pkgver=1.6.17 +pkgrel=7 +pkgdesc="A Modern Concurrent Version Control System" +arch=('i686' 'x86_64') +license=('apache' 'bsd') +depends=('neon' 'apr-util' 'sqlite3') +optdepends=('libgnome-keyring' 'kdeutils-kwallet' 'bash-completion: for svn bash completion') +makedepends=('krb5' 'apache' 'python2' 'perl' 'swig' 'ruby' 'java-runtime' 'java-environment' + 'autoconf' 'db' 'e2fsprogs' 'libgnome-keyring' 'kdelibs') +backup=('etc/xinetd.d/svn' 'etc/conf.d/svnserve') +url="http://subversion.apache.org/" +provides=('svn') +options=('!makeflags' '!libtool') +source=(http://subversion.tigris.org/downloads/$pkgname-$pkgver.tar.bz2 + svnserve svn svnserve.conf svnmerge.py + subversion.rpath.fix.patch + subversion.suppress.deprecation.warnings.patch + subversion-perl-bindings.patch) +md5sums=('81e5dc5beee4b3fc025ac70c0b6caa14' + 'a2b029e8385007ffb99b437b30521c90' + 'a0db6dd43af33952739b6ec089852630' + 'c459e299192552f61578f3438abf0664' + 'a6371baeda7e224504629ecdda2749b4' + '6b4340ba9d8845cd8497e013ae01be3f' + '1166f3b7413d7e7450299b3525680bbe' + '0591aa39837931161b4d61ff35c7b147') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + export PYTHON=/usr/bin/python2 + + # apply patches + patch -Np0 -i ../subversion.rpath.fix.patch + patch -Np1 -i ../subversion.suppress.deprecation.warnings.patch + patch -Np1 -i ../subversion-perl-bindings.patch + + # configure + autoreconf + ./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr \ + --with-zlib=/usr --with-neon=/usr --with-apxs \ + --with-sqlite=/usr --with-berkeley-db=:/usr/include/:/usr/lib:db-5.2 \ + --enable-javahl --with-gnome-keyring --with-kwallet + + # build + (make external-all && make LT_LDFLAGS="-L$Fdestdir/usr/lib" local-all ) +} + +#check() { +# cd "${srcdir}/${pkgname}-${pkgver}" +# export LANG=C LC_ALL=C +# make check check-swig-pl check-swig-py CLEANUP=yes +#} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # install + export LD_LIBRARY_PATH=${pkgdir}/usr/lib:$LD_LIBRARY_PATH + make DESTDIR=${pkgdir} install + + make DESTDIR=${pkgdir} swig-py + make install-swig-py DESTDIR=${pkgdir} + + install -d ${pkgdir}/usr/lib/python2.7 + mv ${pkgdir}/usr/lib/svn-python/ ${pkgdir}/usr/lib/python2.7/site-packages + + install -d ${pkgdir}/usr/share/subversion + install -d -m 755 tools/hook-scripts ${pkgdir}/usr/share/subversion/ + rm -f ${pkgdir}/usr/share/subversion/hook-scripts/*.in + + make DESTDIR=${pkgdir} swig-pl + make install-swig-pl DESTDIR=${pkgdir} INSTALLDIRS=vendor + rm -f ${pkgdir}/usr/lib/perl5/vendor_perl/auto/SVN/_Core/.packlist + rm -rf ${pkgdir}/usr/lib/perl5/core_perl + + make DESTDIR=${pkgdir} swig-rb + make install-swig-rb DESTDIR=${pkgdir} + + make DESTDIR=${pkgdir} javahl + make DESTDIR=${pkgdir} install-javahl + + install -d ${pkgdir}/etc/{rc.d,xinetd.d,conf.d} + + install -m 755 ${srcdir}/svnserve ${pkgdir}/etc/rc.d + install -m 644 ${srcdir}/svn ${pkgdir}/etc/xinetd.d + install -m 644 ${srcdir}/svnserve.conf ${pkgdir}/etc/conf.d/svnserve + install -m 755 ${srcdir}/svnmerge.py ${pkgdir}/usr/bin/svnmerge + install -D -m 644 ${srcdir}/subversion-$pkgver/COPYING \ + ${pkgdir}/usr/share/licenses/$pkgname/LICENSE + + # bash completion + install -Dm 644 ${srcdir}/${pkgname}-${pkgver}/tools/client-side/bash_completion \ + ${pkgdir}/etc/bash_completion.d/subversion +} diff --git a/staging/subversion/subversion-perl-bindings.patch b/staging/subversion/subversion-perl-bindings.patch new file mode 100644 index 000000000..3c34daa47 --- /dev/null +++ b/staging/subversion/subversion-perl-bindings.patch @@ -0,0 +1,12 @@ +diff -Naur subversion-1.6.17.ori/subversion/bindings/swig/perl/native/Makefile.PL.in subversion-1.6.17/subversion/bindings/swig/perl/native/Makefile.PL.in +--- subversion-1.6.17.ori/subversion/bindings/swig/perl/native/Makefile.PL.in 2010-11-24 20:42:16.000000000 +0000 ++++ subversion-1.6.17/subversion/bindings/swig/perl/native/Makefile.PL.in 2011-07-01 20:16:16.520892074 +0000 +@@ -43,7 +43,7 @@ + my %config = ( + ABSTRACT => 'Perl bindings for Subversion', + DEFINE => $cppflags, +- CCFLAGS => $cflags, ++ CCFLAGS => $Config{ccflags}, + INC => join(' ',$apr_cflags, $apu_cflags, + " -I$swig_srcdir/perl/libsvn_swig_perl", + " -I$svnlib_srcdir/include", diff --git a/staging/subversion/subversion.rpath.fix.patch b/staging/subversion/subversion.rpath.fix.patch new file mode 100644 index 000000000..ba6ee9e4e --- /dev/null +++ b/staging/subversion/subversion.rpath.fix.patch @@ -0,0 +1,10 @@ +--- Makefile.in.orig 2009-02-16 14:10:48.000000000 -0200 ++++ Makefile.in 2009-06-04 00:56:29.000000000 -0300 +@@ -678,6 +678,7 @@ + + $(SWIG_PL_DIR)/native/Makefile: $(SWIG_PL_DIR)/native/Makefile.PL + cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL ++ cd $(SWIG_PL_DIR)/native; sed -i 's|LD_RUN_PATH|DIE_RPATH_DIE|g' Makefile{,.{client,delta,fs,ra,repos,wc}} + + swig-pl_DEPS = autogen-swig-pl libsvn_swig_perl \ + $(SWIG_PL_DIR)/native/Makefile diff --git a/staging/subversion/subversion.suppress.deprecation.warnings.patch b/staging/subversion/subversion.suppress.deprecation.warnings.patch new file mode 100644 index 000000000..94ce89b18 --- /dev/null +++ b/staging/subversion/subversion.suppress.deprecation.warnings.patch @@ -0,0 +1,22 @@ +diff -urN subversion-1.6.9/subversion/bindings/swig/python/svn/core.py subversion-1.6.9-fixed/subversion/bindings/swig/python/svn/core.py +--- subversion-1.6.9/subversion/bindings/swig/python/svn/core.py 2009-02-13 11:22:26.000000000 -0500 ++++ subversion-1.6.9-fixed/subversion/bindings/swig/python/svn/core.py 2010-02-08 07:46:29.000000000 -0500 +@@ -19,6 +19,7 @@ + from libsvn.core import * + import libsvn.core as _libsvncore + import atexit as _atexit ++import warnings + + class SubversionException(Exception): + def __init__(self, message=None, apr_err=None, child=None, +@@ -44,7 +45,9 @@ + Exception.__init__(self, *args) + + self.apr_err = apr_err +- self.message = message ++ with warnings.catch_warnings(): ++ warnings.simplefilter("ignore", DeprecationWarning) ++ self.message = message + self.child = child + self.file = file + self.line = line diff --git a/staging/subversion/svn b/staging/subversion/svn new file mode 100644 index 000000000..8988aaf63 --- /dev/null +++ b/staging/subversion/svn @@ -0,0 +1,11 @@ +service svn +{ + flags = REUSE + socket_type = stream + wait = no + user = root + server = /usr/bin/svnserve + server_args = -i + log_on_failure += USERID + disable = yes +} diff --git a/staging/subversion/svnmerge.py b/staging/subversion/svnmerge.py new file mode 100644 index 000000000..d8931648f --- /dev/null +++ b/staging/subversion/svnmerge.py @@ -0,0 +1,2370 @@ +#!/usr/bin/env python2 +# -*- coding: utf-8 -*- +# Copyright (c) 2005, Giovanni Bajo +# Copyright (c) 2004-2005, Awarix, Inc. +# All rights reserved. +# +# 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 2 +# 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, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA +# +# Author: Archie Cobbs <archie at awarix dot com> +# Rewritten in Python by: Giovanni Bajo <rasky at develer dot com> +# +# Acknowledgments: +# John Belmonte <john at neggie dot net> - metadata and usability +# improvements +# Blair Zajac <blair at orcaware dot com> - random improvements +# Raman Gupta <rocketraman at fastmail dot fm> - bidirectional and transitive +# merging support +# Dustin J. Mitchell <dustin at zmanda dot com> - support for multiple +# location identifier formats +# +# $HeadURL$ +# $LastChangedDate$ +# $LastChangedBy$ +# $LastChangedRevision$ +# +# Requisites: +# svnmerge.py has been tested with all SVN major versions since 1.1 (both +# client and server). It is unknown if it works with previous versions. +# +# Differences from svnmerge.sh: +# - More portable: tested as working in FreeBSD and OS/2. +# - Add double-verbose mode, which shows every svn command executed (-v -v). +# - "svnmerge avail" now only shows commits in source, not also commits in +# other parts of the repository. +# - Add "svnmerge block" to flag some revisions as blocked, so that +# they will not show up anymore in the available list. Added also +# the complementary "svnmerge unblock". +# - "svnmerge avail" has grown two new options: +# -B to display a list of the blocked revisions +# -A to display both the blocked and the available revisions. +# - Improved generated commit message to make it machine parsable even when +# merging commits which are themselves merges. +# - Add --force option to skip working copy check +# - Add --record-only option to "svnmerge merge" to avoid performing +# an actual merge, yet record that a merge happened. +# - Can use a variety of location-identifier formats +# +# TODO: +# - Add "svnmerge avail -R": show logs in reverse order +# +# Information for Hackers: +# +# Identifiers for branches: +# A branch is identified in three ways within this source: +# - as a working copy (variable name usually includes 'dir') +# - as a fully qualified URL +# - as a path identifier (an opaque string indicating a particular path +# in a particular repository; variable name includes 'pathid') +# A "target" is generally user-specified, and may be a working copy or +# a URL. + +import sys, os, getopt, re, types, tempfile, time, locale +from bisect import bisect +from xml.dom import pulldom + +NAME = "svnmerge" +if not hasattr(sys, "version_info") or sys.version_info < (2, 0): + error("requires Python 2.0 or newer") + +# Set up the separator used to separate individual log messages from +# each revision merged into the target location. Also, create a +# regular expression that will find this same separator in already +# committed log messages, so that the separator used for this run of +# svnmerge.py will have one more LOG_SEPARATOR appended to the longest +# separator found in all the commits. +LOG_SEPARATOR = 8 * '.' +LOG_SEPARATOR_RE = re.compile('^((%s)+)' % re.escape(LOG_SEPARATOR), + re.MULTILINE) + +# Each line of the embedded log messages will be prefixed by LOG_LINE_PREFIX. +LOG_LINE_PREFIX = 2 * ' ' + +# Set python to the default locale as per environment settings, same as svn +# TODO we should really parse config and if log-encoding is specified, set +# the locale to match that encoding +locale.setlocale(locale.LC_ALL, '') + +# We want the svn output (such as svn info) to be non-localized +# Using LC_MESSAGES should not affect localized output of svn log, for example +if os.environ.has_key("LC_ALL"): + del os.environ["LC_ALL"] +os.environ["LC_MESSAGES"] = "C" + +############################################################################### +# Support for older Python versions +############################################################################### + +# True/False constants are Python 2.2+ +try: + True, False +except NameError: + True, False = 1, 0 + +def lstrip(s, ch): + """Replacement for str.lstrip (support for arbitrary chars to strip was + added in Python 2.2.2).""" + i = 0 + try: + while s[i] == ch: + i = i+1 + return s[i:] + except IndexError: + return "" + +def rstrip(s, ch): + """Replacement for str.rstrip (support for arbitrary chars to strip was + added in Python 2.2.2).""" + try: + if s[-1] != ch: + return s + i = -2 + while s[i] == ch: + i = i-1 + return s[:i+1] + except IndexError: + return "" + +def strip(s, ch): + """Replacement for str.strip (support for arbitrary chars to strip was + added in Python 2.2.2).""" + return lstrip(rstrip(s, ch), ch) + +def rsplit(s, sep, maxsplits=0): + """Like str.rsplit, which is Python 2.4+ only.""" + L = s.split(sep) + if not 0 < maxsplits <= len(L): + return L + return [sep.join(L[0:-maxsplits])] + L[-maxsplits:] + +############################################################################### + +def kwextract(s): + """Extract info from a svn keyword string.""" + try: + return strip(s, "$").strip().split(": ")[1] + except IndexError: + return "<unknown>" + +__revision__ = kwextract('$Rev$') +__date__ = kwextract('$Date$') + +# Additional options, not (yet?) mapped to command line flags +default_opts = { + "svn": "svn", + "prop": NAME + "-integrated", + "block-prop": NAME + "-blocked", + "commit-verbose": True, + "verbose": 0, +} +logs = {} + +def console_width(): + """Get the width of the console screen (if any).""" + try: + return int(os.environ["COLUMNS"]) + except (KeyError, ValueError): + pass + + try: + # Call the Windows API (requires ctypes library) + from ctypes import windll, create_string_buffer + h = windll.kernel32.GetStdHandle(-11) + csbi = create_string_buffer(22) + res = windll.kernel32.GetConsoleScreenBufferInfo(h, csbi) + if res: + import struct + (bufx, bufy, + curx, cury, wattr, + left, top, right, bottom, + maxx, maxy) = struct.unpack("hhhhHhhhhhh", csbi.raw) + return right - left + 1 + except ImportError: + pass + + # Parse the output of stty -a + if os.isatty(1): + out = os.popen("stty -a").read() + m = re.search(r"columns (\d+);", out) + if m: + return int(m.group(1)) + + # sensible default + return 80 + +def error(s): + """Subroutine to output an error and bail.""" + print >> sys.stderr, "%s: %s" % (NAME, s) + sys.exit(1) + +def report(s): + """Subroutine to output progress message, unless in quiet mode.""" + if opts["verbose"]: + print "%s: %s" % (NAME, s) + +def prefix_lines(prefix, lines): + """Given a string representing one or more lines of text, insert the + specified prefix at the beginning of each line, and return the result. + The input must be terminated by a newline.""" + assert lines[-1] == "\n" + return prefix + lines[:-1].replace("\n", "\n"+prefix) + "\n" + +def recode_stdout_to_file(s): + if locale.getdefaultlocale()[1] is None or not hasattr(sys.stdout, "encoding") \ + or sys.stdout.encoding is None: + return s + u = s.decode(sys.stdout.encoding) + return u.encode(locale.getdefaultlocale()[1]) + +class LaunchError(Exception): + """Signal a failure in execution of an external command. Parameters are the + exit code of the process, the original command line, and the output of the + command.""" + +try: + """Launch a sub-process. Return its output (both stdout and stderr), + optionally split by lines (if split_lines is True). Raise a LaunchError + exception if the exit code of the process is non-zero (failure). + + This function has two implementations, one based on subprocess (preferred), + and one based on popen (for compatibility). + """ + import subprocess + import shlex + + def launch(cmd, split_lines=True): + # Requiring python 2.4 or higher, on some platforms we get + # much faster performance from the subprocess module (where python + # doesn't try to close an exhorbitant number of file descriptors) + stdout = "" + stderr = "" + try: + if os.name == 'nt': + p = subprocess.Popen(cmd, stdout=subprocess.PIPE, \ + close_fds=False, stderr=subprocess.PIPE) + else: + # Use shlex to break up the parameters intelligently, + # respecting quotes. shlex can't handle unicode. + args = shlex.split(cmd.encode('ascii')) + p = subprocess.Popen(args, stdout=subprocess.PIPE, \ + close_fds=False, stderr=subprocess.PIPE) + stdoutAndErr = p.communicate() + stdout = stdoutAndErr[0] + stderr = stdoutAndErr[1] + except OSError, inst: + # Using 1 as failure code; should get actual number somehow? For + # examples see svnmerge_test.py's TestCase_launch.test_failure and + # TestCase_launch.test_failurecode. + raise LaunchError(1, cmd, stdout + " " + stderr + ": " + str(inst)) + + if p.returncode == 0: + if split_lines: + # Setting keepends=True for compatibility with previous logic + # (where file.readlines() preserves newlines) + return stdout.splitlines(True) + else: + return stdout + else: + raise LaunchError(p.returncode, cmd, stdout + stderr) +except ImportError: + # support versions of python before 2.4 (slower on some systems) + def launch(cmd, split_lines=True): + if os.name not in ['nt', 'os2']: + import popen2 + p = popen2.Popen4(cmd) + p.tochild.close() + if split_lines: + out = p.fromchild.readlines() + else: + out = p.fromchild.read() + ret = p.wait() + if ret == 0: + ret = None + else: + ret >>= 8 + else: + i,k = os.popen4(cmd) + i.close() + if split_lines: + out = k.readlines() + else: + out = k.read() + ret = k.close() + + if ret is None: + return out + raise LaunchError(ret, cmd, out) + +def launchsvn(s, show=False, pretend=False, **kwargs): + """Launch SVN and grab its output.""" + username = password = configdir = "" + if opts.get("username", None): + username = "--username=" + opts["username"] + if opts.get("password", None): + password = "--password=" + opts["password"] + if opts.get("config-dir", None): + configdir = "--config-dir=" + opts["config-dir"] + cmd = ' '.join(filter(None, [opts["svn"], "--non-interactive", + username, password, configdir, s])) + if show or opts["verbose"] >= 2: + print cmd + if pretend: + return None + return launch(cmd, **kwargs) + +def svn_command(s): + """Do (or pretend to do) an SVN command.""" + out = launchsvn(s, show=opts["show-changes"] or opts["dry-run"], + pretend=opts["dry-run"], + split_lines=False) + if not opts["dry-run"]: + print out + +def check_dir_clean(dir): + """Check the current status of dir for local mods.""" + if opts["force"]: + report('skipping status check because of --force') + return + report('checking status of "%s"' % dir) + + # Checking with -q does not show unversioned files or external + # directories. Though it displays a debug message for external + # directories, after a blank line. So, practically, the first line + # matters: if it's non-empty there is a modification. + out = launchsvn("status -q %s" % dir) + if out and out[0].strip(): + error('"%s" has local modifications; it must be clean' % dir) + +class PathIdentifier: + """Abstraction for a path identifier, so that we can start talking + about it before we know the form that it takes in the properties (its + external_form). Objects are referenced in the class variable 'locobjs', + keyed by all known forms.""" + + # a map of UUID (or None) to repository root URL. + repo_hints = {} + + # a map from any known string form to the corresponding PathIdentifier + locobjs = {} + + def __init__(self, repo_relative_path, uuid=None, url=None, external_form=None): + self.repo_relative_path = repo_relative_path + self.uuid = uuid + self.url = url + self.external_form = external_form + + def __repr__(self): + return "<PathIdentifier " + ', '.join('%s=%r' % i for i in self.__dict__.items()) + '>' + + def __str__(self): + """Return a printable string representation""" + if self.external_form: + return self.external_form + if self.url: + return self.format('url') + if self.uuid: + return self.format('uuid') + return self.format('path') + + def from_pathid(pathid_str): + """convert pathid_str to a PathIdentifier""" + if not PathIdentifier.locobjs.has_key(pathid_str): + if is_url(pathid_str): + # we can determine every form; PathIdentifier.hint knows how to do that + PathIdentifier.hint(pathid_str) + elif pathid_str[:7] == 'uuid://': + mo = re.match('uuid://([^/]*)(.*)', pathid_str) + if not mo: + error("Invalid path identifier '%s'" % pathid_str) + uuid, repo_relative_path = mo.groups() + pathid = PathIdentifier(repo_relative_path, uuid=uuid) + # we can cache this by uuid:// pathid and by repo-relative path + PathIdentifier.locobjs[pathid_str] = PathIdentifier.locobjs[repo_relative_path] = pathid + elif pathid_str and pathid_str[0] == '/': + # strip any trailing slashes + pathid_str = pathid_str.rstrip('/') + pathid = PathIdentifier(repo_relative_path=pathid_str) + # we can only cache this by repo-relative path + PathIdentifier.locobjs[pathid_str] = pathid + else: + error("Invalid path identifier '%s'" % pathid_str) + return PathIdentifier.locobjs[pathid_str] + from_pathid = staticmethod(from_pathid) + + def from_target(target): + """Convert a target (either a working copy path or an URL) into a + path identifier.""" + # prime the cache first if we don't know about this target yet + if not PathIdentifier.locobjs.has_key(target): + PathIdentifier.hint(target) + + try: + return PathIdentifier.locobjs[target] + except KeyError: + error("Could not recognize path identifier '%s'" % target) + from_target = staticmethod(from_target) + + def hint(target): + """Cache some information about target, as it may be referenced by + repo-relative path in subversion properties; the cache can help to + expand such a relative path to a full path identifier.""" + if PathIdentifier.locobjs.has_key(target): return + if not is_url(target) and not is_wc(target): return + + url = target_to_url(target) + + root = get_repo_root(url) + assert root[-1] != "/" + assert url[:len(root)] == root, "url=%r, root=%r" % (url, root) + repo_relative_path = url[len(root):] + + try: + uuid = get_svninfo(target)['Repository UUID'] + uuid_pathid = 'uuid://%s%s' % (uuid, repo_relative_path) + except KeyError: + uuid = None + uuid_pathid = None + + locobj = PathIdentifier.locobjs.get(url) or \ + (uuid_pathid and PathIdentifier.locobjs.get(uuid_pathid)) + if not locobj: + locobj = PathIdentifier(repo_relative_path, uuid=uuid, url=url) + + PathIdentifier.repo_hints[uuid] = root # (uuid may be None) + + PathIdentifier.locobjs[target] = locobj + PathIdentifier.locobjs[url] = locobj + if uuid_pathid: + PathIdentifier.locobjs[uuid_pathid] = locobj + if not PathIdentifier.locobjs.has_key(repo_relative_path): + PathIdentifier.locobjs[repo_relative_path] = locobj + hint = staticmethod(hint) + + def format(self, fmt): + if fmt == 'path': + return self.repo_relative_path + elif fmt == 'uuid': + return "uuid://%s%s" % (self.uuid, self.repo_relative_path) + elif fmt == 'url': + return self.url + else: + error("Unkonwn path type '%s'" % fmt) + + def match_substring(self, str): + """Test whether str is a substring of any representation of this + PathIdentifier.""" + if self.repo_relative_path.find(str) >= 0: + return True + + if self.uuid: + if ("uuid://%s%s" % (self.uuid, self.repo_relative_path)).find(str) >= 0: + return True + + if self.url: + if (self.url + self.repo_relative_path).find(str) >= 0: + return True + + return False + + def get_url(self): + """Convert a pathid into a URL. If this is not possible, error out.""" + if self.url: + return self.url + # if we have a uuid and happen to know the URL for it, use that + elif self.uuid and PathIdentifier.repo_hints.has_key(self.uuid): + self.url = PathIdentifier.repo_hints[self.uuid] + self.repo_relative_path + PathIdentifier.locobjs[self.url] = self + return self.url + # if we've only seen one rep, use that (a guess, but an educated one) + elif not self.uuid and len(PathIdentifier.repo_hints) == 1: + uuid, root = PathIdentifier.repo_hints.items()[0] + if uuid: + self.uuid = uuid + PathIdentifier.locobjs['uuid://%s%s' % (uuid, self.repo_relative_path)] = self + self.url = root + self.repo_relative_path + PathIdentifier.locobjs[self.url] = self + report("Guessing that '%s' refers to '%s'" % (self, self.url)) + return self.url + else: + error("Cannot determine URL for '%s'; " % self + + "Explicit source argument (-S/--source) required.\n") + +class RevisionLog: + """ + A log of the revisions which affected a given URL between two + revisions. + """ + + def __init__(self, url, begin, end, find_propchanges=False): + """ + Create a new RevisionLog object, which stores, in self.revs, a list + of the revisions which affected the specified URL between begin and + end. If find_propchanges is True, self.propchange_revs will contain a + list of the revisions which changed properties directly on the + specified URL. URL must be the URL for a directory in the repository. + """ + self.url = url + + # Setup the log options (--quiet, so we don't show log messages) + log_opts = '--xml --quiet -r%s:%s "%s"' % (begin, end, url) + if find_propchanges: + # The --verbose flag lets us grab merge tracking information + # by looking at propchanges + log_opts = "--verbose " + log_opts + + # Read the log to look for revision numbers and merge-tracking info + self.revs = [] + self.propchange_revs = [] + repos_pathid = PathIdentifier.from_target(url) + for chg in SvnLogParser(launchsvn("log %s" % log_opts, + split_lines=False)): + self.revs.append(chg.revision()) + for p in chg.paths(): + if p.action() == 'M' and p.pathid() == repos_pathid.repo_relative_path: + self.propchange_revs.append(chg.revision()) + + # Save the range of the log + self.begin = int(begin) + if end == "HEAD": + # If end is not provided, we do not know which is the latest + # revision in the repository. So we set 'end' to the latest + # known revision. + self.end = self.revs[-1] + else: + self.end = int(end) + + self._merges = None + self._blocks = None + + def merge_metadata(self): + """ + Return a VersionedProperty object, with a cached view of the merge + metadata in the range of this log. + """ + + # Load merge metadata if necessary + if not self._merges: + self._merges = VersionedProperty(self.url, opts["prop"]) + self._merges.load(self) + + return self._merges + + def block_metadata(self): + if not self._blocks: + self._blocks = VersionedProperty(self.url, opts["block-prop"]) + self._blocks.load(self) + + return self._blocks + + +class VersionedProperty: + """ + A read-only, cached view of a versioned property. + + self.revs contains a list of the revisions in which the property changes. + self.values stores the new values at each corresponding revision. If the + value of the property is unknown, it is set to None. + + Initially, we set self.revs to [0] and self.values to [None]. This + indicates that, as of revision zero, we know nothing about the value of + the property. + + Later, if you run self.load(log), we cache the value of this property over + the entire range of the log by noting each revision in which the property + was changed. At the end of the range of the log, we invalidate our cache + by adding the value "None" to our cache for any revisions which fall out + of the range of our log. + + Once self.revs and self.values are filled, we can find the value of the + property at any arbitrary revision using a binary search on self.revs. + Once we find the last revision during which the property was changed, + we can lookup the associated value in self.values. (If the associated + value is None, the associated value was not cached and we have to do + a full propget.) + + An example: We know that the 'svnmerge' property was added in r10, and + changed in r21. We gathered log info up until r40. + + revs = [0, 10, 21, 40] + values = [None, "val1", "val2", None] + + What these values say: + - From r0 to r9, we know nothing about the property. + - In r10, the property was set to "val1". This property stayed the same + until r21, when it was changed to "val2". + - We don't know what happened after r40. + """ + + def __init__(self, url, name): + """View the history of a versioned property at URL with name""" + self.url = url + self.name = name + + # We know nothing about the value of the property. Setup revs + # and values to indicate as such. + self.revs = [0] + self.values = [None] + + # We don't have any revisions cached + self._initial_value = None + self._changed_revs = [] + self._changed_values = [] + + def load(self, log): + """ + Load the history of property changes from the specified + RevisionLog object. + """ + + # Get the property value before the range of the log + if log.begin > 1: + self.revs.append(log.begin-1) + try: + self._initial_value = self.raw_get(log.begin-1) + except LaunchError: + # The specified URL might not exist before the + # range of the log. If so, we can safely assume + # that the property was empty at that time. + self._initial_value = { } + self.values.append(self._initial_value) + else: + self._initial_value = { } + self.values[0] = self._initial_value + + # Cache the property values in the log range + old_value = self._initial_value + for rev in log.propchange_revs: + new_value = self.raw_get(rev) + if new_value != old_value: + self._changed_revs.append(rev) + self._changed_values.append(new_value) + self.revs.append(rev) + self.values.append(new_value) + old_value = new_value + + # Indicate that we know nothing about the value of the property + # after the range of the log. + if log.revs: + self.revs.append(log.end+1) + self.values.append(None) + + def raw_get(self, rev=None): + """ + Get the property at revision REV. If rev is not specified, get + the property at revision HEAD. + """ + return get_revlist_prop(self.url, self.name, rev) + + def get(self, rev=None): + """ + Get the property at revision REV. If rev is not specified, get + the property at revision HEAD. + """ + + if rev is not None: + + # Find the index using a binary search + i = bisect(self.revs, rev) - 1 + + # Return the value of the property, if it was cached + if self.values[i] is not None: + return self.values[i] + + # Get the current value of the property + return self.raw_get(rev) + + def changed_revs(self, key=None): + """ + Get a list of the revisions in which the specified dictionary + key was changed in this property. If key is not specified, + return a list of revisions in which any key was changed. + """ + if key is None: + return self._changed_revs + else: + changed_revs = [] + old_val = self._initial_value + for rev, val in zip(self._changed_revs, self._changed_values): + if val.get(key) != old_val.get(key): + changed_revs.append(rev) + old_val = val + return changed_revs + + def initialized_revs(self): + """ + Get a list of the revisions in which keys were added or + removed in this property. + """ + initialized_revs = [] + old_len = len(self._initial_value) + for rev, val in zip(self._changed_revs, self._changed_values): + if len(val) != old_len: + initialized_revs.append(rev) + old_len = len(val) + return initialized_revs + +class RevisionSet: + """ + A set of revisions, held in dictionary form for easy manipulation. If we + were to rewrite this script for Python 2.3+, we would subclass this from + set (or UserSet). As this class does not include branch + information, it's assumed that one instance will be used per + branch. + """ + def __init__(self, parm): + """Constructs a RevisionSet from a string in property form, or from + a dictionary whose keys are the revisions. Raises ValueError if the + input string is invalid.""" + + self._revs = {} + + revision_range_split_re = re.compile('[-:]') + + if isinstance(parm, types.DictType): + self._revs = parm.copy() + elif isinstance(parm, types.ListType): + for R in parm: + self._revs[int(R)] = 1 + else: + parm = parm.strip() + if parm: + for R in parm.split(","): + rev_or_revs = re.split(revision_range_split_re, R) + if len(rev_or_revs) == 1: + self._revs[int(rev_or_revs[0])] = 1 + elif len(rev_or_revs) == 2: + for rev in range(int(rev_or_revs[0]), + int(rev_or_revs[1])+1): + self._revs[rev] = 1 + else: + raise ValueError, 'Ill formatted revision range: ' + R + + def sorted(self): + revnums = self._revs.keys() + revnums.sort() + return revnums + + def normalized(self): + """Returns a normalized version of the revision set, which is an + ordered list of couples (start,end), with the minimum number of + intervals.""" + revnums = self.sorted() + revnums.reverse() + ret = [] + while revnums: + s = e = revnums.pop() + while revnums and revnums[-1] in (e, e+1): + e = revnums.pop() + ret.append((s, e)) + return ret + + def __str__(self): + """Convert the revision set to a string, using its normalized form.""" + L = [] + for s,e in self.normalized(): + if s == e: + L.append(str(s)) + else: + L.append(str(s) + "-" + str(e)) + return ",".join(L) + + def __contains__(self, rev): + return self._revs.has_key(rev) + + def __sub__(self, rs): + """Compute subtraction as in sets.""" + revs = {} + for r in self._revs.keys(): + if r not in rs: + revs[r] = 1 + return RevisionSet(revs) + + def __and__(self, rs): + """Compute intersections as in sets.""" + revs = {} + for r in self._revs.keys(): + if r in rs: + revs[r] = 1 + return RevisionSet(revs) + + def __nonzero__(self): + return len(self._revs) != 0 + + def __len__(self): + """Return the number of revisions in the set.""" + return len(self._revs) + + def __iter__(self): + return iter(self.sorted()) + + def __or__(self, rs): + """Compute set union.""" + revs = self._revs.copy() + revs.update(rs._revs) + return RevisionSet(revs) + +def merge_props_to_revision_set(merge_props, pathid): + """A converter which returns a RevisionSet instance containing the + revisions from PATH as known to BRANCH_PROPS. BRANCH_PROPS is a + dictionary of pathid -> revision set branch integration information + (as returned by get_merge_props()).""" + if not merge_props.has_key(pathid): + error('no integration info available for path "%s"' % pathid) + return RevisionSet(merge_props[pathid]) + +def dict_from_revlist_prop(propvalue): + """Given a property value as a string containing per-source revision + lists, return a dictionary whose key is a source path identifier + and whose value is the revisions for that source.""" + prop = {} + + # Multiple sources are separated by any whitespace. + for L in propvalue.split(): + # We use rsplit to play safe and allow colons in pathids. + pathid_str, revs = rsplit(L.strip(), ":", 1) + + pathid = PathIdentifier.from_pathid(pathid_str) + + # cache the "external" form we saw + pathid.external_form = pathid_str + + prop[pathid] = revs + return prop + +def get_revlist_prop(url_or_dir, propname, rev=None): + """Given a repository URL or working copy path and a property + name, extract the values of the property which store per-source + revision lists and return a dictionary whose key is a source path + identifier, and whose value is the revisions for that source.""" + + # Note that propget does not return an error if the property does + # not exist, it simply does not output anything. So we do not need + # to check for LaunchError here. + args = '--strict "%s" "%s"' % (propname, url_or_dir) + if rev: + args = '-r %s %s' % (rev, args) + out = launchsvn('propget %s' % args, split_lines=False) + + return dict_from_revlist_prop(out) + +def get_merge_props(dir): + """Extract the merged revisions.""" + return get_revlist_prop(dir, opts["prop"]) + +def get_block_props(dir): + """Extract the blocked revisions.""" + return get_revlist_prop(dir, opts["block-prop"]) + +def get_blocked_revs(dir, source_pathid): + p = get_block_props(dir) + if p.has_key(source_pathid): + return RevisionSet(p[source_pathid]) + return RevisionSet("") + +def format_merge_props(props, sep=" "): + """Formats the hash PROPS as a string suitable for use as a + Subversion property value.""" + assert sep in ["\t", "\n", " "] # must be a whitespace + props = props.items() + props.sort() + L = [] + for h, r in props: + L.append("%s:%s" % (h, r)) + return sep.join(L) + +def _run_propset(dir, prop, value): + """Set the property 'prop' of directory 'dir' to value 'value'. We go + through a temporary file to not run into command line length limits.""" + try: + fd, fname = tempfile.mkstemp() + f = os.fdopen(fd, "wb") + except AttributeError: + # Fallback for Python <= 2.3 which does not have mkstemp (mktemp + # suffers from race conditions. Not that we care...) + fname = tempfile.mktemp() + f = open(fname, "wb") + + try: + f.write(value) + f.close() + report("property data written to temp file: %s" % value) + svn_command('propset "%s" -F "%s" "%s"' % (prop, fname, dir)) + finally: + os.remove(fname) + +def set_props(dir, name, props): + props = format_merge_props(props) + if props: + _run_propset(dir, name, props) + else: + # Check if NAME exists on DIR before trying to delete it. + # As of 1.6 propdel no longer supports deleting a + # non-existent property. + out = launchsvn('propget "%s" "%s"' % (name, dir)) + if out: + svn_command('propdel "%s" "%s"' % (name, dir)) + +def set_merge_props(dir, props): + set_props(dir, opts["prop"], props) + +def set_block_props(dir, props): + set_props(dir, opts["block-prop"], props) + +def set_blocked_revs(dir, source_pathid, revs): + props = get_block_props(dir) + if revs: + props[source_pathid] = str(revs) + elif props.has_key(source_pathid): + del props[source_pathid] + set_block_props(dir, props) + +def is_url(url): + """Check if url looks like a valid url.""" + return re.search(r"^[a-zA-Z][-+\.\w]*://[^\s]+$", url) is not None and url[:4] != 'uuid' + +def check_url(url): + """Similar to is_url, but actually invoke get_svninfo to find out""" + return get_svninfo(url) != {} + +def is_pathid(pathid): + return isinstance(pathid, PathIdentifier) + +def is_wc(dir): + """Check if a directory is a working copy.""" + return os.path.isdir(os.path.join(dir, ".svn")) or \ + os.path.isdir(os.path.join(dir, "_svn")) + +_cache_svninfo = {} +def get_svninfo(target): + """Extract the subversion information for a target (through 'svn info'). + This function uses an internal cache to let clients query information + many times.""" + if _cache_svninfo.has_key(target): + return _cache_svninfo[target] + info = {} + for L in launchsvn('info "%s"' % target): + L = L.strip() + if not L: + continue + key, value = L.split(": ", 1) + info[key] = value.strip() + _cache_svninfo[target] = info + return info + +def target_to_url(target): + """Convert working copy path or repos URL to a repos URL.""" + if is_wc(target): + info = get_svninfo(target) + return info["URL"] + return target + +_cache_reporoot = {} +def get_repo_root(target): + """Compute the root repos URL given a working-copy path, or a URL.""" + # Try using "svn info WCDIR". This works only on SVN clients >= 1.3 + if not is_url(target): + try: + info = get_svninfo(target) + root = info["Repository Root"] + _cache_reporoot[root] = None + return root + except KeyError: + pass + url = target_to_url(target) + assert url[-1] != '/' + else: + url = target + + # Go through the cache of the repository roots. This avoids extra + # server round-trips if we are asking the root of different URLs + # in the same repository (the cache in get_svninfo() cannot detect + # that of course and would issue a remote command). + assert is_url(url) + for r in _cache_reporoot: + if url.startswith(r): + return r + + # Try using "svn info URL". This works only on SVN clients >= 1.2 + try: + info = get_svninfo(url) + # info may be {}, in which case we'll see KeyError here + root = info["Repository Root"] + _cache_reporoot[root] = None + return root + except (KeyError, LaunchError): + pass + + # Constrained to older svn clients, we are stuck with this ugly + # trial-and-error implementation. It could be made faster with a + # binary search. + while url: + temp = os.path.dirname(url) + try: + launchsvn('proplist "%s"' % temp) + except LaunchError: + _cache_reporoot[url] = None + return rstrip(url, "/") + url = temp + + error("svn repos root of %s not found" % target) + +class SvnLogParser: + """ + Parse the "svn log", going through the XML output and using pulldom (which + would even allow streaming the command output). + """ + def __init__(self, xml): + self._events = pulldom.parseString(xml) + def __getitem__(self, idx): + for event, node in self._events: + if event == pulldom.START_ELEMENT and node.tagName == "logentry": + self._events.expandNode(node) + return self.SvnLogRevision(node) + raise IndexError, "Could not find 'logentry' tag in xml" + + class SvnLogRevision: + def __init__(self, xmlnode): + self.n = xmlnode + def revision(self): + return int(self.n.getAttribute("revision")) + def author(self): + return self.n.getElementsByTagName("author")[0].firstChild.data + def paths(self): + return [self.SvnLogPath(n) + for n in self.n.getElementsByTagName("path")] + + class SvnLogPath: + def __init__(self, xmlnode): + self.n = xmlnode + def action(self): + return self.n.getAttribute("action") + def pathid(self): + return self.n.firstChild.data + def copyfrom_rev(self): + try: return self.n.getAttribute("copyfrom-rev") + except KeyError: return None + def copyfrom_pathid(self): + try: return self.n.getAttribute("copyfrom-path") + except KeyError: return None + +def get_copyfrom(target): + """Get copyfrom info for a given target (it represents the + repository-relative path from where it was branched). NOTE: + repos root has no copyfrom info. In this case None is returned. + + Returns the: + - source file or directory from which the copy was made + - revision from which that source was copied + - revision in which the copy was committed + """ + repos_path = PathIdentifier.from_target(target).repo_relative_path + for chg in SvnLogParser(launchsvn('log -v --xml --stop-on-copy "%s"' + % target, split_lines=False)): + for p in chg.paths(): + if p.action() == 'A' and p.pathid() == repos_path: + # These values will be None if the corresponding elements are + # not found in the log. + return p.copyfrom_pathid(), p.copyfrom_rev(), chg.revision() + return None,None,None + +def get_latest_rev(url): + """Get the latest revision of the repository of which URL is part.""" + try: + info = get_svninfo(url) + if not info.has_key("Revision"): + error("Not a valid URL: %s" % url) + return info["Revision"] + except LaunchError: + # Alternative method for latest revision checking (for svn < 1.2) + report('checking latest revision of "%s"' % url) + L = launchsvn('proplist --revprop -r HEAD "%s"' % opts["source-url"])[0] + rev = re.search("revision (\d+)", L).group(1) + report('latest revision of "%s" is %s' % (url, rev)) + return rev + +def get_created_rev(url): + """Lookup the revision at which the path identified by the + provided URL was first created.""" + oldest_rev = -1 + report('determining oldest revision for URL "%s"' % url) + ### TODO: Refactor this to use a modified RevisionLog class. + lines = None + cmd = "log -r1:HEAD --stop-on-copy -q " + url + try: + lines = launchsvn(cmd + " --limit=1") + except LaunchError: + # Assume that --limit isn't supported by the installed 'svn'. + lines = launchsvn(cmd) + if lines and len(lines) > 1: + i = lines[1].find(" ") + if i != -1: + oldest_rev = int(lines[1][1:i]) + if oldest_rev == -1: + error('unable to determine oldest revision for URL "%s"' % url) + return oldest_rev + +def get_commit_log(url, revnum): + """Return the log message for a specific integer revision + number.""" + out = launchsvn("log --incremental -r%d %s" % (revnum, url)) + return recode_stdout_to_file("".join(out[1:])) + +def construct_merged_log_message(url, revnums): + """Return a commit log message containing all the commit messages + in the specified revisions at the given URL. The separator used + in this log message is determined by searching for the longest + svnmerge separator existing in the commit log messages and + extending it by one more separator. This results in a new commit + log message that is clearer in describing merges that contain + other merges. Trailing newlines are removed from the embedded + log messages.""" + messages = [''] + longest_sep = '' + for r in revnums.sorted(): + message = get_commit_log(url, r) + if message: + message = re.sub(r'(\r\n|\r|\n)', "\n", message) + message = rstrip(message, "\n") + "\n" + messages.append(prefix_lines(LOG_LINE_PREFIX, message)) + for match in LOG_SEPARATOR_RE.findall(message): + sep = match[1] + if len(sep) > len(longest_sep): + longest_sep = sep + + longest_sep += LOG_SEPARATOR + "\n" + messages.append('') + return longest_sep.join(messages) + +def get_default_source(branch_target, branch_props): + """Return the default source for branch_target (given its branch_props). + Error out if there is ambiguity.""" + if not branch_props: + error("no integration info available") + + props = branch_props.copy() + pathid = PathIdentifier.from_target(branch_target) + + # To make bidirectional merges easier, find the target's + # repository local path so it can be removed from the list of + # possible integration sources. + if props.has_key(pathid): + del props[pathid] + + if len(props) > 1: + err_msg = "multiple sources found. " + err_msg += "Explicit source argument (-S/--source) required.\n" + err_msg += "The merge sources available are:" + for prop in props: + err_msg += "\n " + str(prop) + error(err_msg) + + return props.keys()[0] + +def should_find_reflected(branch_dir): + should_find_reflected = opts["bidirectional"] + + # If the source has integration info for the target, set find_reflected + # even if --bidirectional wasn't specified + if not should_find_reflected: + source_props = get_merge_props(opts["source-url"]) + should_find_reflected = source_props.has_key(PathIdentifier.from_target(branch_dir)) + + return should_find_reflected + +def analyze_revs(target_pathid, url, begin=1, end=None, + find_reflected=False): + """For the source of the merges in the source URL being merged into + target_pathid, analyze the revisions in the interval begin-end (which + defaults to 1-HEAD), to find out which revisions are changes in + the url, which are changes elsewhere (so-called 'phantom' + revisions), optionally which are reflected changes (to avoid + conflicts that can occur when doing bidirectional merging between + branches), and which revisions initialize merge tracking against other + branches. Return a tuple of four RevisionSet's: + (real_revs, phantom_revs, reflected_revs, initialized_revs). + + NOTE: To maximize speed, if "end" is not provided, the function is + not able to find phantom revisions following the last real + revision in the URL. + """ + + begin = str(begin) + if end is None: + end = "HEAD" + else: + end = str(end) + if long(begin) > long(end): + return RevisionSet(""), RevisionSet(""), \ + RevisionSet(""), RevisionSet("") + + logs[url] = RevisionLog(url, begin, end, find_reflected) + revs = RevisionSet(logs[url].revs) + + if end == "HEAD": + # If end is not provided, we do not know which is the latest revision + # in the repository. So return the phantom revision set only up to + # the latest known revision. + end = str(list(revs)[-1]) + + phantom_revs = RevisionSet("%s-%s" % (begin, end)) - revs + + if find_reflected: + reflected_revs = logs[url].merge_metadata().changed_revs(target_pathid) + reflected_revs += logs[url].block_metadata().changed_revs(target_pathid) + else: + reflected_revs = [] + + initialized_revs = RevisionSet(logs[url].merge_metadata().initialized_revs()) + reflected_revs = RevisionSet(reflected_revs) + + return revs, phantom_revs, reflected_revs, initialized_revs + +def analyze_source_revs(branch_target, source_url, **kwargs): + """For the given branch and source, extract the real and phantom + source revisions.""" + branch_url = target_to_url(branch_target) + branch_pathid = PathIdentifier.from_target(branch_target) + + # Extract the latest repository revision from the URL of the branch + # directory (which is already cached at this point). + end_rev = get_latest_rev(source_url) + + # Calculate the base of analysis. If there is a "1-XX" interval in the + # merged_revs, we do not need to check those. + base = 1 + r = opts["merged-revs"].normalized() + if r and r[0][0] == 1: + base = r[0][1] + 1 + + # See if the user filtered the revision set. If so, we are not + # interested in something outside that range. + if opts["revision"]: + revs = RevisionSet(opts["revision"]).sorted() + if base < revs[0]: + base = revs[0] + if end_rev > revs[-1]: + end_rev = revs[-1] + + return analyze_revs(branch_pathid, source_url, base, end_rev, **kwargs) + +def minimal_merge_intervals(revs, phantom_revs): + """Produce the smallest number of intervals suitable for merging. revs + is the RevisionSet which we want to merge, and phantom_revs are phantom + revisions which can be used to concatenate intervals, thus minimizing the + number of operations.""" + revnums = revs.normalized() + ret = [] + + cur = revnums.pop() + while revnums: + next = revnums.pop() + assert next[1] < cur[0] # otherwise it is not ordered + assert cur[0] - next[1] > 1 # otherwise it is not normalized + for i in range(next[1]+1, cur[0]): + if i not in phantom_revs: + ret.append(cur) + cur = next + break + else: + cur = (next[0], cur[1]) + + ret.append(cur) + ret.reverse() + return ret + +def display_revisions(revs, display_style, revisions_msg, source_url): + """Show REVS as dictated by DISPLAY_STYLE, either numerically, in + log format, or as diffs. When displaying revisions numerically, + prefix output with REVISIONS_MSG when in verbose mode. Otherwise, + request logs or diffs using SOURCE_URL.""" + if display_style == "revisions": + if revs: + report(revisions_msg) + print revs + elif display_style == "logs": + for start,end in revs.normalized(): + svn_command('log --incremental -v -r %d:%d %s' % \ + (start, end, source_url)) + elif display_style in ("diffs", "summarize"): + if display_style == 'summarize': + summarize = '--summarize ' + else: + summarize = '' + + for start, end in revs.normalized(): + print + if start == end: + print "%s: changes in revision %d follow" % (NAME, start) + else: + print "%s: changes in revisions %d-%d follow" % (NAME, + start, end) + print + + # Note: the starting revision number to 'svn diff' is + # NOT inclusive so we have to subtract one from ${START}. + svn_command("diff -r %d:%d %s %s" % (start - 1, end, summarize, + source_url)) + else: + assert False, "unhandled display style: %s" % display_style + +def action_init(target_dir, target_props): + """Initialize for merges.""" + # Check that directory is ready for being modified + check_dir_clean(target_dir) + + target_pathid = PathIdentifier.from_target(target_dir) + source_pathid = opts['source-pathid'] + if source_pathid == target_pathid: + error("cannot init integration source path '%s'\nIts path identifier does not " + "differ from the path identifier of the current directory, '%s'." + % (source_pathid, target_pathid)) + + source_url = opts['source-url'] + + # If the user hasn't specified the revisions to use, see if the + # "source" is a copy from the current tree and if so, we can use + # the version data obtained from it. + revision_range = opts["revision"] + if not revision_range: + # If source was originally copied from target, and we are merging + # changes from source to target (the copy target is the merge source, + # and the copy source is the merge target), then we want to mark as + # integrated up to the rev in which the copy was committed which + # created the merge source: + cf_source, cf_rev, copy_committed_in_rev = get_copyfrom(source_url) + + cf_pathid = None + if cf_source: + cf_url = get_repo_root(source_url) + cf_source + if is_url(cf_url) and check_url(cf_url): + cf_pathid = PathIdentifier.from_target(cf_url) + + if target_pathid == cf_pathid: + report('the source "%s" was copied from "%s" in rev %s and committed in rev %s' % + (source_url, target_dir, cf_rev, copy_committed_in_rev)) + revision_range = "1-" + str(copy_committed_in_rev) + + if not revision_range: + # If the reverse is true: copy source is the merge source, and + # the copy target is the merge target, then we want to mark as + # integrated up to the specific rev of the merge target from + # which the merge source was copied. (Longer discussion at: + # http://subversion.tigris.org/issues/show_bug.cgi?id=2810 ) + cf_source, cf_rev, copy_committed_in_rev = get_copyfrom(target_dir) + + cf_pathid = None + if cf_source: + cf_url = get_repo_root(target_dir) + cf_source + if is_url(cf_url) and check_url(cf_url): + cf_pathid = PathIdentifier.from_target(cf_url) + + source_pathid = PathIdentifier.from_target(source_url) + if source_pathid == cf_pathid: + report('the target "%s" was copied the source "%s" in rev %s and committed in rev %s' % + (target_dir, source_url, cf_rev, copy_committed_in_rev)) + revision_range = "1-" + cf_rev + + # When neither the merge source nor target is a copy of the other, and + # the user did not specify a revision range, then choose a default which is + # the current revision; saying, in effect, "everything has been merged, so + # mark as integrated up to the latest rev on source url). + if not revision_range: + revision_range = "1-" + get_latest_rev(source_url) + + revs = RevisionSet(revision_range) + + report('marking "%s" as already containing revisions "%s" of "%s"' % + (target_dir, revs, source_url)) + + revs = str(revs) + # If the local svnmerge-integrated property already has an entry + # for the source-pathid, simply error out. + if not opts["force"] and target_props.has_key(source_pathid): + error('Repository-relative path %s has already been initialized at %s\n' + 'Use --force to re-initialize' % (source_pathid, target_dir)) + # set the pathid's external_form based on the user's options + source_pathid.external_form = source_pathid.format(opts['location-type']) + + revs = str(revs) + target_props[source_pathid] = revs + + # Set property + set_merge_props(target_dir, target_props) + + # Write out commit message if desired + if opts["commit-file"]: + f = open(opts["commit-file"], "w") + print >>f, 'Initialized merge tracking via "%s" with revisions "%s" from ' \ + % (NAME, revs) + print >>f, '%s' % source_url + f.close() + report('wrote commit message to "%s"' % opts["commit-file"]) + +def action_avail(branch_dir, branch_props): + """Show commits available for merges.""" + source_revs, phantom_revs, reflected_revs, initialized_revs = \ + analyze_source_revs(branch_dir, opts["source-url"], + find_reflected= + should_find_reflected(branch_dir)) + report('skipping phantom revisions: %s' % phantom_revs) + if reflected_revs: + report('skipping reflected revisions: %s' % reflected_revs) + report('skipping initialized revisions: %s' % initialized_revs) + + blocked_revs = get_blocked_revs(branch_dir, opts["source-pathid"]) + avail_revs = source_revs - opts["merged-revs"] - blocked_revs - \ + reflected_revs - initialized_revs + + # Compose the set of revisions to show + revs = RevisionSet("") + report_msg = "revisions available to be merged are:" + if "avail" in opts["avail-showwhat"]: + revs |= avail_revs + if "blocked" in opts["avail-showwhat"]: + revs |= blocked_revs + report_msg = "revisions blocked are:" + + # Limit to revisions specified by -r (if any) + if opts["revision"]: + revs = revs & RevisionSet(opts["revision"]) + + display_revisions(revs, opts["avail-display"], + report_msg, + opts["source-url"]) + +def action_integrated(branch_dir, branch_props): + """Show change sets already merged. This set of revisions is + calculated from taking svnmerge-integrated property from the + branch, and subtracting any revision older than the branch + creation revision.""" + # Extract the integration info for the branch_dir + branch_props = get_merge_props(branch_dir) + revs = merge_props_to_revision_set(branch_props, opts["source-pathid"]) + + # Lookup the oldest revision on the branch path. + oldest_src_rev = get_created_rev(opts["source-url"]) + + # Subtract any revisions which pre-date the branch. + report("subtracting revisions which pre-date the source URL (%d)" % + oldest_src_rev) + revs = revs - RevisionSet(range(1, oldest_src_rev)) + + # Limit to revisions specified by -r (if any) + if opts["revision"]: + revs = revs & RevisionSet(opts["revision"]) + + display_revisions(revs, opts["integrated-display"], + "revisions already integrated are:", opts["source-url"]) + +def action_merge(branch_dir, branch_props): + """Record merge meta data, and do the actual merge (if not + requested otherwise via --record-only).""" + # Check branch directory is ready for being modified + check_dir_clean(branch_dir) + + source_revs, phantom_revs, reflected_revs, initialized_revs = \ + analyze_source_revs(branch_dir, opts["source-url"], + find_reflected= + should_find_reflected(branch_dir)) + + if opts["revision"]: + revs = RevisionSet(opts["revision"]) + else: + revs = source_revs + + blocked_revs = get_blocked_revs(branch_dir, opts["source-pathid"]) + merged_revs = opts["merged-revs"] + + # Show what we're doing + if opts["verbose"]: # just to avoid useless calculations + if merged_revs & revs: + report('"%s" already contains revisions %s' % (branch_dir, + merged_revs & revs)) + if phantom_revs: + report('memorizing phantom revision(s): %s' % phantom_revs) + if reflected_revs: + report('memorizing reflected revision(s): %s' % reflected_revs) + if blocked_revs & revs: + report('skipping blocked revisions(s): %s' % (blocked_revs & revs)) + if initialized_revs: + report('skipping initialized revision(s): %s' % initialized_revs) + + # Compute final merge set. + revs = revs - merged_revs - blocked_revs - reflected_revs - \ + phantom_revs - initialized_revs + if not revs: + report('no revisions to merge, exiting') + return + + # When manually marking revisions as merged, we only update the + # integration meta data, and don't perform an actual merge. + record_only = opts["record-only"] + + if record_only: + report('recording merge of revision(s) %s from "%s"' % + (revs, opts["source-url"])) + else: + report('merging in revision(s) %s from "%s"' % + (revs, opts["source-url"])) + + # Do the merge(s). Note: the starting revision number to 'svn merge' + # is NOT inclusive so we have to subtract one from start. + # We try to keep the number of merge operations as low as possible, + # because it is faster and reduces the number of conflicts. + old_block_props = get_block_props(branch_dir) + merge_metadata = logs[opts["source-url"]].merge_metadata() + block_metadata = logs[opts["source-url"]].block_metadata() + for start,end in minimal_merge_intervals(revs, phantom_revs): + if not record_only: + # Preset merge/blocked properties to the source value at + # the start rev to avoid spurious property conflicts + set_merge_props(branch_dir, merge_metadata.get(start - 1)) + set_block_props(branch_dir, block_metadata.get(start - 1)) + # Do the merge + svn_command("merge --force -r %d:%d %s %s" % \ + (start - 1, end, opts["source-url"], branch_dir)) + # TODO: to support graph merging, add logic to merge the property + # meta-data manually + + # Update the set of merged revisions. + merged_revs = merged_revs | revs | reflected_revs | phantom_revs | initialized_revs + branch_props[opts["source-pathid"]] = str(merged_revs) + set_merge_props(branch_dir, branch_props) + # Reset the blocked revs + set_block_props(branch_dir, old_block_props) + + # Write out commit message if desired + if opts["commit-file"]: + f = open(opts["commit-file"], "w") + if record_only: + print >>f, 'Recorded merge of revisions %s via %s from ' % \ + (revs, NAME) + else: + print >>f, 'Merged revisions %s via %s from ' % \ + (revs, NAME) + print >>f, '%s' % opts["source-url"] + if opts["commit-verbose"]: + print >>f + print >>f, construct_merged_log_message(opts["source-url"], revs), + + f.close() + report('wrote commit message to "%s"' % opts["commit-file"]) + +def action_block(branch_dir, branch_props): + """Block revisions.""" + # Check branch directory is ready for being modified + check_dir_clean(branch_dir) + + source_revs, phantom_revs, reflected_revs, initialized_revs = \ + analyze_source_revs(branch_dir, opts["source-url"]) + revs_to_block = source_revs - opts["merged-revs"] + + # Limit to revisions specified by -r (if any) + if opts["revision"]: + revs_to_block = RevisionSet(opts["revision"]) & revs_to_block + + if not revs_to_block: + error('no available revisions to block') + + # Change blocked information + blocked_revs = get_blocked_revs(branch_dir, opts["source-pathid"]) + blocked_revs = blocked_revs | revs_to_block + set_blocked_revs(branch_dir, opts["source-pathid"], blocked_revs) + + # Write out commit message if desired + if opts["commit-file"]: + f = open(opts["commit-file"], "w") + print >>f, 'Blocked revisions %s via %s' % (revs_to_block, NAME) + if opts["commit-verbose"]: + print >>f + print >>f, construct_merged_log_message(opts["source-url"], + revs_to_block), + + f.close() + report('wrote commit message to "%s"' % opts["commit-file"]) + +def action_unblock(branch_dir, branch_props): + """Unblock revisions.""" + # Check branch directory is ready for being modified + check_dir_clean(branch_dir) + + blocked_revs = get_blocked_revs(branch_dir, opts["source-pathid"]) + revs_to_unblock = blocked_revs + + # Limit to revisions specified by -r (if any) + if opts["revision"]: + revs_to_unblock = revs_to_unblock & RevisionSet(opts["revision"]) + + if not revs_to_unblock: + error('no available revisions to unblock') + + # Change blocked information + blocked_revs = blocked_revs - revs_to_unblock + set_blocked_revs(branch_dir, opts["source-pathid"], blocked_revs) + + # Write out commit message if desired + if opts["commit-file"]: + f = open(opts["commit-file"], "w") + print >>f, 'Unblocked revisions %s via %s' % (revs_to_unblock, NAME) + if opts["commit-verbose"]: + print >>f + print >>f, construct_merged_log_message(opts["source-url"], + revs_to_unblock), + f.close() + report('wrote commit message to "%s"' % opts["commit-file"]) + +def action_rollback(branch_dir, branch_props): + """Rollback previously integrated revisions.""" + + # Make sure the revision arguments are present + if not opts["revision"]: + error("The '-r' option is mandatory for rollback") + + # Check branch directory is ready for being modified + check_dir_clean(branch_dir) + + # Extract the integration info for the branch_dir + branch_props = get_merge_props(branch_dir) + # Get the list of all revisions already merged into this source-pathid. + merged_revs = merge_props_to_revision_set(branch_props, + opts["source-pathid"]) + + # At which revision was the src created? + oldest_src_rev = get_created_rev(opts["source-url"]) + src_pre_exist_range = RevisionSet("1-%d" % oldest_src_rev) + + # Limit to revisions specified by -r (if any) + revs = merged_revs & RevisionSet(opts["revision"]) + + # make sure there's some revision to rollback + if not revs: + report("Nothing to rollback in revision range r%s" % opts["revision"]) + return + + # If even one specified revision lies outside the lifetime of the + # merge source, error out. + if revs & src_pre_exist_range: + err_str = "Specified revision range falls out of the rollback range.\n" + err_str += "%s was created at r%d" % (opts["source-pathid"], + oldest_src_rev) + error(err_str) + + record_only = opts["record-only"] + + if record_only: + report('recording rollback of revision(s) %s from "%s"' % + (revs, opts["source-url"])) + else: + report('rollback of revision(s) %s from "%s"' % + (revs, opts["source-url"])) + + # Do the reverse merge(s). Note: the starting revision number + # to 'svn merge' is NOT inclusive so we have to subtract one from start. + # We try to keep the number of merge operations as low as possible, + # because it is faster and reduces the number of conflicts. + rollback_intervals = minimal_merge_intervals(revs, []) + # rollback in the reverse order of merge + rollback_intervals.reverse() + for start, end in rollback_intervals: + if not record_only: + # Do the merge + svn_command("merge --force -r %d:%d %s %s" % \ + (end, start - 1, opts["source-url"], branch_dir)) + + # Write out commit message if desired + # calculate the phantom revs first + if opts["commit-file"]: + f = open(opts["commit-file"], "w") + if record_only: + print >>f, 'Recorded rollback of revisions %s via %s from ' % \ + (revs , NAME) + else: + print >>f, 'Rolled back revisions %s via %s from ' % \ + (revs , NAME) + print >>f, '%s' % opts["source-url"] + + f.close() + report('wrote commit message to "%s"' % opts["commit-file"]) + + # Update the set of merged revisions. + merged_revs = merged_revs - revs + branch_props[opts["source-pathid"]] = str(merged_revs) + set_merge_props(branch_dir, branch_props) + +def action_uninit(branch_dir, branch_props): + """Uninit SOURCE URL.""" + # Check branch directory is ready for being modified + check_dir_clean(branch_dir) + + # If the source-pathid does not have an entry in the svnmerge-integrated + # property, simply error out. + if not branch_props.has_key(opts["source-pathid"]): + error('Repository-relative path "%s" does not contain merge ' + 'tracking information for "%s"' \ + % (opts["source-pathid"], branch_dir)) + + del branch_props[opts["source-pathid"]] + + # Set merge property with the selected source deleted + set_merge_props(branch_dir, branch_props) + + # Set blocked revisions for the selected source to None + set_blocked_revs(branch_dir, opts["source-pathid"], None) + + # Write out commit message if desired + if opts["commit-file"]: + f = open(opts["commit-file"], "w") + print >>f, 'Removed merge tracking for "%s" for ' % NAME + print >>f, '%s' % opts["source-url"] + f.close() + report('wrote commit message to "%s"' % opts["commit-file"]) + +############################################################################### +# Command line parsing -- options and commands management +############################################################################### + +class OptBase: + def __init__(self, *args, **kwargs): + self.help = kwargs["help"] + del kwargs["help"] + self.lflags = [] + self.sflags = [] + for a in args: + if a.startswith("--"): self.lflags.append(a) + elif a.startswith("-"): self.sflags.append(a) + else: + raise TypeError, "invalid flag name: %s" % a + if kwargs.has_key("dest"): + self.dest = kwargs["dest"] + del kwargs["dest"] + else: + if not self.lflags: + raise TypeError, "cannot deduce dest name without long options" + self.dest = self.lflags[0][2:] + if kwargs: + raise TypeError, "invalid keyword arguments: %r" % kwargs.keys() + def repr_flags(self): + f = self.sflags + self.lflags + r = f[0] + for fl in f[1:]: + r += " [%s]" % fl + return r + +class Option(OptBase): + def __init__(self, *args, **kwargs): + self.default = kwargs.setdefault("default", 0) + del kwargs["default"] + self.value = kwargs.setdefault("value", None) + del kwargs["value"] + OptBase.__init__(self, *args, **kwargs) + def apply(self, state, value): + assert value == "" + if self.value is not None: + state[self.dest] = self.value + else: + state[self.dest] += 1 + +class OptionArg(OptBase): + def __init__(self, *args, **kwargs): + self.default = kwargs["default"] + del kwargs["default"] + self.metavar = kwargs.setdefault("metavar", None) + del kwargs["metavar"] + OptBase.__init__(self, *args, **kwargs) + + if self.metavar is None: + if self.dest is not None: + self.metavar = self.dest.upper() + else: + self.metavar = "arg" + if self.default: + self.help += " (default: %s)" % self.default + def apply(self, state, value): + assert value is not None + state[self.dest] = value + def repr_flags(self): + r = OptBase.repr_flags(self) + return r + " " + self.metavar + +class CommandOpts: + class Cmd: + def __init__(self, *args): + self.name, self.func, self.usage, self.help, self.opts = args + def short_help(self): + return self.help.split(".")[0] + def __str__(self): + return self.name + def __call__(self, *args, **kwargs): + return self.func(*args, **kwargs) + + def __init__(self, global_opts, common_opts, command_table, version=None): + self.progname = NAME + self.version = version.replace("%prog", self.progname) + self.cwidth = console_width() - 2 + self.ctable = command_table.copy() + self.gopts = global_opts[:] + self.copts = common_opts[:] + self._add_builtins() + for k in self.ctable.keys(): + cmd = self.Cmd(k, *self.ctable[k]) + opts = [] + for o in cmd.opts: + if isinstance(o, types.StringType) or \ + isinstance(o, types.UnicodeType): + o = self._find_common(o) + opts.append(o) + cmd.opts = opts + self.ctable[k] = cmd + + def _add_builtins(self): + self.gopts.append( + Option("-h", "--help", help="show help for this command and exit")) + if self.version is not None: + self.gopts.append( + Option("-V", "--version", help="show version info and exit")) + self.ctable["help"] = (self._cmd_help, + "help [COMMAND]", + "Display help for a specific command. If COMMAND is omitted, " + "display brief command description.", + []) + + def _cmd_help(self, cmd=None, *args): + if args: + self.error("wrong number of arguments", "help") + if cmd is not None: + cmd = self._command(cmd) + self.print_command_help(cmd) + else: + self.print_command_list() + + def _paragraph(self, text, width=78): + chunks = re.split("\s+", text.strip()) + chunks.reverse() + lines = [] + while chunks: + L = chunks.pop() + while chunks and len(L) + len(chunks[-1]) + 1 <= width: + L += " " + chunks.pop() + lines.append(L) + return lines + + def _paragraphs(self, text, *args, **kwargs): + pars = text.split("\n\n") + lines = self._paragraph(pars[0], *args, **kwargs) + for p in pars[1:]: + lines.append("") + lines.extend(self._paragraph(p, *args, **kwargs)) + return lines + + def _print_wrapped(self, text, indent=0): + text = self._paragraphs(text, self.cwidth - indent) + print text.pop(0) + for t in text: + print " " * indent + t + + def _find_common(self, fl): + for o in self.copts: + if fl in o.lflags+o.sflags: + return o + assert False, fl + + def _compute_flags(self, opts, check_conflicts=True): + back = {} + sfl = "" + lfl = [] + for o in opts: + sapp = lapp = "" + if isinstance(o, OptionArg): + sapp, lapp = ":", "=" + for s in o.sflags: + if check_conflicts and back.has_key(s): + raise RuntimeError, "option conflict: %s" % s + back[s] = o + sfl += s[1:] + sapp + for l in o.lflags: + if check_conflicts and back.has_key(l): + raise RuntimeError, "option conflict: %s" % l + back[l] = o + lfl.append(l[2:] + lapp) + return sfl, lfl, back + + def _extract_command(self, args): + """ + Try to extract the command name from the argument list. This is + non-trivial because we want to allow command-specific options even + before the command itself. + """ + opts = self.gopts[:] + for cmd in self.ctable.values(): + opts.extend(cmd.opts) + sfl, lfl, _ = self._compute_flags(opts, check_conflicts=False) + + lopts,largs = getopt.getopt(args, sfl, lfl) + if not largs: + return None + return self._command(largs[0]) + + def _fancy_getopt(self, args, opts, state=None): + if state is None: + state= {} + for o in opts: + if not state.has_key(o.dest): + state[o.dest] = o.default + + sfl, lfl, back = self._compute_flags(opts) + try: + lopts,args = getopt.gnu_getopt(args, sfl, lfl) + except AttributeError: + # Before Python 2.3, there was no gnu_getopt support. + # So we can't parse intermixed positional arguments + # and options. + lopts,args = getopt.getopt(args, sfl, lfl) + + for o,v in lopts: + back[o].apply(state, v) + return state, args + + def _command(self, cmd): + if not self.ctable.has_key(cmd): + self.error("unknown command: '%s'" % cmd) + return self.ctable[cmd] + + def parse(self, args): + if not args: + self.print_small_help() + sys.exit(0) + + cmd = None + try: + cmd = self._extract_command(args) + opts = self.gopts[:] + if cmd: + opts.extend(cmd.opts) + args.remove(cmd.name) + state, args = self._fancy_getopt(args, opts) + except getopt.GetoptError, e: + self.error(e, cmd) + + # Handle builtins + if self.version is not None and state["version"]: + self.print_version() + sys.exit(0) + if state["help"]: # special case for --help + if cmd: + self.print_command_help(cmd) + sys.exit(0) + cmd = self.ctable["help"] + else: + if cmd is None: + self.error("command argument required") + if str(cmd) == "help": + cmd(*args) + sys.exit(0) + return cmd, args, state + + def error(self, s, cmd=None): + print >>sys.stderr, "%s: %s" % (self.progname, s) + if cmd is not None: + self.print_command_help(cmd) + else: + self.print_small_help() + sys.exit(1) + def print_small_help(self): + print "Type '%s help' for usage" % self.progname + def print_usage_line(self): + print "usage: %s <subcommand> [options...] [args...]\n" % self.progname + def print_command_list(self): + print "Available commands (use '%s help COMMAND' for more details):\n" \ + % self.progname + cmds = self.ctable.keys() + cmds.sort() + indent = max(map(len, cmds)) + for c in cmds: + h = self.ctable[c].short_help() + print " %-*s " % (indent, c), + self._print_wrapped(h, indent+6) + def print_command_help(self, cmd): + cmd = self.ctable[str(cmd)] + print 'usage: %s %s\n' % (self.progname, cmd.usage) + self._print_wrapped(cmd.help) + def print_opts(opts, self=self): + if not opts: return + flags = [o.repr_flags() for o in opts] + indent = max(map(len, flags)) + for f,o in zip(flags, opts): + print " %-*s :" % (indent, f), + self._print_wrapped(o.help, indent+5) + print '\nCommand options:' + print_opts(cmd.opts) + print '\nGlobal options:' + print_opts(self.gopts) + + def print_version(self): + print self.version + +############################################################################### +# Options and Commands description +############################################################################### + +global_opts = [ + Option("-F", "--force", + help="force operation even if the working copy is not clean, or " + "there are pending updates"), + Option("-n", "--dry-run", + help="don't actually change anything, just pretend; " + "implies --show-changes"), + Option("-s", "--show-changes", + help="show subversion commands that make changes"), + Option("-v", "--verbose", + help="verbose mode: output more information about progress"), + OptionArg("-u", "--username", + default=None, + help="invoke subversion commands with the supplied username"), + OptionArg("-p", "--password", + default=None, + help="invoke subversion commands with the supplied password"), + OptionArg("-c", "--config-dir", metavar="DIR", + default=None, + help="cause subversion commands to consult runtime config directory DIR"), +] + +common_opts = [ + Option("-b", "--bidirectional", + value=True, + default=False, + help="remove reflected and initialized revisions from merge candidates. " + "Not required but may be specified to speed things up slightly"), + OptionArg("-f", "--commit-file", metavar="FILE", + default="svnmerge-commit-message.txt", + help="set the name of the file where the suggested log message " + "is written to"), + Option("-M", "--record-only", + value=True, + default=False, + help="do not perform an actual merge of the changes, yet record " + "that a merge happened"), + OptionArg("-r", "--revision", + metavar="REVLIST", + default="", + help="specify a revision list, consisting of revision numbers " + 'and ranges separated by commas, e.g., "534,537-539,540"'), + OptionArg("-S", "--source", "--head", + default=None, + help="specify a merge source for this branch. It can be either " + "a working directory path, a full URL, or an unambiguous " + "substring of one of the locations for which merge tracking was " + "already initialized. Needed only to disambiguate in case of " + "multiple merge sources"), +] + +command_table = { + "init": (action_init, + "init [OPTION...] [SOURCE]", + """Initialize merge tracking from SOURCE on the current working + directory. + + If SOURCE is specified, all the revisions in SOURCE are marked as already + merged; if this is not correct, you can use --revision to specify the + exact list of already-merged revisions. + + If SOURCE is omitted, then it is computed from the "svn cp" history of the + current working directory (searching back for the branch point); in this + case, %s assumes that no revision has been integrated yet since + the branch point (unless you teach it with --revision).""" % NAME, + [ + "-f", "-r", # import common opts + OptionArg("-L", "--location-type", + dest="location-type", + default="path", + help="Use this type of location identifier in the new " + + "Subversion properties; 'uuid', 'url', or 'path' " + + "(default)"), + ]), + + "avail": (action_avail, + "avail [OPTION...] [PATH]", + """Show unmerged revisions available for PATH as a revision list. + If --revision is given, the revisions shown will be limited to those + also specified in the option. + + When svnmerge is used to bidirectionally merge changes between a + branch and its source, it is necessary to not merge the same changes + forth and back: e.g., if you committed a merge of a certain + revision of the branch into the source, you do not want that commit + to appear as available to merged into the branch (as the code + originated in the branch itself!). svnmerge will automatically + exclude these so-called "reflected" revisions.""", + [ + Option("-A", "--all", + dest="avail-showwhat", + value=["blocked", "avail"], + default=["avail"], + help="show both available and blocked revisions (aka ignore " + "blocked revisions)"), + "-b", + Option("-B", "--blocked", + dest="avail-showwhat", + value=["blocked"], + help="show the blocked revision list (see '%s block')" % NAME), + Option("-d", "--diff", + dest="avail-display", + value="diffs", + default="revisions", + help="show corresponding diff instead of revision list"), + Option("--summarize", + dest="avail-display", + value="summarize", + help="show summarized diff instead of revision list"), + Option("-l", "--log", + dest="avail-display", + value="logs", + help="show corresponding log history instead of revision list"), + "-r", + "-S", + ]), + + "integrated": (action_integrated, + "integrated [OPTION...] [PATH]", + """Show merged revisions available for PATH as a revision list. + If --revision is given, the revisions shown will be limited to + those also specified in the option.""", + [ + Option("-d", "--diff", + dest="integrated-display", + value="diffs", + default="revisions", + help="show corresponding diff instead of revision list"), + Option("-l", "--log", + dest="integrated-display", + value="logs", + help="show corresponding log history instead of revision list"), + "-r", + "-S", + ]), + + "rollback": (action_rollback, + "rollback [OPTION...] [PATH]", + """Rollback previously merged in revisions from PATH. The + --revision option is mandatory, and specifies which revisions + will be rolled back. Only the previously integrated merges + will be rolled back. + + When manually rolling back changes, --record-only can be used to + instruct %s that a manual rollback of a certain revision + already happened, so that it can record it and offer that + revision for merge henceforth.""" % (NAME), + [ + "-f", "-r", "-S", "-M", # import common opts + ]), + + "merge": (action_merge, + "merge [OPTION...] [PATH]", + """Merge in revisions into PATH from its source. If --revision is omitted, + all the available revisions will be merged. In any case, already merged-in + revisions will NOT be merged again. + + When svnmerge is used to bidirectionally merge changes between a + branch and its source, it is necessary to not merge the same changes + forth and back: e.g., if you committed a merge of a certain + revision of the branch into the source, you do not want that commit + to appear as available to merged into the branch (as the code + originated in the branch itself!). svnmerge will automatically + exclude these so-called "reflected" revisions. + + When manually merging changes across branches, --record-only can + be used to instruct %s that a manual merge of a certain revision + already happened, so that it can record it and not offer that + revision for merge anymore. Conversely, when there are revisions + which should not be merged, use '%s block'.""" % (NAME, NAME), + [ + "-b", "-f", "-r", "-S", "-M", # import common opts + ]), + + "block": (action_block, + "block [OPTION...] [PATH]", + """Block revisions within PATH so that they disappear from the available + list. This is useful to hide revisions which will not be integrated. + If --revision is omitted, it defaults to all the available revisions. + + Do not use this option to hide revisions that were manually merged + into the branch. Instead, use '%s merge --record-only', which + records that a merge happened (as opposed to a merge which should + not happen).""" % NAME, + [ + "-f", "-r", "-S", # import common opts + ]), + + "unblock": (action_unblock, + "unblock [OPTION...] [PATH]", + """Revert the effect of '%s block'. If --revision is omitted, all the + blocked revisions are unblocked""" % NAME, + [ + "-f", "-r", "-S", # import common opts + ]), + + "uninit": (action_uninit, + "uninit [OPTION...] [PATH]", + """Remove merge tracking information from PATH. It cleans any kind of merge + tracking information (including the list of blocked revisions). If there + are multiple sources, use --source to indicate which source you want to + forget about.""", + [ + "-f", "-S", # import common opts + ]), +} + + +def main(args): + global opts + + # Initialize default options + opts = default_opts.copy() + logs.clear() + + optsparser = CommandOpts(global_opts, common_opts, command_table, + version="%%prog r%s\n modified: %s\n\n" + "Copyright (C) 2004,2005 Awarix Inc.\n" + "Copyright (C) 2005, Giovanni Bajo" + % (__revision__, __date__)) + + cmd, args, state = optsparser.parse(args) + opts.update(state) + + source = opts.get("source", None) + branch_dir = "." + + if str(cmd) == "init": + if len(args) == 1: + source = args[0] + elif len(args) > 1: + optsparser.error("wrong number of parameters", cmd) + elif str(cmd) in command_table.keys(): + if len(args) == 1: + branch_dir = args[0] + elif len(args) > 1: + optsparser.error("wrong number of parameters", cmd) + else: + assert False, "command not handled: %s" % cmd + + # Validate branch_dir + if not is_wc(branch_dir): + if str(cmd) == "avail": + info = None + # it should be noted here that svn info does not error exit + # if an invalid target is specified to it (as is + # intuitive). so the try, except code is not absolutely + # necessary. but, I retain it to indicate the intuitive + # handling. + try: + info = get_svninfo(branch_dir) + except LaunchError: + pass + # test that we definitely targeted a subversion directory, + # mirroring the purpose of the earlier is_wc() call + if info is None or not info.has_key("Node Kind") or info["Node Kind"] != "directory": + error('"%s" is neither a valid URL, nor a working directory' % branch_dir) + else: + error('"%s" is not a subversion working directory' % branch_dir) + + # give out some hints as to potential pathids + PathIdentifier.hint(branch_dir) + if source: PathIdentifier.hint(source) + + # Extract the integration info for the branch_dir + branch_props = get_merge_props(branch_dir) + + # Calculate source_url and source_path + report("calculate source path for the branch") + if not source: + if str(cmd) == "init": + cf_source, cf_rev, copy_committed_in_rev = get_copyfrom(branch_dir) + if not cf_source: + error('no copyfrom info available. ' + 'Explicit source argument (-S/--source) required.') + opts["source-url"] = get_repo_root(branch_dir) + cf_source + opts["source-pathid"] = PathIdentifier.from_target(opts["source-url"]) + + if not opts["revision"]: + opts["revision"] = "1-" + cf_rev + else: + opts["source-pathid"] = get_default_source(branch_dir, branch_props) + opts["source-url"] = opts["source-pathid"].get_url() + + assert is_pathid(opts["source-pathid"]) + assert is_url(opts["source-url"]) + else: + # The source was given as a command line argument and is stored in + # SOURCE. Ensure that the specified source does not end in a /, + # otherwise it's easy to have the same source path listed more + # than once in the integrated version properties, with and without + # trailing /'s. + source = rstrip(source, "/") + if not is_wc(source) and not is_url(source): + # Check if it is a substring of a pathid recorded + # within the branch properties. + found = [] + for pathid in branch_props.keys(): + if pathid.match_substring(source): + found.append(pathid) + if len(found) == 1: + # (assumes pathid is a repository-relative-path) + source_pathid = found[0] + source = source_pathid.get_url() + else: + error('"%s" is neither a valid URL, nor an unambiguous ' + 'substring of a repository path, nor a working directory' + % source) + else: + source_pathid = PathIdentifier.from_target(source) + + source_pathid = PathIdentifier.from_target(source) + if str(cmd) == "init" and \ + source_pathid == PathIdentifier.from_target("."): + error("cannot init integration source path '%s'\n" + "Its repository-relative path must differ from the " + "repository-relative path of the current directory." + % source_pathid) + opts["source-pathid"] = source_pathid + opts["source-url"] = target_to_url(source) + + # Sanity check source_url + assert is_url(opts["source-url"]) + # SVN does not support non-normalized URL (and we should not + # have created them) + assert opts["source-url"].find("/..") < 0 + + report('source is "%s"' % opts["source-url"]) + + # Get previously merged revisions (except when command is init) + if str(cmd) != "init": + opts["merged-revs"] = merge_props_to_revision_set(branch_props, + opts["source-pathid"]) + + # Perform the action + cmd(branch_dir, branch_props) + + +if __name__ == "__main__": + try: + main(sys.argv[1:]) + except LaunchError, (ret, cmd, out): + err_msg = "command execution failed (exit code: %d)\n" % ret + err_msg += cmd + "\n" + err_msg += "".join(out) + error(err_msg) + except KeyboardInterrupt: + # Avoid traceback on CTRL+C + print "aborted by user" + sys.exit(1) diff --git a/staging/subversion/svnserve b/staging/subversion/svnserve new file mode 100755 index 000000000..670fee742 --- /dev/null +++ b/staging/subversion/svnserve @@ -0,0 +1,42 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/svnserve + +PID=`pidof -o %PPID /usr/bin/svnserve` +case "$1" in + start) + stat_busy "Starting svnserve" + if [ -z "$PID" ]; then + if [ -n "$SVNSERVE_USER" ]; then + su -s '/bin/sh' $SVNSERVE_USER -c "/usr/bin/svnserve -d $SVNSERVE_ARGS" & + else + /usr/bin/svnserve -d $SVNSERVE_ARGS & + fi + fi + if [ ! -z "$PID" -o $? -gt 0 ]; then + stat_fail + else + add_daemon svnserve + stat_done + fi + ;; + stop) + stat_busy "Stopping svnserve" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon svnserve + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac diff --git a/staging/subversion/svnserve.conf b/staging/subversion/svnserve.conf new file mode 100644 index 000000000..37fb7ea10 --- /dev/null +++ b/staging/subversion/svnserve.conf @@ -0,0 +1,7 @@ +# +# Parameters to be passed to svnserve +# +#SVNSERVE_ARGS="-r /path/to/some/repos" +SVNSERVE_ARGS="" + +#SVNSERVE_USER="svn" diff --git a/staging/ypserv/PKGBUILD b/staging/ypserv/PKGBUILD new file mode 100644 index 000000000..afd58ede7 --- /dev/null +++ b/staging/ypserv/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 142950 2011-11-19 03:45:48Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: judd <jvinet@zeroflux.org> +# Contributor: Tom Newsom <Jeepster@gmx.co.uk> + +pkgname=ypserv +pkgver=2.26 +pkgrel=2 +pkgdesc='Linux NIS Server' +arch=('i686' 'x86_64') +url='http://www.linux-nis.org/nis/ypserv/' +license=('GPL2') +depends=('gdbm' 'openslp') +backup=('etc/ypserv.conf' 'etc/netgroup' 'var/yp/securenets') +source=("ftp://ftp.kernel.org/pub/linux/utils/net/NIS/${pkgname}-${pkgver}.tar.gz" \ + 'yppasswd' + 'ypserv') +sha1sums=('0d7ab3f04ff7fa5f611e71ea0f3c188659602743' + '96192b628afe36709496e4801d016c4bff343f0e' + 'b625381bfa6cf62345377a7df30b8f45935206c5') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + install -D -m644 etc/netgroup "${pkgdir}"/etc/netgroup + install -D -m644 etc/ypserv.conf "${pkgdir}"/etc/ypserv.conf + install -D -m644 etc/securenets "${pkgdir}"/var/yp/securenets + install -D -m755 ../ypserv "${pkgdir}"/etc/rc.d/ypserv + install -D -m755 ../yppasswd "${pkgdir}"/etc/rc.d/yppasswd +} diff --git a/staging/ypserv/yppasswd b/staging/ypserv/yppasswd new file mode 100755 index 000000000..c2b00b2ca --- /dev/null +++ b/staging/ypserv/yppasswd @@ -0,0 +1,34 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + stat_busy "Starting NIS Password Daemon" + /usr/sbin/rpc.yppasswdd + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon yppasswd + stat_done + fi + ;; + stop) + stat_busy "Stopping NIS Password Daemon" + killall -q /usr/sbin/rpc.yppasswdd + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon yppasswd + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac diff --git a/staging/ypserv/ypserv b/staging/ypserv/ypserv new file mode 100755 index 000000000..c36e6901b --- /dev/null +++ b/staging/ypserv/ypserv @@ -0,0 +1,34 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + stat_busy "Starting NIS Server" + /usr/sbin/ypserv + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon ypserv + stat_done + fi + ;; + stop) + stat_busy "Stopping NIS Server" + killall -q /usr/sbin/ypserv + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon ypserv + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac diff --git a/staging/zsh/PKGBUILD b/staging/zsh/PKGBUILD new file mode 100644 index 000000000..7771ebbdf --- /dev/null +++ b/staging/zsh/PKGBUILD @@ -0,0 +1,58 @@ +# $Id: PKGBUILD 142954 2011-11-19 06:05:35Z pierre $ +# Maintainer: Pierre Schmitz <pierre@archlinux.de> + +pkgname=zsh +pkgver=4.3.12 +pkgrel=3 +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" 'modules.patch') +md5sums=('7a82c0bf0635e046ca4e9ec1bdef3811' + 'b367c1398b60242f7044a93a837227f9') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + # upstream patch to fix handling of compressed kernel modules + patch -p1 -i ${srcdir}/modules.patch + # 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 + ./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/profile \ + --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}" + # This test wont work with the noatime mount option + rm Test/C02cond.ztst + HOME="${srcdir}" make check +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}/" install + install -D -m644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/staging/zsh/modules.patch b/staging/zsh/modules.patch new file mode 100644 index 000000000..315d40b98 --- /dev/null +++ b/staging/zsh/modules.patch @@ -0,0 +1,11 @@ +--- a/Completion/Linux/Command/_modutils ++++ b/Completion/Linux/Command/_modutils +@@ -107,7 +107,7 @@ case "$state" in + ! _retrieve_cache modules-$kver; + then + # 2011-01-02 gi1242: Do we need .o files? Or is .ko enough? +- modules=( $modules_dir/$kver/(*~(source|build))/**/*.(o|ko)(.:t:r) ) ++ modules=( $modules_dir/$kver/(*~(source|build))/**/*.(o|ko|ko.gz)(.:t:r:r) ) + _store_cache modules-$kver modules + fi + diff --git a/staging/zsh/zsh.install b/staging/zsh/zsh.install new file mode 100644 index 000000000..e2a53bea8 --- /dev/null +++ b/staging/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 +} diff --git a/testing/aisleriot/PKGBUILD b/testing/aisleriot/PKGBUILD new file mode 100644 index 000000000..7e0cb0321 --- /dev/null +++ b/testing/aisleriot/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 142800 2011-11-15 14:17:38Z ibiru $ +# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> + +pkgname=aisleriot +pkgver=3.2.2 +pkgrel=1 +pkgdesc="GNOME Solitaire card games" +arch=(i686 x86_64) +license=(GPL) +url="http://www.gnome.org" +groups=('gnome-extra') +depends=(libsm gconf guile libcanberra librsvg hicolor-icon-theme dconf) +makedepends=(gnome-doc-utils intltool itstool) +options=('!emptydirs' '!libtool') +install=aisleriot.install +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('818e16767f30238a98332fe07e8b905376a71de05feb3de19815652a48fdfcca') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-static + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make -j1 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install + + install -m755 -d "${pkgdir}/usr/share/gconf/schemas" + gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain aisleriot ${pkgdir}/etc/gconf/schemas/*.schemas + rm -f ${pkgdir}/etc/gconf/schemas/*.schemas +} diff --git a/testing/aisleriot/aisleriot.install b/testing/aisleriot/aisleriot.install new file mode 100644 index 000000000..713506dba --- /dev/null +++ b/testing/aisleriot/aisleriot.install @@ -0,0 +1,22 @@ +post_install() { + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + usr/sbin/gconfpkg --install aisleriot +} + +pre_upgrade() { + pre_remove +} + +post_upgrade() { + post_install +} + +pre_remove() { + usr/sbin/gconfpkg --uninstall aisleriot +} + +post_remove() { + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -f -t usr/share/icons/hicolor +} diff --git a/testing/curl/PKGBUILD b/testing/curl/PKGBUILD new file mode 100644 index 000000000..0e40bfe8e --- /dev/null +++ b/testing/curl/PKGBUILD @@ -0,0 +1,64 @@ +# $Id: PKGBUILD 142904 2011-11-17 21:30:16Z dreisner $ +# Maintainer: Dave Reisner <dreisner@archlinux.org> +# Contributor: Angel Velasquez <angvp@archlinux.org> +# Contributor: Eric Belanger <eric@archlinux.org> +# Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> + +pkgname=curl +pkgver=7.23.1 +pkgrel=1 +pkgdesc="An URL retrival utility and library" +arch=('i686' 'x86_64') +url="http://curl.haxx.se" +license=('MIT') +depends=('ca-certificates' 'libssh2' 'openssl' 'zlib') +makedepends=('perl-libwww') +options=('!libtool') +source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc} + curlbuild.h) +md5sums=('8e23151f569fb54afef093ac0695077d' + '5d8eb7e2e38be0fb00a043f714f6d49f' + '751bd433ede935c8fae727377625a8ae') + +ptrsize=$(cpp <<<'__SIZEOF_POINTER__' | sed '/^#/d') +case $ptrsize in + 8) _curlbuild=curlbuild-64.h ;; + 4) _curlbuild=curlbuild-32.h ;; + *) error "unknown pointer size for architecture: %s bytes" "$ptrsize" + exit 1 + ;; +esac + +build() { + cd "$srcdir/$pkgname-$pkgver" + + ./configure \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --disable-dependency-tracking \ + --disable-ldap \ + --disable-ldaps \ + --enable-ipv6 \ + --enable-manual \ + --enable-versioned-symbols \ + --enable-threaded-resolver \ + --without-libidn \ + --with-random=/dev/urandom \ + --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install + + # license + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" + + # devel + install -Dm644 docs/libcurl/libcurl.m4 "$pkgdir/usr/share/aclocal/libcurl.m4" + mv "$pkgdir/usr/include/curl/curlbuild.h" "$pkgdir/usr/include/curl/$_curlbuild" + install -m644 "$srcdir/curlbuild.h" "$pkgdir/usr/include/curl/curlbuild.h" +} diff --git a/testing/curl/curlbuild.h b/testing/curl/curlbuild.h new file mode 100644 index 000000000..b48862696 --- /dev/null +++ b/testing/curl/curlbuild.h @@ -0,0 +1,9 @@ +#include <bits/wordsize.h> + +#if __WORDSIZE == 32 +#include "curlbuild-32.h" +#elif __WORDSIZE == 64 +#include "curlbuild-64.h" +#else +#error "Unknown word size" +#endif diff --git a/testing/empathy/PKGBUILD b/testing/empathy/PKGBUILD new file mode 100644 index 000000000..e110edd83 --- /dev/null +++ b/testing/empathy/PKGBUILD @@ -0,0 +1,41 @@ +# $Id: PKGBUILD 142759 2011-11-14 21:14:45Z ibiru $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> + +pkgname=empathy +pkgver=3.2.2 +pkgrel=1 +pkgdesc="A GNOME instant messaging client using the Telepathy framework." +arch=('i686' 'x86_64') +url="http://live.gnome.org/Empathy" +license=('GPL2') +depends=('libpulse' 'clutter-gtk' 'clutter-gst' 'telepathy-mission-control' 'telepathy-logger' 'telepathy-farsight' 'telepathy-farstream' 'folks' 'gnome-keyring' +'libcanberra' 'iso-codes' 'networkmanager') +makedepends=('intltool' 'gnome-doc-utils' 'nautilus-sendto') +optdepends=('telepathy-gabble: XMPP/Jabber support' + 'telepathy-butterfly: MSN support' + 'telepathy-idle: IRC support' + 'telepathy-salut: Link-local XMPP support' + 'telepathy-sofiasip: SIP support' + 'telepathy-haze: libpurple support') +options=('!libtool') +groups=('gnome-extra') +install=empathy.install +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/3.2/$pkgname-$pkgver.tar.xz) +sha256sums=('d6a391b801f58024ed6f97d9bf4e774b9ab9e1262d79aefb5c1dd95233fd5aa1') + +build() { + cd "$srcdir/$pkgname-$pkgver" + PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib/empathy \ + --disable-static \ + --disable-scrollkeeper \ + --disable-schemas-compile + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/testing/empathy/empathy.install b/testing/empathy/empathy.install new file mode 100644 index 000000000..c3f7abf13 --- /dev/null +++ b/testing/empathy/empathy.install @@ -0,0 +1,18 @@ +post_install() { + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + echo "To use Empathy you need to install at least one Telepathy connection manager." +} + +post_upgrade() { + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_remove() { + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} diff --git a/testing/eog/PKGBUILD b/testing/eog/PKGBUILD new file mode 100644 index 000000000..dc1d2fd08 --- /dev/null +++ b/testing/eog/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 142770 2011-11-14 21:40:57Z ibiru $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=eog +pkgver=3.2.2 +pkgrel=1 +pkgdesc="Eye of Gnome: An image viewing and cataloging program" +arch=('i686' 'x86_64') +license=('GPL') +depends=('gnome-desktop' 'libexif' 'lcms2' 'desktop-file-utils' 'exempi' 'libpeas' 'librsvg' 'gnome-icon-theme' 'dconf') +makedepends=('gtk-doc' 'intltool') +install=eog.install +groups=('gnome-extra') +options=('!emptydirs' '!libtool') +url="http://www.gnome.org" +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('315625babf04293341bd0b3ae26337d11c8696422d5dc4442ad551b25db42530') + +build() { + cd "$srcdir/$pkgname-$pkgver" + PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-scrollkeeper + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + + # remove it from Xfce menu that ships its own thingy + echo "NotShowIn=XFCE" >> $pkgdir/usr/share/applications/eog.desktop +} diff --git a/testing/eog/eog.install b/testing/eog/eog.install new file mode 100644 index 000000000..284b24b18 --- /dev/null +++ b/testing/eog/eog.install @@ -0,0 +1,19 @@ +post_install() { + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +pre_upgrade() { + if (( $(vercmp $2 2.90.0) < 0 )); then + usr/sbin/gconfpkg --uninstall eog + fi +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/evolution-data-server/PKGBUILD b/testing/evolution-data-server/PKGBUILD new file mode 100644 index 000000000..1975c38be --- /dev/null +++ b/testing/evolution-data-server/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 142742 2011-11-14 12:31:16Z ibiru $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=evolution-data-server +pkgver=3.2.2 +pkgrel=1 +pkgdesc="Centralized access to appointments and contacts" +arch=('i686' 'x86_64') +depends=('gconf' 'gnome-online-accounts' 'nss' 'krb5' 'libgweather' 'libical' 'db' 'libgdata') +makedepends=('intltool' 'gperf' 'gobject-introspection' 'vala') +options=('!libtool') +url="http://www.gnome.org" +license=('GPL') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/3.2/${pkgname}-${pkgver}.tar.xz) +sha256sums=('2a129b4c9412b8b855ce28bd682e522b3af0309e407f9d900f1d48be649bc76a') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --with-openldap=yes \ + --libexecdir=/usr/lib/evolution-data-server \ + --with-krb5=/usr --with-libdb=/usr \ + --enable-vala-bindings + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/evolution-ews/PKGBUILD b/testing/evolution-ews/PKGBUILD new file mode 100644 index 000000000..dfe853955 --- /dev/null +++ b/testing/evolution-ews/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 142748 2011-11-14 13:31:05Z ibiru $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> + +pkgname=evolution-ews +pkgver=3.2.2 +pkgrel=1 +pkgdesc="MS Exchange integration through Exchange Web Services" +arch=('i686' 'x86_64') +license=('LGPL2.1') +url="http://www.gnome.org" +depends=('evolution-data-server' 'gtkhtml4' 'gnome-desktop') +makedepends=('intltool' 'evolution') +options=('!libtool' '!emptydirs') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('f6a557a93e632e19cde1501f6f0540f67e41c193120d7297268662ddc7927439') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --libexecdir=/usr/lib/evolution --disable-static + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/testing/evolution/PKGBUILD b/testing/evolution/PKGBUILD new file mode 100644 index 000000000..599ce0284 --- /dev/null +++ b/testing/evolution/PKGBUILD @@ -0,0 +1,45 @@ +# $Id: PKGBUILD 142744 2011-11-14 13:03:36Z ibiru $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=evolution +pkgver=3.2.2 +pkgrel=1 +pkgdesc="Manage your email, contacts and schedule" +arch=('i686' 'x86_64') +license=('GPL') +depends=('gnome-desktop' 'evolution-data-server' 'gtkhtml4' 'libcanberra' 'gstreamer0.10' 'libpst' 'libytnef' 'desktop-file-utils' 'hicolor-icon-theme') +makedepends=('intltool' 'gnome-doc-utils' 'networkmanager') +optdepends=('bogofilter: possible junk filter plugin' + 'spamassassin: possible junk filter plugin') +groups=('gnome-extra') +options=('!libtool' '!emptydirs') +install=evolution.install +url=http://www.gnome.org/projects/evolution/ +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('03c68242bbf494dda3bf34f52ec843c282c9bb07f9415a69fe58237c7efbbe7d') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var \ + --libexecdir=/usr/lib \ + --disable-scrollkeeper \ + --enable-nss=yes \ + --with-openldap=yes \ + --enable-smime=yes \ + --with-krb5=/usr \ + --disable-image-inline + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool + make + make -C plugins/tnef-attachments +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install + make -C plugins/tnef-attachments DESTDIR="${pkgdir}" install + + install -m755 -d "${pkgdir}/usr/share/gconf/schemas" + gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain evolution-3.2 ${pkgdir}/etc/gconf/schemas/*.schemas + rm -f ${pkgdir}/etc/gconf/schemas/*.schemas +} diff --git a/testing/evolution/evolution.install b/testing/evolution/evolution.install new file mode 100644 index 000000000..a2c3aaa54 --- /dev/null +++ b/testing/evolution/evolution.install @@ -0,0 +1,24 @@ +pkgname=evolution + +post_install() { + usr/sbin/gconfpkg --install ${pkgname} + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +pre_upgrade() { + pre_remove $1 +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + usr/sbin/gconfpkg --uninstall ${pkgname} +} + +post_remove() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} diff --git a/testing/gedit/PKGBUILD b/testing/gedit/PKGBUILD new file mode 100644 index 000000000..76b4571ad --- /dev/null +++ b/testing/gedit/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 142821 2011-11-15 17:49:57Z ibiru $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=gedit +pkgver=3.2.3 +pkgrel=1 +pkgdesc="A text editor for GNOME" +arch=('i686' 'x86_64') +license=('GPL') +depends=('gtksourceview3' 'gsettings-desktop-schemas' 'libpeas' 'enchant' 'iso-codes' 'libsm' 'desktop-file-utils' 'python2-gobject' 'dconf') +makedepends=('gnome-doc-utils' 'intltool') +groups=('gnome-extra') +options=('!libtool' '!emptydirs') +url="http://www.gnome.org" +install=gedit.install +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('9db009de74874846edadc0f4a7dc0127a4272cff4348a13544c611cc3696b751') + +build() { + cd "$srcdir/$pkgname-$pkgver" + PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ + --sysconfdir=/etc --localstatedir=/var \ + --libexecdir=/usr/lib --disable-scrollkeeper \ + --disable-updater --disable-schemas-compile \ + --enable-python + make +} + +package(){ + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/testing/gedit/gedit.install b/testing/gedit/gedit.install new file mode 100644 index 000000000..9d88a1341 --- /dev/null +++ b/testing/gedit/gedit.install @@ -0,0 +1,18 @@ +post_install() { + glib-compile-schemas usr/share/glib-2.0/schemas + update-desktop-database -q +} + +pre_upgrade() { + if [ -f usr/share/gconf/schemas/gedit.schemas ]; then + usr/sbin/gconfpkg --uninstall gedit + fi +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/testing/ghc/PKGBUILD b/testing/ghc/PKGBUILD new file mode 100644 index 000000000..aef26d06e --- /dev/null +++ b/testing/ghc/PKGBUILD @@ -0,0 +1,43 @@ +# $Id: PKGBUILD 142984 2011-11-19 18:41:40Z vesa $ +# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> +# Special note for devs looking to upgrade this package: +# ghc places a unique hash for each library when it is built. +# Libraries depend on versions specified by those hashes. +# This implies that all libraries need to be rebuilt when ghc is rebuilt. +# Also, due to dependency loop problems, haskell-ghc-paths and haddock +# do not carry version dependencies. You will have to remember to build them too. +pkgname=ghc +pkgver=7.2.2 +pkgrel=1 +pkgdesc="The Glasgow Haskell Compiler" +arch=(i686 x86_64) +url="http://www.haskell.org/ghc/" +license=("custom") +depends=('perl' 'gmp>=5.0' gcc) +makedepends=(ghc happy perl libxslt docbook-xsl) +install=ghc.install +options=(!strip) +groups=(haskell) +source=("http://www.haskell.org/ghc/dist/$pkgver/ghc-$pkgver-src.tar.bz2" + build.mk) + +build() { + cd $srcdir/$pkgname-$pkgver + + cp $srcdir/build.mk mk/build.mk + + ./configure --prefix=/usr + make -j1 || return 1 +} + +package() { + cd $srcdir/$pkgname-$pkgver + + make DESTDIR=$pkgdir install + + install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/ghc/license + install -d $pkgdir/usr/share/haskell +} + +md5sums=('fa19d9fe5049b7a1352b0b7c9880c141' + '5a3e0880c80b1dcecf779ff2e63a9c0d') diff --git a/testing/ghc/build.mk b/testing/ghc/build.mk new file mode 100644 index 000000000..f918a0f16 --- /dev/null +++ b/testing/ghc/build.mk @@ -0,0 +1,150 @@ +# ----------------------------------------------------------------------------- +# A Sample build.mk +# +# Uncomment one of the following BuildFlavour settings to get the desired +# overall build type, and then tweak the options in the relevant section +# below. + +# Uncomment one of these to select a build profile below: + +# Full build with max optimisation (slow build) +BuildFlavour = perf + +# Fastest build (libs unoptimised): +#BuildFlavour = quickest + +# Fast build with optimised libraries: +#BuildFlavour = quick + +# Profile the stage2 compiler: +#BuildFlavour = prof + +# A development build, working on the stage 1 compiler: +#BuildFlavour = devel1 + +# A development build, working on the stage 2 compiler: +#BuildFlavour = devel2 + +GhcLibWays = v + +# -------- 1. A Performance/Distribution build-------------------------------- + +ifeq "$(BuildFlavour)" "perf" + +# perf matches the default settings, repeated here for comparison: + +SRC_HC_OPTS = -O -H64m +GhcStage1HcOpts = -O -fasm +GhcStage2HcOpts = -O2 -fasm +GhcHcOpts = -Rghc-timing +GhcLibHcOpts = -O2 -XGenerics +GhcLibWays += p + +ifeq "$(PlatformSupportsSharedLibs)" "YES" +GhcLibWays += dyn +endif + +endif + +# -------- A Fast build ------------------------------------------------------ + +ifeq "$(BuildFlavour)" "quickest" + +SRC_HC_OPTS = -H64m -O0 -fasm +GhcStage1HcOpts = -O -fasm +GhcStage2HcOpts = -O0 -fasm +GhcLibHcOpts = -O0 -fasm +SplitObjs = NO +HADDOCK_DOCS = NO +BUILD_DOCBOOK_HTML = NO +BUILD_DOCBOOK_PS = NO +BUILD_DOCBOOK_PDF = NO + +endif + +# -------- A Fast build with optimised libs ---------------------------------- + +ifeq "$(BuildFlavour)" "quick" + +SRC_HC_OPTS = -H64m -O0 -fasm +GhcStage1HcOpts = -O -fasm +GhcStage2HcOpts = -O0 -fasm +GhcLibHcOpts = -O -fasm +SplitObjs = NO +HADDOCK_DOCS = NO +BUILD_DOCBOOK_HTML = NO +BUILD_DOCBOOK_PS = NO +BUILD_DOCBOOK_PDF = NO + +endif + +# -------- Profile the stage2 compiler --------------------------------------- + +ifeq "$(BuildFlavour)" "prof" + +SRC_HC_OPTS = -H64m -O0 -fasm +GhcStage1HcOpts = -O -fasm +GhcStage2HcOpts = -O -fasm +GhcLibHcOpts = -O -fasm + +GhcLibWays += p +GhcProfiled = YES + +SplitObjs = NO +HADDOCK_DOCS = NO +BUILD_DOCBOOK_HTML = NO +BUILD_DOCBOOK_PS = NO +BUILD_DOCBOOK_PDF = NO + +endif + + +# -------- A Development build (stage 1) ------------------------------------- + +ifeq "$(BuildFlavour)" "devel1" + +SRC_HC_OPTS = -H64m -O -fasm +GhcLibHcOpts = -O -dcore-lint +GhcStage1HcOpts = -Rghc-timing -O0 -DDEBUG +GhcStage2HcOpts = -Rghc-timing -O -fasm +SplitObjs = NO +HADDOCK_DOCS = NO +BUILD_DOCBOOK_HTML = NO +BUILD_DOCBOOK_PS = NO +BUILD_DOCBOOK_PDF = NO + +endif + +# -------- A Development build (stage 2) ------------------------------------- + +ifeq "$(BuildFlavour)" "devel2" + +SRC_HC_OPTS = -H64m -O -fasm +GhcLibHcOpts = -O -dcore-lint +GhcStage1HcOpts = -Rghc-timing -O -fasm +GhcStage2HcOpts = -Rghc-timing -O0 -DDEBUG +SplitObjs = NO +HADDOCK_DOCS = NO +BUILD_DOCBOOK_HTML = NO +BUILD_DOCBOOK_PS = NO +BUILD_DOCBOOK_PDF = NO + +endif + +# ----------------------------------------------------------------------------- +# Other settings that might be useful + +# profiled RTS +#GhcRtsCcOpts = -pg -g + +# Optimised/profiled RTS +#GhcRtsCcOpts = -O2 -pg + +#GhcRtsWithFrontPanel = YES +#SRC_HC_OPTS += `gtk-config --libs` + +# NoFib settings +NoFibWays = +STRIP=: + + diff --git a/testing/ghc/ghc.install b/testing/ghc/ghc.install new file mode 100644 index 000000000..7d56083bc --- /dev/null +++ b/testing/ghc/ghc.install @@ -0,0 +1,19 @@ +pkgname=ghc + +pre_upgrade() { + cat << EOF + ==> Unregistering cabalized packages... +EOF + cd /usr/share/haskell/ && (for a in *; do ghc-pkg unregister --force $a &> /dev/null; done; cd - > /dev/null ) + cat << EOF + ==> Done. +EOF + +} + +post_upgrade() { + cat << EOF + ==> All cabalized and yaourt-installed packages need to be reinstalled now. + ==> See /usr/share/haskell/ and ghc-pkg list --user for a tentative list of affected packages. +EOF +} diff --git a/testing/gnome-keyring/PKGBUILD b/testing/gnome-keyring/PKGBUILD new file mode 100644 index 000000000..2e1ceae52 --- /dev/null +++ b/testing/gnome-keyring/PKGBUILD @@ -0,0 +1,32 @@ +#$Id: PKGBUILD 142736 2011-11-14 11:27:00Z ibiru $ +# Maintainer: Jan De Groot <jgc@archlinux.org> + +pkgname=gnome-keyring +pkgver=3.2.2 +pkgrel=1 +pkgdesc="GNOME Password Management daemon" +arch=(i686 x86_64) +license=('GPL' 'LGPL') +depends=('gtk3' 'dconf' 'libgcrypt' 'libcap-ng' 'p11-kit' 'desktop-file-utils' 'hicolor-icon-theme') +makedepends=('intltool' 'python2') +groups=('gnome') +options=('!libtool' '!emptydirs') +url="http://www.gnome.org" +install=gnome-keyring.install +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('f4cdc2c492a9b0157d59439310093e611e1f718a16f7ee2391ac03aadacfaaa3') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static \ + --libexecdir=/usr/lib/gnome-keyring \ + --with-pam-dir=/lib/security --with-root-certs=/etc/ssl/certs \ + --disable-schemas-compile --disable-update-mime + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/gnome-keyring/gnome-keyring.install b/testing/gnome-keyring/gnome-keyring.install new file mode 100644 index 000000000..e899ab5a2 --- /dev/null +++ b/testing/gnome-keyring/gnome-keyring.install @@ -0,0 +1,15 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas + update-mime-database /usr/share/mime 1> /dev/null + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor + update-desktop-database -q + setcap cap_ipc_lock=ep /usr/bin/gnome-keyring-daemon +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/testing/gtkhtml4/PKGBUILD b/testing/gtkhtml4/PKGBUILD new file mode 100644 index 000000000..940cee589 --- /dev/null +++ b/testing/gtkhtml4/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 142738 2011-11-14 12:15:43Z ibiru $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> + +pkgname=gtkhtml4 +_pkgbasename=gtkhtml +pkgver=4.2.2 +pkgrel=1 +pkgdesc="A lightweight HTML renderer/editor widget for GTK3" +arch=(i686 x86_64) +license=('GPL') +depends=('gtk3' 'enchant' 'iso-codes' 'gnome-icon-theme' 'libsoup') +makedepends=('intltool') +url="http://www.gnome.org" +options=('!libtool') +source=(http://ftp.gnome.org/pub/gnome/sources/${_pkgbasename}/${pkgver%.*}/${_pkgbasename}-${pkgver}.tar.xz) +sha256sums=('e20bb5d461e9ae9d3a8d4e13d544db1813707810ded7cbde9287485f2394dd2c') + +build() { + cd "${srcdir}/${_pkgbasename}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc \ + --libexecdir=/usr/lib/gtkhtml4 \ + --localstatedir=/var --disable-static + make +} + +package() { + cd "${srcdir}/${_pkgbasename}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/gucharmap/PKGBUILD b/testing/gucharmap/PKGBUILD new file mode 100644 index 000000000..76c83e764 --- /dev/null +++ b/testing/gucharmap/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 142755 2011-11-14 19:44:44Z ibiru $ +# Maintainer: Jan De Groot <jgc@archlinux.org> + +pkgname=gucharmap +pkgver=3.2.2 +pkgrel=1 +pkgdesc="Gnome Unicode Charmap" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.gnome.org" +depends=('gconf' 'hicolor-icon-theme') +makedepends=('gtk-doc' 'intltool' 'gobject-introspection') +options=('!libtool' '!emptydirs') +install=gucharmap.install +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('da1e422d387ff4df8bfb61e8a340483f88b0d23e4309a776848dbeb4093a5a21') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static \ + --disable-scrollkeeper --enable-introspection + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make -j1 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install + + install -m755 -d "$pkgdir/usr/share/gconf/schemas" + gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain gucharmap $pkgdir/etc/gconf/schemas/*.schemas + rm -f $pkgdir/etc/gconf/schemas/*.schemas +} diff --git a/testing/gucharmap/gucharmap.install b/testing/gucharmap/gucharmap.install new file mode 100644 index 000000000..4de3253f6 --- /dev/null +++ b/testing/gucharmap/gucharmap.install @@ -0,0 +1,22 @@ +pkgname=gucharmap + +post_install() { + usr/sbin/gconfpkg --install ${pkgname} + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +pre_upgrade() { + pre_remove $1 +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + usr/sbin/gconfpkg --uninstall ${pkgname} +} + +post_remove() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} diff --git a/testing/libcroco/PKGBUILD b/testing/libcroco/PKGBUILD new file mode 100644 index 000000000..5beb276a6 --- /dev/null +++ b/testing/libcroco/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 142751 2011-11-14 19:18:02Z ibiru $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=libcroco +pkgver=0.6.3 +pkgrel=1 +pkgdesc="A CSS parsing library" +arch=('x86_64' 'i686') +depends=('glib2' 'libxml2') +makedepends=('intltool') +license=('LGPL') +options=('!libtool') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/0.6/$pkgname-$pkgver.tar.xz) +url="http://www.gnome.org" +sha256sums=('8b7c565bf3eae1dff0a09d128fc3726acc1a492a7de23b25dce803a4f93d42c1') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr --disable-static + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/testing/libffado/PKGBUILD b/testing/libffado/PKGBUILD index 09386a73f..a73d9a212 100644 --- a/testing/libffado/PKGBUILD +++ b/testing/libffado/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 140411 2011-10-13 03:56:02Z schiv $ -# Maintainer: Ray Rashif <schivmeister@gmail.com> +# $Id: PKGBUILD 142838 2011-11-16 19:18:19Z schiv $ +# Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: galiyosha@gmail.com # Contributor: Jon Kristian Nilsen <jokr.nilsen@gmail.com> pkgname=libffado pkgver=2.0.1 -pkgrel=4 +pkgrel=5 pkgdesc="Driver for FireWire audio devices" arch=('i686' 'x86_64') url="http://www.ffado.org/" @@ -13,7 +13,8 @@ license=('GPL') depends=('libiec61883' 'libavc1394' 'libsigc++' 'libxml++' 'alsa-lib' 'dbus') makedepends=('scons' 'python2-qt') -optdepends=('python2-qt: mixer applet') +optdepends=('python2: ffado-diag' + 'python2-qt: mixer applet') provides=('ffado') source=("http://www.ffado.org/files/$pkgname-$pkgver.tar.gz" '60-ffado.rules') @@ -43,7 +44,7 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" - scons DESTDIR="$pkgdir/" WILL_DEAL_WITH_XDG_MYSELF="True" install + scons DESTDIR="$pkgdir" WILL_DEAL_WITH_XDG_MYSELF="True" install # add audio device rules # see https://bugs.archlinux.org/task/26342 diff --git a/testing/libgnome-keyring/PKGBUILD b/testing/libgnome-keyring/PKGBUILD new file mode 100644 index 000000000..8f8cb25cb --- /dev/null +++ b/testing/libgnome-keyring/PKGBUILD @@ -0,0 +1,28 @@ +#$Id: PKGBUILD 142734 2011-11-14 11:17:40Z ibiru $ +#Maintainer: Jan De Groot <jgc@archlinux.org> + +pkgname=libgnome-keyring +pkgver=3.2.2 +pkgrel=1 +pkgdesc="GNOME keyring client library" +arch=(i686 x86_64) +license=('GPL' 'LGPL') +depends=('dbus-core' 'libgcrypt' 'glib2') +makedepends=('intltool' 'pkgconfig') +options=('!libtool' '!emptydirs') +url="http://www.gnome.org" +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('2bcbe47b1960737866835a516056c36d1a3d82d5ad101c70d5a87e1ad616adb3') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static \ + --libexecdir=/usr/lib/gnome-keyring + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/librsvg/PKGBUILD b/testing/librsvg/PKGBUILD new file mode 100644 index 000000000..e9a4a7357 --- /dev/null +++ b/testing/librsvg/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 142753 2011-11-14 19:25:00Z ibiru $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=librsvg +pkgver=2.34.2 +pkgrel=1 +pkgdesc="A SVG viewing library" +arch=(i686 x86_64) +license=('LGPL') +depends=('gdk-pixbuf2' 'pango' 'libcroco') +makedepends=('intltool' 'gtk2') +optdepends=('gtk2: for rsvg-view support') +options=('!libtool' '!emptydirs') +url="http://librsvg.sourceforge.net/" +install=librsvg.install +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/2.34/$pkgname-$pkgver.tar.xz) +sha256sums=('5de701325b84c0a15ab6892f49ffd6471722044bfe0b350725bf420642ee4464') + +build() { + cd "$srcdir/$pkgname-$pkgver" + sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' rsvg.in + ./configure --prefix=/usr --libexecdir=/usr/lib/$pkgname \ + --with-croco --disable-static \ + --with-svgz + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/testing/librsvg/librsvg.install b/testing/librsvg/librsvg.install new file mode 100644 index 000000000..4d48b071f --- /dev/null +++ b/testing/librsvg/librsvg.install @@ -0,0 +1,11 @@ +post_install() { + usr/bin/gdk-pixbuf-query-loaders --update-cache +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/p11-kit/PKGBUILD b/testing/p11-kit/PKGBUILD new file mode 100644 index 000000000..365b67cd7 --- /dev/null +++ b/testing/p11-kit/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 142938 2011-11-18 18:11:54Z ibiru $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> + +pkgname=p11-kit +pkgver=0.9 +pkgrel=1 +pkgdesc="Library to work with PKCS#11 modules" +arch=(i686 x86_64) +url="http://p11-glue.freedesktop.org" +license=('BSD') +depends=(glibc) +options=(!libtool) +source=($url/releases/$pkgname-$pkgver.tar.gz) +md5sums=('029aa2a3a103e7eb81b4aa731b93539e') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc \ + --with-module-path=/usr/lib/pkcs11 + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/seahorse/PKGBUILD b/testing/seahorse/PKGBUILD new file mode 100644 index 000000000..fdec5f80c --- /dev/null +++ b/testing/seahorse/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 142740 2011-11-14 12:23:22Z ibiru $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: Michel Brabants <michel.linux@tiscali.be> + +pkgname=seahorse +pkgver=3.2.2 +pkgrel=1 +pkgdesc="GNOME application for managing PGP keys." +arch=(i686 x86_64) +license=('GPL') +url="http://projects.gnome.org/seahorse/" +depends=('gtk3' 'libgnome-keyring' 'gnome-keyring' 'libsoup' 'gpgme' 'desktop-file-utils' 'hicolor-icon-theme' 'dconf') +makedepends=('gettext' 'libldap' 'intltool' 'pkgconfig' 'gnome-doc-utils' 'gobject-introspection' 'openssh' 'libsm') +optdepends=('openssh: SSH support') +provides=('x11-ssh-askpass') +options=('!libtool' '!emptydirs') +groups=('gnome-extra') +install=seahorse.install +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz + seahorse-ssh-askpass.sh) +sha256sums=('25146aa4c4bb4c375ec1afec524e1907852989bd1b0c9e12490326616ac6a7e9' + '1792ab2c0bbad446b8fad0a0c9008a75f60a9666c895d37d2adcd827e49fafbb') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static \ + --enable-ldap --enable-hkp \ + --disable-scrollkeeper \ + --disable-update-mime-database \ + --disable-schemas-compile + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + install -Dm755 "$srcdir/seahorse-ssh-askpass.sh" \ + "$pkgdir/etc/profile.d/seahorse-ssh-askpass.sh" +} diff --git a/testing/seahorse/seahorse-ssh-askpass.sh b/testing/seahorse/seahorse-ssh-askpass.sh new file mode 100644 index 000000000..44281ac2b --- /dev/null +++ b/testing/seahorse/seahorse-ssh-askpass.sh @@ -0,0 +1,3 @@ +if [ -z "$SSH_ASKPASS" ]; then + export SSH_ASKPASS=/usr/lib/seahorse/seahorse-ssh-askpass +fi diff --git a/testing/seahorse/seahorse.install b/testing/seahorse/seahorse.install new file mode 100644 index 000000000..9a98d52e0 --- /dev/null +++ b/testing/seahorse/seahorse.install @@ -0,0 +1,21 @@ +pkgname=seahorse + +post_install() { + glib-compile-schemas usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +pre_upgrade() { + if [ -f usr/share/gconf/schemas/$pkgname.schemas ]; then + usr/sbin/gconfpkg --uninstall $pkgname + fi +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/tomboy/PKGBUILD b/testing/tomboy/PKGBUILD new file mode 100644 index 000000000..b386d328b --- /dev/null +++ b/testing/tomboy/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 142761 2011-11-14 21:22:26Z ibiru $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=tomboy +pkgver=1.8.3 +pkgrel=1 +pkgdesc="Desktop note-taking application for Linux and Unix" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.gnome.org/projects/tomboy/" +depends=('gtk2' 'gtkspell' 'gconf' 'gconf-sharp' 'dbus-sharp' 'dbus-sharp-glib' 'mono-addins' 'hicolor-icon-theme') +makedepends=('intltool' 'pkgconfig' 'gnome-doc-utils') +options=('!libtool' '!emptydirs' '!makeflags') +groups=('gnome-extra') +install=tomboy.install +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/1.8/$pkgname-$pkgver.tar.xz) +sha256sums=('3f704bac772a54cf668aca769c766bc1fb9ebc8823a903ef108927805c020bea') + +build() { + export MONO_SHARED_DIR="$srcdir/.wabi" + mkdir -p "$MONO_SHARED_DIR" + + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-scrollkeeper \ + --disable-update-mimedb + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 install + + install -m755 -d "$pkgdir/usr/share/gconf/schemas" + gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain tomboy $pkgdir/etc/gconf/schemas/*.schemas + rm -f $pkgdir/etc/gconf/schemas/*.schemas +} diff --git a/testing/tomboy/tomboy.install b/testing/tomboy/tomboy.install new file mode 100644 index 000000000..f8e2e4a07 --- /dev/null +++ b/testing/tomboy/tomboy.install @@ -0,0 +1,25 @@ +pkgname=tomboy + +post_install() { + usr/sbin/gconfpkg --install ${pkgname} + + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-mime-database usr/share/mime +} + +pre_upgrade() { + pre_remove $1 +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + usr/sbin/gconfpkg --uninstall ${pkgname} +} + +post_remove() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-mime-database usr/share/mime +} diff --git a/testing/vinagre/PKGBUILD b/testing/vinagre/PKGBUILD new file mode 100644 index 000000000..e7fb8932a --- /dev/null +++ b/testing/vinagre/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 142764 2011-11-14 21:29:43Z ibiru $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Maintainer: Allan McRae <mcrae_allan@hotmail.com> +# Contributor: lp76 <l.peduto@gmail.com> + +pkgname=vinagre +pkgver=3.2.2 +pkgrel=1 +pkgdesc="A VNC Client for the GNOME Desktop" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.gnome.org/projects/vinagre/" +install=vinagre.install +depends=('libgnome-keyring' 'gtk-vnc' 'vte3' 'telepathy-glib' 'avahi' 'desktop-file-utils' 'dconf' 'shared-mime-info' 'gnome-icon-theme') +optdepends=('openssh: SSH plugin' + 'rdesktop: RDP plugin') +makedepends=('gnome-doc-utils' 'intltool' 'rdesktop' 'openssh') +groups=('gnome-extra') +options=('!emptydirs' '!libtool') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('1533cc447177f8d6c9cfe45d61b05904efbf66c86b86b4c332e972ff965d76bd') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + #building with as-needed breaks rdp + #https://bugzilla.gnome.org/show_bug.cgi?id=653558 + export LDFLAGS="$LDFLAGS,--no-as-needed" + ./configure --prefix=/usr --sysconfdir=/etc --disable-scrollkeeper \ + --libexecdir=/usr/lib/vinagre --enable-rdp --disable-spice + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/testing/vinagre/vinagre.install b/testing/vinagre/vinagre.install new file mode 100644 index 000000000..68158ac80 --- /dev/null +++ b/testing/vinagre/vinagre.install @@ -0,0 +1,20 @@ +post_install() { + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-mime-database usr/share/mime > /dev/null +} + +pre_upgrade() { + if (( $(vercmp $2 2.91.91-2) < 0 )); then + usr/sbin/gconfpkg --uninstall vinagre + fi +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/vino/PKGBUILD b/testing/vino/PKGBUILD new file mode 100644 index 000000000..f3ff87b9b --- /dev/null +++ b/testing/vino/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 142766 2011-11-14 21:34:58Z ibiru $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=vino +pkgver=3.2.2 +pkgrel=1 +pkgdesc="a VNC server for the GNOME desktop" +arch=('i686' 'x86_64') +license=('GPL') +depends=('libnotify' 'libxtst' 'libsm' 'libsoup' 'telepathy-glib' 'gtk3' 'libgnome-keyring' 'avahi' 'desktop-file-utils') +makedepends=('intltool' 'networkmanager') +groups=('gnome-extra') +url="http://www.gnome.org" +options=(!emptydirs) +install=vino.install +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('51089c35b5187c37ebcd4f8ad921123f9a56713316876531189a3f3765dc87d1') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc \ + --libexecdir=/usr/lib/vino \ + --localstatedir=/var \ + --enable-gnome-keyring \ + --enable-avahi \ + --disable-http-server + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/testing/vino/vino.install b/testing/vino/vino.install new file mode 100644 index 000000000..469266843 --- /dev/null +++ b/testing/vino/vino.install @@ -0,0 +1,18 @@ +post_install() { + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + update-desktop-database -q +} + +pre_upgrade() { + if (( $(vercmp $2 2.90.0) < 0 )); then + usr/sbin/gconfpkg --uninstall vino + fi +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/xf86-video-intel/PKGBUILD b/testing/xf86-video-intel/PKGBUILD new file mode 100644 index 000000000..ecbe65fb5 --- /dev/null +++ b/testing/xf86-video-intel/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 142914 2011-11-18 08:37:24Z andyrtr $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=xf86-video-intel +pkgver=2.17.0 +pkgrel=1 +pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers" +arch=(i686 x86_64) +url="http://xorg.freedesktop.org/" +license=('custom') +depends=(intel-dri libxvmc libpciaccess libdrm xcb-util libxfixes udev) +makedepends=('xorg-server-devel>=1.10.99.902' 'libx11' 'libdrm' 'xf86driproto' 'glproto' 'mesa' 'libxvmc' 'xcb-util' 'libxrender') +conflicts=('xorg-server<1.10.99.902' 'xf86-video-i810' 'xf86-video-intel-legacy') +options=('!libtool') +groups=('xorg-drivers' 'xorg') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('04ad9fa1f4c4e0a90f48752a709bf14700c864af') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr --enable-dri + 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}/" +} diff --git a/testing/xfsprogs/PKGBUILD b/testing/xfsprogs/PKGBUILD index c062147da..044081699 100644 --- a/testing/xfsprogs/PKGBUILD +++ b/testing/xfsprogs/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 141990 2011-11-03 20:33:03Z tpowa $ +# $Id: PKGBUILD 142910 2011-11-18 08:13:20Z tpowa $ # Maintainer: Paul Mattal <paul@archlinux.org> pkgname=xfsprogs -pkgver=3.1.6 +pkgver=3.1.7 pkgrel=1 pkgdesc="XFS filesystem utilities" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ depends=('util-linux-ng>=2.16') options=('!makeflags' '!libtool') # We mirror the sources as upstream tends to move them once a new release is out source=("ftp://ftp.archlinux.org/other/xfsprogs/${pkgname}-${pkgver}.tar.gz") -md5sums=('fbd2c1c5abed4b11047bea6ce53bc6e4') +md5sums=('049cf9873794ea49d0bb3f12d45748a4') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/testing/xorg-server/10-quirks.conf b/testing/xorg-server/10-quirks.conf new file mode 100644 index 000000000..7afad22dc --- /dev/null +++ b/testing/xorg-server/10-quirks.conf @@ -0,0 +1,10 @@ +# Collection of quirks and blacklist/whitelists for specific devices. + + +# Accelerometer device, posts data through ABS_X/ABS_Y, making X unusable +# http://bugs.freedesktop.org/show_bug.cgi?id=22442 +Section "InputClass" + Identifier "ThinkPad HDAPS accelerometer blacklist" + MatchProduct "ThinkPad HDAPS accelerometer data" + Option "Ignore" "on" +EndSection diff --git a/testing/xorg-server/PKGBUILD b/testing/xorg-server/PKGBUILD new file mode 100644 index 000000000..c2a5e2c4f --- /dev/null +++ b/testing/xorg-server/PKGBUILD @@ -0,0 +1,205 @@ +# $Id: PKGBUILD 142829 2011-11-16 11:34:48Z jgc $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgbase=xorg-server +pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel') +pkgver=1.11.2 +pkgrel=2 +arch=('i686' 'x86_64') +license=('custom') +url="http://xorg.freedesktop.org" +makedepends=('pixman' 'libx11' 'mesa' 'libgl' 'xf86driproto' 'xcmiscproto' 'xtrans' 'bigreqsproto' 'randrproto' 'inputproto' 'fontsproto' 'videoproto' 'compositeproto' 'recordproto' 'scrnsaverproto' 'resourceproto' 'xineramaproto' 'libxkbfile' 'libxfont' 'renderproto' 'libpciaccess' 'libxv' 'xf86dgaproto' 'libxmu' 'libxrender' 'libxi' 'dmxproto' 'libxaw' 'libdmx' 'libxtst' 'libxres' 'xorg-xkbcomp' 'xorg-util-macros' 'xorg-font-util' 'glproto' 'dri2proto' 'udev' 'libgcrypt') +options=('!libtool') +source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2 + autoconfig-nvidia.patch + autoconfig-sis.patch + revert-trapezoids.patch + git-fixes.patch + xserver-1.11.2-record-crasher.patch + Xi-allow-passive-keygrabs-on-the-XIAll-Master-Device.patch + xvfb-run + xvfb-run.1 + 10-quirks.conf) +md5sums=('8796fff441e5435ee36a72579008af24' + '6c7e87d63ac4b535e19a80c89d0cf091' + 'f8194638ca4872c2b0a67862a70bcebf' + 'f6c84f4936f8e00abdfbd9fb4eda83fb' + '6fb42ec979ecd6125b6599f54dc00d14' + '3f9de4dbfee2da90167192d8ca9eb2b4' + '47f9b979fe38043b42ff86eeee6fd0d0' + '52fd3effd80d7bc6c1660d4ecf23d31c' + '376c70308715cd2643f7bff936d9934b' + 'd4f7dfc6be4ef4e2c6dd7632a9d88abe') + +build() { + cd "${srcdir}/${pkgbase}-${pkgver}" + + # Use nouveau/nv/nvidia drivers for nvidia devices + patch -Np1 -i "${srcdir}/autoconfig-nvidia.patch" + + # Use unofficial imedia SiS driver for supported SiS devices + patch -Np0 -i "${srcdir}/autoconfig-sis.patch" + + # Revert commit that causes huge slowdowns with binary nVidia driver + patch -Np1 -i "${srcdir}/revert-trapezoids.patch" + + # Add post-release patches from 1.11 branch + patch -Np1 -i "${srcdir}/git-fixes.patch" + + # From Fedora. + # Upstream URL: http://patchwork.freedesktop.org/patch/7866/ + patch -Np1 -i "${srcdir}/xserver-1.11.2-record-crasher.patch" + + # From Fedora. + # Upstream URL: https://bugs.freedesktop.org/show_bug.cgi?id=42298 + patch -Np1 -i "${srcdir}/Xi-allow-passive-keygrabs-on-the-XIAll-Master-Device.patch" + + autoreconf -fi + ./configure --prefix=/usr \ + --enable-ipv6 \ + --enable-dri \ + --enable-dmx \ + --enable-xvfb \ + --enable-xnest \ + --enable-composite \ + --enable-xcsecurity \ + --enable-xorg \ + --enable-xephyr \ + --enable-glx-tls \ + --enable-kdrive \ + --enable-install-setuid \ + --enable-config-udev \ + --disable-config-dbus \ + --enable-record \ + --disable-xfbdev \ + --disable-xfake \ + --disable-static \ + --sysconfdir=/etc/X11 \ + --localstatedir=/var \ + --with-xkb-path=/usr/share/X11/xkb \ + --with-xkb-output=/var/lib/xkb \ + --with-fontrootdir=/usr/share/fonts + make + + # Disable subdirs for make install rule to make splitting easier + sed -e 's/^DMX_SUBDIRS =.*/DMX_SUBDIRS =/' \ + -e 's/^XVFB_SUBDIRS =.*/XVFB_SUBDIRS =/' \ + -e 's/^XNEST_SUBDIRS =.*/XNEST_SUBDIRS = /' \ + -e 's/^KDRIVE_SUBDIRS =.*/KDRIVE_SUBDIRS =/' \ + -i hw/Makefile +} + +package_xorg-server-common() { + pkgdesc="Xorg server common files" + depends=('xkeyboard-config' 'xorg-xkbcomp' 'xorg-setxkbmap' 'xorg-fonts-misc') + + cd "${srcdir}/${pkgbase}-${pkgver}" + install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-common" + install -m644 COPYING "${pkgdir}/usr/share/licenses/xorg-server-common" + + make -C xkb DESTDIR="${pkgdir}" install-data + + install -m755 -d "${pkgdir}/usr/share/man/man1" + install -m644 man/Xserver.1 "${pkgdir}/usr/share/man/man1/" + + install -m755 -d "${pkgdir}/usr/lib/xorg" + install -m644 dix/protocol.txt "${pkgdir}/usr/lib/xorg/" +} + +package_xorg-server() { + pkgdesc="Xorg X server" + depends=(libxdmcp libxfont udev libpciaccess libdrm pixman libgcrypt libxau xorg-server-common xf86-input-evdev) + backup=('etc/X11/xorg.conf.d/10-evdev.conf' 'etc/X11/xorg.conf.d/10-quirks.conf') + provides=('x-server') + groups=('xorg') + + cd "${srcdir}/${pkgbase}-${pkgver}" + make DESTDIR="${pkgdir}" install + + install -m755 -d "${pkgdir}/etc/X11" + mv "${pkgdir}/usr/share/X11/xorg.conf.d" "${pkgdir}/etc/X11/" + install -m644 "${srcdir}/10-quirks.conf" "${pkgdir}/etc/X11/xorg.conf.d/" + + rmdir "${pkgdir}/usr/share/X11" + + # Needed for non-mesa drivers, libgl will restore it + mv "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so" \ + "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.xorg" + + rm -rf "${pkgdir}/var" + + rm -f "${pkgdir}/usr/share/man/man1/Xserver.1" + rm -f "${pkgdir}/usr/lib/xorg/protocol.txt" + + install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server" + ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server/COPYING" + + rm -rf "${pkgdir}/usr/lib/pkgconfig" + rm -rf "${pkgdir}/usr/include" + rm -rf "${pkgdir}/usr/share/aclocal" +} + +package_xorg-server-xephyr() { + pkgdesc="A nested X server that runs as an X application" + depends=(libxfont libgl libgcrypt libxv pixman xorg-server-common) + + cd "${srcdir}/${pkgbase}-${pkgver}/hw/kdrive" + make DESTDIR="${pkgdir}" install + + install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xephyr" + ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xephyr/COPYING" +} + +package_xorg-server-xvfb() { + pkgdesc="Virtual framebuffer X server" + depends=(libxfont libxdmcp libxau libgcrypt pixman xorg-server-common) + + cd "${srcdir}/${pkgbase}-${pkgver}/hw/vfb" + make DESTDIR="${pkgdir}" install + + install -m755 "${srcdir}/xvfb-run" "${pkgdir}/usr/bin/" + install -m644 "${srcdir}/xvfb-run.1" "${pkgdir}/usr/share/man/man1/" + + install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xvfb" + ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xvfb/COPYING" +} + +package_xorg-server-xnest() { + pkgdesc="A nested X server that runs as an X application" + depends=(libxfont libxext libgcrypt pixman xorg-server-common) + + cd "${srcdir}/${pkgbase}-${pkgver}/hw/xnest" + make DESTDIR="${pkgdir}" install + + install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xnest" + ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xnest/COPYING" +} + +package_xorg-server-xdmx() { + pkgdesc="Distributed Multihead X Server and utilities" + depends=(libxfont libxi libgcrypt libxaw libxrender libdmx libxfixes pixman xorg-server-common) + + cd "${srcdir}/${pkgbase}-${pkgver}/hw/dmx" + make DESTDIR="${pkgdir}" install + + install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xdmx" + ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xdmx/COPYING" +} + +package_xorg-server-devel() { + pkgdesc="Development files for the X.Org X server" + depends=(xproto randrproto renderproto xextproto inputproto kbproto fontsproto videoproto dri2proto xineramaproto xorg-util-macros pixman libpciaccess) + + cd "${srcdir}/${pkgbase}-${pkgver}" + make DESTDIR="${pkgdir}" install + + rm -rf "${pkgdir}/usr/bin" + rm -rf "${pkgdir}/usr/share/man" + rm -rf "${pkgdir}/usr/share/doc" + rm -rf "${pkgdir}/usr/share/X11" + rm -rf "${pkgdir}/usr/lib/xorg" + rm -rf "${pkgdir}/var" + + install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-devel" + ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-devel/COPYING" +} diff --git a/testing/xorg-server/Xi-allow-passive-keygrabs-on-the-XIAll-Master-Device.patch b/testing/xorg-server/Xi-allow-passive-keygrabs-on-the-XIAll-Master-Device.patch new file mode 100644 index 000000000..8bddb2945 --- /dev/null +++ b/testing/xorg-server/Xi-allow-passive-keygrabs-on-the-XIAll-Master-Device.patch @@ -0,0 +1,31 @@ +From 97f2af5876dab0dfab06be735416f3fc950ed39e Mon Sep 17 00:00:00 2001 +From: Peter Hutterer <peter.hutterer@who-t.net> +Date: Thu, 27 Oct 2011 11:03:39 +1000 +Subject: [PATCH] Xi: allow passive keygrabs on the XIAll(Master)Devices fake + devices + +They don't have a KeyClassRec, but we must still allow passive grabs on +them. + +Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> +Tested-by: Bastien Nocera <hadess@hadess.net> +--- + Xi/exevents.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/Xi/exevents.c b/Xi/exevents.c +index 053c76f..edf2c39 100644 +--- a/Xi/exevents.c ++++ b/Xi/exevents.c +@@ -1495,7 +1495,7 @@ GrabKey(ClientPtr client, DeviceIntPtr dev, DeviceIntPtr modifier_device, + rc = CheckGrabValues(client, param); + if (rc != Success) + return rc; +- if (k == NULL) ++ if ((dev->id != XIAllDevices && dev->id != XIAllMasterDevices) && k == NULL) + return BadMatch; + if (grabtype == GRABTYPE_XI) + { +-- +1.7.7 + diff --git a/testing/xorg-server/autoconfig-nvidia.patch b/testing/xorg-server/autoconfig-nvidia.patch new file mode 100644 index 000000000..baa2eb601 --- /dev/null +++ b/testing/xorg-server/autoconfig-nvidia.patch @@ -0,0 +1,29 @@ +--- a/hw/xfree86/common/xf86pciBus.c ++++ b/hw/xfree86/common/xf86pciBus.c +@@ -1123,7 +1123,25 @@ videoPtrToDriverList(struct pci_device * + break; + case 0x102b: driverList[0] = "mga"; break; + case 0x10c8: driverList[0] = "neomagic"; break; +- case 0x10de: case 0x12d2: driverList[0] = "nv"; break; ++ case 0x10de: case 0x12d2: ++ switch (dev->device_id) { ++ /* NV1 */ ++ case 0x0008: ++ case 0x0009: ++ driverList[0] = "vesa"; ++ break; ++ /* NV3 */ ++ case 0x0018: ++ case 0x0019: ++ driverList[0] = "nv"; ++ break; ++ default: ++ driverList[0] = "nouveau"; ++ driverList[1] = "nv"; ++ driverList[2] = "nvidia"; ++ break; ++ } ++ break; + case 0x1106: driverList[0] = "openchrome"; break; + case 0x1b36: driverList[0] = "qxl"; break; + case 0x1163: driverList[0] = "rendition"; break; diff --git a/testing/xorg-server/autoconfig-sis.patch b/testing/xorg-server/autoconfig-sis.patch new file mode 100644 index 000000000..d936efaaa --- /dev/null +++ b/testing/xorg-server/autoconfig-sis.patch @@ -0,0 +1,19 @@ +--- hw/xfree86/common/xf86pciBus.c.orig 2011-09-24 10:53:45.421697668 +0000 ++++ hw/xfree86/common/xf86pciBus.c 2011-09-24 10:55:56.416250708 +0000 +@@ -1140,7 +1140,15 @@ + driverList[0] = "savage"; break; + } + break; +- case 0x1039: driverList[0] = "sis"; break; ++ case 0x1039: ++ switch (dev->device_id) ++ { ++ case 0x6350: case 0x6351: ++ driverList[0] = "sisimedia"; driverList[1] = "sis"; break; ++ default: ++ driverList[0] = "sis"; break; ++ } ++ break; + case 0x126f: driverList[0] = "siliconmotion"; break; + case 0x121a: + if (dev->device_id < 0x0003) diff --git a/testing/xorg-server/git-fixes.patch b/testing/xorg-server/git-fixes.patch new file mode 100644 index 000000000..27da61eca --- /dev/null +++ b/testing/xorg-server/git-fixes.patch @@ -0,0 +1,161 @@ +From 89626304ea1ad316c5b7145a40f09377148cff21 Mon Sep 17 00:00:00 2001 +From: Dave Airlie <airlied@redhat.com> +Date: Thu, 20 Oct 2011 13:43:01 +0000 +Subject: xf86Crtc: handle no outputs with no modes harder. + +If you started an X server with no connected outputs, we pick a default +1024x768 mode, however if you then ran an xvidmode using app against that +server it would segfault the server due to not finding any valid modes. + +This was due to the no output mode set code, only adding the modes to the +scrn->modes once, when something called randr 1.2 xf86SetScrnInfoModes would +get called and remove all the modes and we'd end up with 0. + +This change fixes xf86SetScrnInfoModes to always report a scrn mode of at +least 1024x768, and pushes the initial configuration to just call it instead +of setting up the mode itself. + +Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=746926 + +I've seen other bugs like this on other distros so it might also actually fix them. + +Signed-off-by: Dave Airlie <airlied@redhat.com> +Reviewed-by: Keith Packard <keithp@keithp.com> +Signed-off-by: Keith Packard <keithp@keithp.com> +(cherry picked from commit 17416e88dcfcc584fe5f87580d5d2b719b3521c3) +--- +diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c +index d75cd77..8906806 100644 +--- a/hw/xfree86/modes/xf86Crtc.c ++++ b/hw/xfree86/modes/xf86Crtc.c +@@ -1915,19 +1915,25 @@ xf86SetScrnInfoModes (ScrnInfoPtr scrn) + break; + } + +- if (scrn->modes != NULL) { +- /* For some reason, scrn->modes is circular, unlike the other mode +- * lists. How great is that? +- */ +- for (last = scrn->modes; last && last->next; last = last->next) +- ; +- last->next = scrn->modes; +- scrn->modes->prev = last; +- if (mode) { +- while (scrn->modes != mode) +- scrn->modes = scrn->modes->next; +- } ++ if (!scrn->modes) { ++ scrn->modes = xf86ModesAdd(scrn->modes, ++ xf86CVTMode(scrn->display->virtualX, ++ scrn->display->virtualY, ++ 60, 0, 0)); ++ } ++ ++ /* For some reason, scrn->modes is circular, unlike the other mode ++ * lists. How great is that? ++ */ ++ for (last = scrn->modes; last && last->next; last = last->next) ++ ; ++ last->next = scrn->modes; ++ scrn->modes->prev = last; ++ if (mode) { ++ while (scrn->modes != mode) ++ scrn->modes = scrn->modes->next; + } ++ + scrn->currentMode = scrn->modes; + #ifdef XFreeXDGA + if (scrn->pScreen) +@@ -2529,16 +2535,7 @@ xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow) + width, height); + } + +- if (have_outputs) { +- /* Mirror output modes to scrn mode list */ +- xf86SetScrnInfoModes (scrn); +- } else { +- /* Clear any existing modes from scrn->modes */ +- while (scrn->modes != NULL) +- xf86DeleteMode(&scrn->modes, scrn->modes); +- scrn->modes = xf86ModesAdd(scrn->modes, +- xf86CVTMode(width, height, 60, 0, 0)); +- } ++ xf86SetScrnInfoModes (scrn); + + success = TRUE; + bailout: +-- +cgit v0.9.0.2-2-gbebe +From 97f2ae60fc0cc755abd8b88df826fcb1a20464fe Mon Sep 17 00:00:00 2001 +From: Christopher Yeleighton <giecrilj@stegny.2a.pl> +Date: Tue, 25 Oct 2011 01:47:06 +0000 +Subject: Bug 38420: Xvfb crashes in miInitVisuals() when started with depth=2 + +https://bugs.freedesktop.org/show_bug.cgi?id=38420 + +Exit with fatal error message, not segfault. + +Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> +Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> +Signed-off-by: Keith Packard <keithp@keithp.com> +(cherry picked from commit 7d50211ab57a35910d79fc3f67ae89aff91fa995) +--- +diff --git a/hw/vfb/InitOutput.c b/hw/vfb/InitOutput.c +index 31ed505..dce3f84 100644 +--- a/hw/vfb/InitOutput.c ++++ b/hw/vfb/InitOutput.c +@@ -864,6 +864,8 @@ vfbScreenInit(int index, ScreenPtr pScreen, int argc, char **argv) + (1 << DirectColor)), + 10, TrueColor, 0x3ff00000, 0x000ffc00, 0x000003ff); + break; ++ default: ++ return FALSE; + } + + miSetPixmapDepths (); +-- +cgit v0.9.0.2-2-gbebe +From 34bb83b9df20ff63dbb147ed661f39efb8bae8e4 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer <peter.hutterer@who-t.net> +Date: Mon, 24 Oct 2011 02:00:32 +0000 +Subject: dix: block signals when closing all devices + +When closing down all devices, we manually unset master for all attached +devices, but the device's sprite info still points to the master's sprite +info. This leaves us a window where the master is freed already but the +device isn't yet. A signal during that window causes dereference of the +already freed spriteInfo in mieqEnqueue's EnqueueScreen macro. + +Simply block signals when removing all devices. It's not like we're really +worrying about high-responsive input at this stage. + +https://bugzilla.redhat.com/show_bug.cgi?id=737031 + +Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> +Reviewed-by: Julien Cristau <jcristau@debian.org> +(cherry picked from commit d7c44a7c9760449bef263413ad3b20f19b1dc95a) +--- +diff --git a/dix/devices.c b/dix/devices.c +index 0ccf252..cbdd4ea 100644 +--- a/dix/devices.c ++++ b/dix/devices.c +@@ -982,6 +982,8 @@ CloseDownDevices(void) + { + DeviceIntPtr dev; + ++ OsBlockSignals(); ++ + /* Float all SDs before closing them. Note that at this point resources + * (e.g. cursors) have been freed already, so we can't just call + * AttachDevice(NULL, dev, NULL). Instead, we have to forcibly set master +@@ -1004,6 +1006,8 @@ CloseDownDevices(void) + inputInfo.keyboard = NULL; + inputInfo.pointer = NULL; + XkbDeleteRulesDflts(); ++ ++ OsReleaseSignals(); + } + + /** +-- +cgit v0.9.0.2-2-gbebe diff --git a/testing/xorg-server/revert-trapezoids.patch b/testing/xorg-server/revert-trapezoids.patch new file mode 100644 index 000000000..b9046c5cb --- /dev/null +++ b/testing/xorg-server/revert-trapezoids.patch @@ -0,0 +1,179 @@ +diff -ru a/fb/fbpict.c b/fb/fbpict.c +--- a/fb/fbpict.c 2011-08-01 01:44:24.000000000 +0200 ++++ b/fb/fbpict.c 2011-10-05 22:45:29.000000000 +0200 +@@ -364,7 +364,7 @@ + ps->Glyphs = miGlyphs; + ps->CompositeRects = miCompositeRects; + ps->RasterizeTrapezoid = fbRasterizeTrapezoid; +- ps->Trapezoids = fbTrapezoids; ++ ps->Trapezoids = miTrapezoids; + ps->AddTraps = fbAddTraps; + ps->AddTriangles = fbAddTriangles; + ps->Triangles = fbTriangles; +diff -ru a/render/mipict.c b/render/mipict.c +--- a/render/mipict.c 2011-04-04 05:19:50.000000000 +0200 ++++ b/render/mipict.c 2011-10-05 22:02:53.000000000 +0200 +@@ -573,6 +573,67 @@ + } + } + ++void ++miTrapezoids (CARD8 op, ++ PicturePtr pSrc, ++ PicturePtr pDst, ++ PictFormatPtr maskFormat, ++ INT16 xSrc, ++ INT16 ySrc, ++ int ntrap, ++ xTrapezoid *traps) ++{ ++ ScreenPtr pScreen = pDst->pDrawable->pScreen; ++ PictureScreenPtr ps = GetPictureScreen(pScreen); ++ ++ /* ++ * Check for solid alpha add ++ */ ++ if (op == PictOpAdd && miIsSolidAlpha (pSrc)) ++ { ++ for (; ntrap; ntrap--, traps++) ++ (*ps->RasterizeTrapezoid) (pDst, traps, 0, 0); ++ } ++ else if (maskFormat) ++ { ++ PicturePtr pPicture; ++ BoxRec bounds; ++ INT16 xDst, yDst; ++ INT16 xRel, yRel; ++ ++ xDst = traps[0].left.p1.x >> 16; ++ yDst = traps[0].left.p1.y >> 16; ++ ++ miTrapezoidBounds (ntrap, traps, &bounds); ++ if (bounds.y1 >= bounds.y2 || bounds.x1 >= bounds.x2) ++ return; ++ pPicture = miCreateAlphaPicture (pScreen, pDst, maskFormat, ++ bounds.x2 - bounds.x1, ++ bounds.y2 - bounds.y1); ++ if (!pPicture) ++ return; ++ for (; ntrap; ntrap--, traps++) ++ (*ps->RasterizeTrapezoid) (pPicture, traps, ++ -bounds.x1, -bounds.y1); ++ xRel = bounds.x1 + xSrc - xDst; ++ yRel = bounds.y1 + ySrc - yDst; ++ CompositePicture (op, pSrc, pPicture, pDst, ++ xRel, yRel, 0, 0, bounds.x1, bounds.y1, ++ bounds.x2 - bounds.x1, ++ bounds.y2 - bounds.y1); ++ FreePicture (pPicture, 0); ++ } ++ else ++ { ++ if (pDst->polyEdge == PolyEdgeSharp) ++ maskFormat = PictureMatchFormat (pScreen, 1, PICT_a1); ++ else ++ maskFormat = PictureMatchFormat (pScreen, 8, PICT_a8); ++ for (; ntrap; ntrap--, traps++) ++ miTrapezoids (op, pSrc, pDst, maskFormat, xSrc, ySrc, 1, traps); ++ } ++} ++ + Bool + miPictureInit (ScreenPtr pScreen, PictFormatPtr formats, int nformats) + { +@@ -599,7 +660,7 @@ + ps->Composite = 0; /* requires DDX support */ + ps->Glyphs = miGlyphs; + ps->CompositeRects = miCompositeRects; +- ps->Trapezoids = 0; ++ ps->Trapezoids = miTrapezoids; + ps->Triangles = 0; + + ps->RasterizeTrapezoid = 0; /* requires DDX support */ +diff -ru a/render/mipict.h b/render/mipict.h +--- a/render/mipict.h 2011-04-04 05:19:50.000000000 +0200 ++++ b/render/mipict.h 2011-10-05 22:06:19.000000000 +0200 +@@ -129,6 +129,23 @@ + CARD32 pixel, + xRenderColor *color); + ++extern _X_EXPORT PicturePtr ++miCreateAlphaPicture (ScreenPtr pScreen, ++ PicturePtr pDst, ++ PictFormatPtr pPictFormat, ++ CARD16 width, ++ CARD16 height); ++ ++extern _X_EXPORT void ++miTrapezoids (CARD8 op, ++ PicturePtr pSrc, ++ PicturePtr pDst, ++ PictFormatPtr maskFormat, ++ INT16 xSrc, ++ INT16 ySrc, ++ int ntrap, ++ xTrapezoid *traps); ++ + extern _X_EXPORT Bool + miIsSolidAlpha (PicturePtr pSrc); + +diff -ru a/render/mitrap.c b/render/mitrap.c +--- a/render/mitrap.c 2011-04-04 05:19:50.000000000 +0200 ++++ b/render/mitrap.c 2011-10-05 22:05:29.000000000 +0200 +@@ -34,6 +34,55 @@ + #include "picturestr.h" + #include "mipict.h" + ++PicturePtr ++miCreateAlphaPicture (ScreenPtr pScreen, ++ PicturePtr pDst, ++ PictFormatPtr pPictFormat, ++ CARD16 width, ++ CARD16 height) ++{ ++ PixmapPtr pPixmap; ++ PicturePtr pPicture; ++ GCPtr pGC; ++ int error; ++ xRectangle rect; ++ ++ if (width > 32767 || height > 32767) ++ return 0; ++ ++ if (!pPictFormat) ++ { ++ if (pDst->polyEdge == PolyEdgeSharp) ++ pPictFormat = PictureMatchFormat (pScreen, 1, PICT_a1); ++ else ++ pPictFormat = PictureMatchFormat (pScreen, 8, PICT_a8); ++ if (!pPictFormat) ++ return 0; ++ } ++ ++ pPixmap = (*pScreen->CreatePixmap) (pScreen, width, height, ++ pPictFormat->depth, 0); ++ if (!pPixmap) ++ return 0; ++ pGC = GetScratchGC (pPixmap->drawable.depth, pScreen); ++ if (!pGC) ++ { ++ (*pScreen->DestroyPixmap) (pPixmap); ++ return 0; ++ } ++ ValidateGC (&pPixmap->drawable, pGC); ++ rect.x = 0; ++ rect.y = 0; ++ rect.width = width; ++ rect.height = height; ++ (*pGC->ops->PolyFillRect)(&pPixmap->drawable, pGC, 1, &rect); ++ FreeScratchGC (pGC); ++ pPicture = CreatePicture (0, &pPixmap->drawable, pPictFormat, ++ 0, 0, serverClient, &error); ++ (*pScreen->DestroyPixmap) (pPixmap); ++ return pPicture; ++} ++ + static xFixed + miLineFixedX (xLineFixed *l, xFixed y, Bool ceil) + { + diff --git a/testing/xorg-server/xserver-1.11.2-record-crasher.patch b/testing/xorg-server/xserver-1.11.2-record-crasher.patch new file mode 100644 index 000000000..3af207bb9 --- /dev/null +++ b/testing/xorg-server/xserver-1.11.2-record-crasher.patch @@ -0,0 +1,241 @@ +From patchwork Tue Nov 8 18:22:13 2011 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 8bit +Subject: Save major/minor opcodes in ClientRec for RecordAReply +Date: Tue, 08 Nov 2011 18:22:13 -0000 +From: Keith Packard <keithp@keithp.com> +X-Patchwork-Id: 7866 +Message-Id: <1320776533-3120-1-git-send-email-keithp@keithp.com> +To: xorg-devel@lists.freedesktop.org + +The record extension needs the major and minor opcodes in the reply +hook, but the request buffer may have been freed by the time the hook +is invoked. Saving the request major and minor codes as the request is +executed avoids fetching from the defunct request buffer. + +This patch also eliminates the public MinorOpcodeOfRequest function, +making it static to dispatch. Usages of that function have been +replaced with direct access to the new ClientRec field. + +Signed-off-by: Keith Packard <keithp@keithp.com> +Reviewed-by: Rami Ylimäki <rami.ylimaki@vincit.fi> + +--- +Here's what I was thinking of to fix this -- just record the major and +minor opcodes of the request in the ClientRec during Dispatch and then +using those fields in RecordAReply instead of fetching the discarded +request buffer. + +This is entirely untested; I don't know how to make the old code break. + + Xext/security.c | 4 +--- + Xext/xselinux_hooks.c | 4 ++-- + dix/dispatch.c | 31 ++++++++++++++++++++++--------- + dix/extension.c | 14 -------------- + include/dixstruct.h | 1 + + include/extension.h | 2 -- + record/record.c | 8 +++----- + 7 files changed, 29 insertions(+), 35 deletions(-) + +[ fedora: technically this is an ABI breaker since it's changing ClientRec, + but hopefully not in a way that matters. If it does matter, easiest thing + to do is have Record add a hook for XaceHookDispatch. - ajax ] + +diff --git a/Xext/security.c b/Xext/security.c +index 08d8158..b0d82ab 100644 +--- a/Xext/security.c ++++ b/Xext/security.c +@@ -148,9 +148,7 @@ SecurityLabelInitial(void) + static _X_INLINE const char * + SecurityLookupRequestName(ClientPtr client) + { +- int major = ((xReq *)client->requestBuffer)->reqType; +- int minor = MinorOpcodeOfRequest(client); +- return LookupRequestName(major, minor); ++ return LookupRequestName(client->majorOp, client->minorOp); + } + + +diff --git a/Xext/xselinux_hooks.c b/Xext/xselinux_hooks.c +index f1d8e5d..0d4c9ab 100644 +--- a/Xext/xselinux_hooks.c ++++ b/Xext/xselinux_hooks.c +@@ -263,8 +263,8 @@ SELinuxAudit(void *auditdata, + if (client) { + REQUEST(xReq); + if (stuff) { +- major = stuff->reqType; +- minor = MinorOpcodeOfRequest(client); ++ major = client->majorOp; ++ minor = client->minorOp; + } + } + if (audit->id) +diff --git a/dix/dispatch.c b/dix/dispatch.c +index 6e33615..3600acd 100644 +--- a/dix/dispatch.c ++++ b/dix/dispatch.c +@@ -337,7 +337,20 @@ DisableLimitedSchedulingLatency(void) + SmartScheduleLatencyLimited = 0; + } + +-#define MAJOROP ((xReq *)client->requestBuffer)->reqType ++static inline unsigned short ++MinorOpcodeOfRequest(ClientPtr client) ++{ ++ unsigned char major; ++ ExtensionEntry *ext; ++ ++ major = ((xReq *)client->requestBuffer)->reqType; ++ if (major < EXTENSION_BASE) ++ return 0; ++ ext = GetExtensionEntry(major); ++ if (!ext) ++ return 0; ++ return ext->MinorOpcode (client); ++} + + void + Dispatch(void) +@@ -419,21 +432,23 @@ Dispatch(void) + } + + client->sequence++; ++ client->majorOp = ((xReq *)client->requestBuffer)->reqType; ++ client->minorOp = MinorOpcodeOfRequest(client); + #ifdef XSERVER_DTRACE +- XSERVER_REQUEST_START(LookupMajorName(MAJOROP), MAJOROP, ++ XSERVER_REQUEST_START(LookupMajorName(client->majorOp), client->majorOp, + ((xReq *)client->requestBuffer)->length, + client->index, client->requestBuffer); + #endif + if (result > (maxBigRequestSize << 2)) + result = BadLength; + else { +- result = XaceHookDispatch(client, MAJOROP); ++ result = XaceHookDispatch(client, client->majorOp); + if (result == Success) +- result = (* client->requestVector[MAJOROP])(client); ++ result = (* client->requestVector[client->majorOp])(client); + XaceHookAuditEnd(client, result); + } + #ifdef XSERVER_DTRACE +- XSERVER_REQUEST_DONE(LookupMajorName(MAJOROP), MAJOROP, ++ XSERVER_REQUEST_DONE(LookupMajorName(client->majorOp), client->majorOp, + client->sequence, client->index, result); + #endif + +@@ -444,8 +459,8 @@ Dispatch(void) + } + else if (result != Success) + { +- SendErrorToClient(client, MAJOROP, +- MinorOpcodeOfRequest(client), ++ SendErrorToClient(client, client->majorOp, ++ client->minorOp, + client->errorValue, result); + break; + } +@@ -466,8 +481,6 @@ Dispatch(void) + SmartScheduleLatencyLimited = 0; + } + +-#undef MAJOROP +- + static int VendorRelease = VENDOR_RELEASE; + static char *VendorString = VENDOR_NAME; + +diff --git a/dix/extension.c b/dix/extension.c +index c7bbac5..b677cdb 100644 +--- a/dix/extension.c ++++ b/dix/extension.c +@@ -228,20 +228,6 @@ StandardMinorOpcode(ClientPtr client) + return ((xReq *)client->requestBuffer)->data; + } + +-unsigned short +-MinorOpcodeOfRequest(ClientPtr client) +-{ +- unsigned char major; +- +- major = ((xReq *)client->requestBuffer)->reqType; +- if (major < EXTENSION_BASE) +- return 0; +- major -= EXTENSION_BASE; +- if (major >= NumExtensions) +- return 0; +- return (*extensions[major]->MinorOpcode)(client); +-} +- + void + CloseDownExtensions(void) + { +diff --git a/include/dixstruct.h b/include/dixstruct.h +index 6cc9614..0a85f40 100644 +--- a/include/dixstruct.h ++++ b/include/dixstruct.h +@@ -122,6 +122,7 @@ typedef struct _Client { + + DeviceIntPtr clientPtr; + ClientIdPtr clientIds; ++ unsigned short majorOp, minorOp; + } ClientRec; + + /* +diff --git a/include/extension.h b/include/extension.h +index 29a11c3..9249951 100644 +--- a/include/extension.h ++++ b/include/extension.h +@@ -52,8 +52,6 @@ _XFUNCPROTOBEGIN + + extern _X_EXPORT unsigned short StandardMinorOpcode(ClientPtr /*client*/); + +-extern _X_EXPORT unsigned short MinorOpcodeOfRequest(ClientPtr /*client*/); +- + extern _X_EXPORT Bool EnableDisableExtension(char *name, Bool enable); + + extern _X_EXPORT void EnableDisableExtensionError(char *name, Bool enable); +diff --git a/record/record.c b/record/record.c +index 68311ac..4a0fe23 100644 +--- a/record/record.c ++++ b/record/record.c +@@ -546,7 +546,7 @@ RecordARequest(ClientPtr client) + } + else /* extension, check minor opcode */ + { +- int minorop = MinorOpcodeOfRequest(client); ++ int minorop = client->minorOp; + int numMinOpInfo; + RecordMinorOpPtr pMinorOpInfo = pRCAP->pRequestMinOpInfo; + +@@ -603,12 +603,9 @@ RecordAReply(CallbackListPtr *pcbl, pointer nulldata, pointer calldata) + RecordContextPtr pContext; + RecordClientsAndProtocolPtr pRCAP; + int eci; +- int majorop; + ReplyInfoRec *pri = (ReplyInfoRec *)calldata; + ClientPtr client = pri->client; +- REQUEST(xReq); + +- majorop = stuff->reqType; + for (eci = 0; eci < numEnabledContexts; eci++) + { + pContext = ppAllContexts[eci]; +@@ -616,6 +613,7 @@ RecordAReply(CallbackListPtr *pcbl, pointer nulldata, pointer calldata) + NULL); + if (pRCAP) + { ++ int majorop = client->majorOp; + if (pContext->continuedReply) + { + RecordAProtocolElement(pContext, client, XRecordFromServer, +@@ -635,7 +633,7 @@ RecordAReply(CallbackListPtr *pcbl, pointer nulldata, pointer calldata) + } + else /* extension, check minor opcode */ + { +- int minorop = MinorOpcodeOfRequest(client); ++ int minorop = client->minorOp; + int numMinOpInfo; + RecordMinorOpPtr pMinorOpInfo = pRCAP->pReplyMinOpInfo; + assert (pMinorOpInfo); diff --git a/testing/xorg-server/xvfb-run b/testing/xorg-server/xvfb-run new file mode 100644 index 000000000..4c2f4e0d3 --- /dev/null +++ b/testing/xorg-server/xvfb-run @@ -0,0 +1,180 @@ +#!/bin/sh + +# $Id: xvfb-run 2027 2004-11-16 14:54:16Z branden $ + +# This script starts an instance of Xvfb, the "fake" X server, runs a command +# with that server available, and kills the X server when done. The return +# value of the command becomes the return value of this script. +# +# If anyone is using this to build a Debian package, make sure the package +# Build-Depends on xvfb, xbase-clients, and xfonts-base. + +set -e + +PROGNAME=xvfb-run +SERVERNUM=99 +AUTHFILE= +ERRORFILE=/dev/null +STARTWAIT=3 +XVFBARGS="-screen 0 640x480x8" +LISTENTCP="-nolisten tcp" +XAUTHPROTO=. + +# Query the terminal to establish a default number of columns to use for +# displaying messages to the user. This is used only as a fallback in the event +# the COLUMNS variable is not set. ($COLUMNS can react to SIGWINCH while the +# script is running, and this cannot, only being calculated once.) +DEFCOLUMNS=$(stty size 2>/dev/null | awk '{print $2}') || true +if ! expr "$DEFCOLUMNS" : "[[:digit:]]\+$" >/dev/null 2>&1; then + DEFCOLUMNS=80 +fi + +# Display a message, wrapping lines at the terminal width. +message () { + echo "$PROGNAME: $*" | fmt -t -w ${COLUMNS:-$DEFCOLUMNS} +} + +# Display an error message. +error () { + message "error: $*" >&2 +} + +# Display a usage message. +usage () { + if [ -n "$*" ]; then + message "usage error: $*" + fi + cat <<EOF +Usage: $PROGNAME [OPTION ...] COMMAND +Run COMMAND (usually an X client) in a virtual X server environment. +Options: +-a --auto-servernum try to get a free server number, starting at + --server-num +-e FILE --error-file=FILE file used to store xauth errors and Xvfb + output (default: $ERRORFILE) +-f FILE --auth-file=FILE file used to store auth cookie + (default: ./.Xauthority) +-h --help display this usage message and exit +-n NUM --server-num=NUM server number to use (default: $SERVERNUM) +-l --listen-tcp enable TCP port listening in the X server +-p PROTO --xauth-protocol=PROTO X authority protocol name to use + (default: xauth command's default) +-s ARGS --server-args=ARGS arguments (other than server number and + "-nolisten tcp") to pass to the Xvfb server + (default: "$XVFBARGS") +-w DELAY --wait=DELAY delay in seconds to wait for Xvfb to start + before running COMMAND (default: $STARTWAIT) +EOF +} + +# Find a free server number by looking at .X*-lock files in /tmp. +find_free_servernum() { + # Sadly, the "local" keyword is not POSIX. Leave the next line commented in + # the hope Debian Policy eventually changes to allow it in /bin/sh scripts + # anyway. + #local i + + i=$SERVERNUM + while [ -f /tmp/.X$i-lock ]; do + i=$(($i + 1)) + done + echo $i +} + +# Clean up files +clean_up() { + if [ -e "$AUTHFILE" ]; then + XAUTHORITY=$AUTHFILE xauth remove ":$SERVERNUM" >>"$ERRORFILE" 2>&1 + fi + if [ -n "$XVFB_RUN_TMPDIR" ]; then + if ! rm -r "$XVFB_RUN_TMPDIR"; then + error "problem while cleaning up temporary directory" + exit 5 + fi + fi +} + +# Parse the command line. +ARGS=$(getopt --options +ae:f:hn:lp:s:w: \ + --long auto-servernum,error-file:,auth-file:,help,server-num:,listen-tcp,xauth-protocol:,server-args:,wait: \ + --name "$PROGNAME" -- "$@") +GETOPT_STATUS=$? + +if [ $GETOPT_STATUS -ne 0 ]; then + error "internal error; getopt exited with status $GETOPT_STATUS" + exit 6 +fi + +eval set -- "$ARGS" + +while :; do + case "$1" in + -a|--auto-servernum) SERVERNUM=$(find_free_servernum) ;; + -e|--error-file) ERRORFILE="$2"; shift ;; + -f|--auth-file) AUTHFILE="$2"; shift ;; + -h|--help) SHOWHELP="yes" ;; + -n|--server-num) SERVERNUM="$2"; shift ;; + -l|--listen-tcp) LISTENTCP="" ;; + -p|--xauth-protocol) XAUTHPROTO="$2"; shift ;; + -s|--server-args) XVFBARGS="$2"; shift ;; + -w|--wait) STARTWAIT="$2"; shift ;; + --) shift; break ;; + *) error "internal error; getopt permitted \"$1\" unexpectedly" + exit 6 + ;; + esac + shift +done + +if [ "$SHOWHELP" ]; then + usage + exit 0 +fi + +if [ -z "$*" ]; then + usage "need a command to run" >&2 + exit 2 +fi + +if ! which xauth >/dev/null; then + error "xauth command not found" + exit 3 +fi + +# tidy up after ourselves +trap clean_up EXIT + +# If the user did not specify an X authorization file to use, set up a temporary +# directory to house one. +if [ -z "$AUTHFILE" ]; then + XVFB_RUN_TMPDIR="$(mktemp -d -t $PROGNAME.XXXXXX)" + AUTHFILE="$XVFB_RUN_TMPDIR/Xauthority" +fi + +# Start Xvfb. +MCOOKIE=$(mcookie) +XAUTHORITY=$AUTHFILE xauth source - << EOF >>"$ERRORFILE" 2>&1 +add :$SERVERNUM $XAUTHPROTO $MCOOKIE +EOF +XAUTHORITY=$AUTHFILE Xvfb ":$SERVERNUM" $XVFBARGS $LISTENTCP >>"$ERRORFILE" \ + 2>&1 & +XVFBPID=$! +sleep "$STARTWAIT" +if ! kill -0 $XVFBPID 2>/dev/null; then + echo "Xvfb failed to start" >&2 + exit 1 +fi + +# Start the command and save its exit status. +set +e +DISPLAY=:$SERVERNUM XAUTHORITY=$AUTHFILE "$@" 2>&1 +RETVAL=$? +set -e + +# Kill Xvfb now that the command has exited. +kill $XVFBPID + +# Return the executed command's exit status. +exit $RETVAL + +# vim:set ai et sts=4 sw=4 tw=80: diff --git a/testing/xorg-server/xvfb-run.1 b/testing/xorg-server/xvfb-run.1 new file mode 100644 index 000000000..137d3a196 --- /dev/null +++ b/testing/xorg-server/xvfb-run.1 @@ -0,0 +1,282 @@ +.\" $Id: xvfb-run.1 2138 2005-01-17 23:40:27Z branden $ +.\" +.\" Copyright 1998-2004 Branden Robinson <branden@debian.org>. +.\" +.\" This is free software; you may redistribute it and/or modify +.\" it under the terms of the GNU General Public License as +.\" published by the Free Software Foundation; either version 2, +.\" or (at your option) any later version. +.\" +.\" This 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 with +.\" the Debian operating system, in /usr/share/common-licenses/GPL; if +.\" not, write to the Free Software Foundation, Inc., 59 Temple Place, +.\" Suite 330, Boston, MA 02111-1307 USA +.\" +.\" We need the URL macro from groff's www macro package, but also want +.\" things to work all right for people who don't have it. So we define +.\" our own URL macro and let the www macro package override it if it's +.\" available. +.de URL +\\$2 \(laURL: \\$1 \(ra\\$3 +.. +.if \n[.g] .mso www.tmac +.TH xvfb\-run 1 "2004\-11\-12" "Debian Project" +.SH NAME +xvfb\-run \- run specified X client or command in a virtual X server environment +.SH SYNOPSIS +.B xvfb\-run +[ +.I options +] +.I command +.SH DESCRIPTION +.B xvfb\-run +is a wrapper for the +.BR Xvfb (1x) +command which simplifies the task of running commands (typically an X +client, or a script containing a list of clients to be run) within a virtual +X server environment. +.PP +.B xvfb\-run +sets up an X authority file (or uses an existing user\-specified one), +writes a cookie to it (see +.BR xauth (1x)) +and then starts the +.B Xvfb +X server as a background process. +The process ID of +.B Xvfb +is stored for later use. +The specified +.I command +is then run using the X display corresponding to the +.B Xvfb +server +just started and the X authority file created earlier. +.PP +When the +.I command +exits, its status is saved, the +.B Xvfb +server is killed (using the process ID stored earlier), the X authority +cookie removed, and the authority file deleted (if the user did not specify +one to use). +.B xvfb\-run +then exits with the exit status of +.IR command . +.PP +.B xvfb\-run +requires the +.B xauth +command to function. +.SH OPTIONS +.TP +.B \-a\fR,\fB \-\-auto\-servernum +Try to get a free server number, starting at 99, or the argument to +.BR \-\-server\-num . +.TP +.BI \-e\ file \fR,\fB\ \-\-error\-file= file +Store output from +.B xauth +and +.B Xvfb +in +.IR file . +The default is +.IR /dev/null . +.TP +.BI \-f\ file \fR,\fB\ \-\-auth\-file= file +Store X authentication data in +.IR file . +By default, a temporary directory called +.IR xvfb\-run. PID +(where PID is the process ID of +.B xvfb\-run +itself) is created in the directory specified by the environment variable +.B TMPDIR +(or +.I /tmp +if that variable is null or unset), and the +.BR tempfile (1) +command is used to create a file in that temporary directory called +.IR Xauthority . +.TP +.B \-h\fR,\fB \-\-help +Display a usage message and exit. +.TP +.BI \-n\ servernumber \fR,\fB\ \-\-server\-num= servernumber +Use +.I servernumber +as the server number (but see the +.B \-a\fR,\fB \-\-auto\-servernum +option above). +The default is 99. +.TP +.B \-l\fR,\fB \-\-listen\-tcp +Enable TCP port listening in the X server. +For security reasons (to avoid denial\-of\-service attacks or exploits), +TCP port listening is disabled by default. +.TP +.BI \-p\ protocolname \fR,\fB\ \-\-xauth\-protocol= protocolname +Use +.I protocolname +as the X authority protocol to use. +The default is \(oq.\(cq, which +.B xauth +interprets as its own default protocol, which is MIT\-MAGIC\-COOKIE\-1. +.TP +.BI \-s\ arguments \fR,\fB\ \-\-server\-args= arguments +Pass +.I arguments +to the +.B Xvfb +server. +Be careful to quote any whitespace characters that may occur within +.I arguments +to prevent them from regarded as separators for +.BR xvfb\-run 's +own arguments. +Also, note that specification of \(oq\-nolisten tcp\(cq in +.I arguments +may override the function of +.BR xvfb\-run 's +own +.B \-l\fR,\fB \-\-listen\-tcp +option, and that specification of the server number (e.g., \(oq:1\(cq) may +be ignored because of the way the X server parses its argument list. +Use the +.B xvfb\-run +option +.BI \-n\ servernumber \fR,\fB\ \-\-server\-num= servernumber +to achieve the latter function. +The default is \(oq\-screen 0 640x480x8\(cq. +.TP +.BI \-w\ delay \fR,\fB\ \-\-wait= delay +Wait +.I delay +seconds after launching +.B Xvfb +before attempting to start the specified command. +The default is 3. +.SH ENVIRONMENT +.TP +.B COLUMNS +indicates the width of the terminal device in character cells. +This value is used for formatting diagnostic messages. +If not set, the terminal is queried using +.BR stty (1) +to determine its width. +If that fails, a value of \(oq80\(cq is assumed. +.TP +.B TMPDIR +specifies the directory in which to place +.BR xvfb\-run 's +temporary directory for storage of the X authority file; only used if the +.B \-f +or +.B \-\-auth\-file +options are not specified. +.SH "OUTPUT FILES" +.PP +Unless the +.B \-f +or +.B \-\-auth\-file +options are specified, a temporary +directory and file within it are created (and deleted) to store the X +authority cookies used by the +.B Xvfb +server and client(s) run under it. +See +.BR tempfile (1). +If \-f or \-\-auth\-file are used, then the specified X authority file is +only written to, not created or deleted (though +.B xauth +creates an authority file itself if told to use use that does not already +exist). +.PP +An error file with a user\-specified name is also created if the +.B \-e +or +.B \-\-error\-file +options are specifed; see above. +.SH "EXIT STATUS" +.B xvfb\-run +uses its exit status as well as output to standard error to communicate +diagnostics. +The exit status of \(oq1\(cq is not used, and should be interpreted as failure +of the specified command. +.TP +0 +.B xvfb\-run +only uses this exit status if the +.B \-h\fR,\fB \-\-help +option is given. +In all other situations, this may be interpreted as success of the specified +command. +.TP +2 +No command to run was specified. +.TP +3 +The +.B xauth +command is not available. +.TP +4 +The temporary directory that was going to be used already exists; since +.B xvfb\-run +produces a uniquely named directory, this may indicate an attempt by another +process on the system to exploit a temporary file race condition. +.TP +5 +A problem was encountered while cleaning up the temporary directory. +.TP +6 +A problem was encountered while using +.BR getopt (1) +to parse the command\-line arguments. +.SH EXAMPLES +.TP +.B xvfb\-run \-\-auto\-servernum \-\-server\-num=1 xlogo +runs the +.BR xlogo (1x) +demonstration client inside the +.B Xvfb +X server on the first available server number greater than or equal to 1. +.TP +.B xvfb\-run \-\-server\-args="\-screen 0 1024x768x24" ico \-faces +runs the +.BR ico (1x) +demonstration client (and passes it the +.B \-faces +argument) inside the +.B Xvfb +X server, configured with a root window of 1024 by 768 pixels and a color +depth of 24 bits. +.PP +Note that the demo X clients used in the above examples will not exit on +their own, so they will have to be killed before +.B xvfb\-run +will exit. +.SH BUGS +See +.URL "http://bugs.debian.org/xvfb" "the Debian Bug Tracking System" . +If you wish to report a bug in +.BR xvfb\-run , +please use the +.BR reportbug (1) +command. +.SH AUTHOR +.B xfvb\-run +was written by Branden Robinson and Jeff Licquia with sponsorship from +Progeny Linux Systems. +.SH "SEE ALSO" +.BR Xvfb (1x), +.BR xauth (1x) +.\" vim:set et tw=80: |
