From b3531e5acd3f55613eddde5591eb2e880fa96ed8 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 16 Nov 2011 23:15:07 +0000 Subject: Wed Nov 16 23:15:06 UTC 2011 --- libre/ununrar/PKGBUILD | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 libre/ununrar/PKGBUILD (limited to 'libre') 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 + +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: -- cgit v1.2.3-54-g00ecf From 126af148530f656a2ed192a852477b2ee97d5397 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 18 Nov 2011 23:15:18 +0000 Subject: Fri Nov 18 23:15:18 UTC 2011 --- community/aumix/PKGBUILD | 3 +- community/avifile/PKGBUILD | 22 +-- community/avifile/videodev.patch | 180 +++++++++++++++++++++ community/beye/PKGBUILD | 32 ++-- community/binutils-avr/PKGBUILD | 6 +- community/blackbox/PKGBUILD | 6 +- community/darktable/PKGBUILD | 17 +- community/fityk/PKGBUILD | 9 +- community/floyd/PKGBUILD | 27 ++-- community/floyd/build-fix.patch | 30 ++++ community/fonteditfs/PKGBUILD | 14 +- community/haddock/PKGBUILD | 63 ++++---- community/haddock/haddock.install | 23 ++- community/hashcash/PKGBUILD | 14 +- community/mixxx/PKGBUILD | 18 ++- community/pragha/PKGBUILD | 6 +- community/procstatd/PKGBUILD | 20 +-- community/qmc2/PKGBUILD | 6 +- community/r8168/PKGBUILD | 32 ++++ community/r8168/r8168.install | 17 ++ community/rt3562sta/PKGBUILD | 74 +++++++++ .../rt3562sta/rt3562sta-2.4.1.1-WPA-mixed.patch | 11 ++ community/rt3562sta/rt3562sta-2.4.1.1-config.patch | 98 +++++++++++ ...62sta-2.4.1.1-convert-devicename-to-wlanX.patch | 13 ++ .../rt3562sta-2.4.1.1-gcc-warnings-x86_64.patch | 14 ++ .../rt3562sta-2.4.1.1-reduce_debug_output.patch | 15 ++ ...remove-potential-conflicts-with-rt2860sta.patch | 47 ++++++ .../rt3562sta-2.4.1.1-remove_date_time.patch | 11 ++ .../rt3562sta-2.4.1.1-return_nonvoid.patch | 11 ++ community/rt3562sta/rt3562sta.install | 16 ++ community/wol/PKGBUILD | 21 +-- community/xnc/PKGBUILD | 15 +- community/xnc/xnc-gcc44.patch | 50 ++++-- community/xrestop/PKGBUILD | 11 +- community/xvkbd/PKGBUILD | 27 ++-- extra/aisleriot/PKGBUILD | 6 +- extra/empathy/PKGBUILD | 14 +- extra/eog/PKGBUILD | 16 +- extra/evolution-data-server/PKGBUILD | 6 +- extra/evolution-ews/PKGBUILD | 27 ++++ extra/evolution/PKGBUILD | 6 +- extra/gedit/PKGBUILD | 14 +- extra/gnome-keyring/PKGBUILD | 6 +- extra/gnome-keyring/gnome-keyring.install | 8 +- extra/gtkhtml4/PKGBUILD | 6 +- extra/gucharmap/PKGBUILD | 20 +-- extra/libcroco/PKGBUILD | 20 +-- extra/libgnome-keyring/PKGBUILD | 6 +- extra/librsvg/PKGBUILD | 20 +-- extra/openconnect/PKGBUILD | 14 +- extra/seahorse/PKGBUILD | 6 +- extra/tomboy/PKGBUILD | 24 +-- extra/transcode/PKGBUILD | 56 +++---- .../subtitleripper-0.3.4-linkingorder.patch | 28 ++++ .../subtitleripper-0.3.4-respect-ldflags.patch | 28 ++++ extra/vinagre/PKGBUILD | 14 +- extra/vino/PKGBUILD | 14 +- libre/mplayer-libre/PKGBUILD | 7 +- libre/texlive-bin-libre/PKGBUILD | 10 +- social/tinc/PKGBUILD | 9 +- social/tinc/tincd.conf | 2 +- testing/curl/PKGBUILD | 8 +- 62 files changed, 1021 insertions(+), 353 deletions(-) create mode 100644 community/avifile/videodev.patch create mode 100644 community/floyd/build-fix.patch create mode 100644 community/r8168/PKGBUILD create mode 100644 community/r8168/r8168.install create mode 100644 community/rt3562sta/PKGBUILD create mode 100644 community/rt3562sta/rt3562sta-2.4.1.1-WPA-mixed.patch create mode 100644 community/rt3562sta/rt3562sta-2.4.1.1-config.patch create mode 100644 community/rt3562sta/rt3562sta-2.4.1.1-convert-devicename-to-wlanX.patch create mode 100644 community/rt3562sta/rt3562sta-2.4.1.1-gcc-warnings-x86_64.patch create mode 100644 community/rt3562sta/rt3562sta-2.4.1.1-reduce_debug_output.patch create mode 100644 community/rt3562sta/rt3562sta-2.4.1.1-remove-potential-conflicts-with-rt2860sta.patch create mode 100644 community/rt3562sta/rt3562sta-2.4.1.1-remove_date_time.patch create mode 100644 community/rt3562sta/rt3562sta-2.4.1.1-return_nonvoid.patch create mode 100644 community/rt3562sta/rt3562sta.install create mode 100644 extra/evolution-ews/PKGBUILD create mode 100644 extra/transcode/subtitleripper-0.3.4-linkingorder.patch create mode 100644 extra/transcode/subtitleripper-0.3.4-respect-ldflags.patch (limited to 'libre') diff --git a/community/aumix/PKGBUILD b/community/aumix/PKGBUILD index bc409ec84..abf1783f6 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 pkgname=aumix @@ -8,6 +8,7 @@ pkgdesc="A color text mode sound mixer with GPM support" arch=('i686' 'x86_64') 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 f468c2a5b..e38f7fb94 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 # Maintainer: tobias # Contributor: Tom Newsom 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') -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 ++#include + _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 ++#include + _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 + #include + #define _LINUX_TIME_H 1 +-#include ++#include + #include + + 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 + #include + #define _LINUX_TIME_H 1 +-#include ++#include ++#include + #include + + 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 and when V4L2 is installed. */ + #define _LINUX_TIME_H +-#include ++#include + + #ifndef X_DISPLAY_MISSING + #include +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 and when V4L2 is installed. */ + #define _LINUX_TIME_H +-#include ++#include ++#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 f9515d303..80ec17860 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 # Contributor: Sergej Pupykin pkgname=beye pkgver=6.1.0 _lver=610 -pkgrel=1 +pkgrel=2 pkgdesc="Binary viewer" arch=(i686 x86_64) 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 < 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 f9e1a176d..06e8ce92c 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 # Contributor: Corrado Primier # Contributor: danst0 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') 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 b312b37c5..c8c641216 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 # Contributor: durbatuluk # Contributor: Steve Ponsford 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') -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/darktable/PKGBUILD b/community/darktable/PKGBUILD index 802b49112..805b2f328 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 # Maintainer: Christian Himpel # Contributor: Johannes Hanika @@ -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') 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/fityk/PKGBUILD b/community/fityk/PKGBUILD index 143d60c29..ffd72b248 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') 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 d41e42daa..ae919142d 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 # Contributor: Sergej Pupykin pkgname=floyd pkgver=2.0.1 -pkgrel=3 +pkgrel=4 pkgdesc="displays system load with pulse of keyboard LED" -arch=(i686 x86_64) +arch=('i686' 'x86_64') 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/fonteditfs/PKGBUILD b/community/fonteditfs/PKGBUILD index 6fa46a195..53ab8d486 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 # Contributor: Sergej Pupykin @@ -9,13 +9,13 @@ pkgdesc="console font editor" arch=('i686' 'x86_64') 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/haddock/PKGBUILD b/community/haddock/PKGBUILD index c52029b85..c9263a8b2 100644 --- a/community/haddock/PKGBUILD +++ b/community/haddock/PKGBUILD @@ -1,40 +1,45 @@ -# Maintainer: Vesa Kaihlavirta +# $Id: PKGBUILD 58668 2011-11-17 12:39:33Z arodseth $ +# Maintainer: Alexander Rødseth +# Contributor: Vesa Kaihlavirta # Contributor: Arch Haskell Team -# 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') -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 +arch=('x86_64' 'i686') +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 1d22902b3..f77b2f304 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 # Maintainer: Charles Mauch 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') 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/mixxx/PKGBUILD b/community/mixxx/PKGBUILD index 3b0bc01ec..bb97ec10d 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 # Contributor: Ali H. Caliskan # Contributor: Ryan Coyner # Contributor: Stefan Husmann 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') @@ -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/pragha/PKGBUILD b/community/pragha/PKGBUILD index dedba8ceb..c4cd987cd 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 # Contributor: Alois Nespor # Contributor: JerichoKru 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') @@ -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 5f11cecf9..7304696ff 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 # Contributor: Tom Newsom # Maintainer: Jason Chu @@ -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/qmc2/PKGBUILD b/community/qmc2/PKGBUILD index a413dd498..204bb88f1 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 # Contributor: JJDaNiMoTh 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') 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 +# Contributor: Bob Fanger < bfanger(at)gmail > +# Contributor: Filip , 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 +# 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/wol/PKGBUILD b/community/wol/PKGBUILD index 87bfc7005..1920390a7 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 # Contributor: Anders Bergh # Contributor: Markus Volkmann pkgname=wol pkgver=0.7.1 -pkgrel=4 +pkgrel=5 arch=('i686' 'x86_64') -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/xnc/PKGBUILD b/community/xnc/PKGBUILD index fe520c655..b26a556c6 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 pkgname=xnc pkgver=5.0.4 -pkgrel=3 +pkgrel=4 pkgdesc="X nortern captain file manager" arch=(i686 x86_64) 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 4aa47dbd5..605520b7d 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 pkgname=xrestop @@ -9,19 +9,16 @@ arch=('i686' 'x86_64') 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 b6384fd1d..c06e2583a 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 # Contributor: Benjamin Andresen # Contributor: Mikko Seppдlд pkgname=xvkbd pkgver=3.2 -pkgrel=1 +pkgrel=2 pkgdesc="virtual (graphical) keyboard program for X Window System" arch=('i686' 'x86_64') url="http://homepage3.nifty.com/tsato/xvkbd/" @@ -17,22 +17,17 @@ md5sums=('1bce8d6c27e6e7df92ec09b414f82dad') build() { cd "$srcdir/$pkgname-$pkgver" - -# patch xvkbd.c < #include -#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 pkgname=aisleriot -pkgver=3.2.1 +pkgver=3.2.2 pkgrel=1 pkgdesc="GNOME Solitaire card games" arch=(i686 x86_64) @@ -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/empathy/PKGBUILD b/extra/empathy/PKGBUILD index 861879622..8d25db7eb 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 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') @@ -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 1b307cf58..f8f55ebb0 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 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') @@ -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 7df8de5c0..a13c4cbb1 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 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') @@ -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 + +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 6c4e9598e..7e6de90d0 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 pkgname=evolution -pkgver=3.2.1 +pkgver=3.2.2 pkgrel=1 pkgdesc="Manage your email, contacts and schedule" arch=('i686' 'x86_64') @@ -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/gedit/PKGBUILD b/extra/gedit/PKGBUILD index 6fe09697b..9a91cb94a 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 pkgname=gedit -pkgver=3.2.2 +pkgver=3.2.3 pkgrel=1 pkgdesc="A text editor for GNOME" arch=('i686' 'x86_64') @@ -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/gnome-keyring/PKGBUILD b/extra/gnome-keyring/PKGBUILD index 18e3d714e..9c5b48ec0 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 pkgname=gnome-keyring -pkgver=3.2.1 +pkgver=3.2.2 pkgrel=1 pkgdesc="GNOME Password Management daemon" arch=(i686 x86_64) @@ -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/gtkhtml4/PKGBUILD b/extra/gtkhtml4/PKGBUILD index 79f407a09..3145eb8af 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 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) @@ -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 5e993e3a3..900ac4e94 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 pkgname=gucharmap -pkgver=3.2.1 +pkgver=3.2.2 pkgrel=1 pkgdesc="Gnome Unicode Charmap" arch=('i686' 'x86_64') @@ -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 fef3e85b3..5d19edc14 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 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') 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/libgnome-keyring/PKGBUILD b/extra/libgnome-keyring/PKGBUILD index e1aa7f7d4..7f4b0e095 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 pkgname=libgnome-keyring -pkgver=3.2.0 +pkgver=3.2.2 pkgrel=1 pkgdesc="GNOME keyring client library" arch=(i686 x86_64) @@ -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/librsvg/PKGBUILD b/extra/librsvg/PKGBUILD index 75ca002cd..77f71d413 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 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) 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/openconnect/PKGBUILD b/extra/openconnect/PKGBUILD index 4817197ab..740d47484 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 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/seahorse/PKGBUILD b/extra/seahorse/PKGBUILD index f45ffbd5c..a2b0c0585 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 # Contributor: Michel Brabants pkgname=seahorse -pkgver=3.2.1 +pkgver=3.2.2 pkgrel=1 pkgdesc="GNOME application for managing PGP keys." arch=(i686 x86_64) @@ -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/tomboy/PKGBUILD b/extra/tomboy/PKGBUILD index 48f7ff5e1..1602e2ca0 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 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') @@ -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 9ba6c94ad..9cd207568 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 # Contributor: roberto 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') 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/vinagre/PKGBUILD b/extra/vinagre/PKGBUILD index 7d5ca7bcf..c25b490eb 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 # Maintainer: Allan McRae # Contributor: lp76 pkgname=vinagre -pkgver=3.2.1 +pkgver=3.2.2 pkgrel=1 pkgdesc="A VNC Client for the GNOME Desktop" arch=('i686' 'x86_64') @@ -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 c13a160a5..a7da32570 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 pkgname=vino -pkgver=3.2.1 +pkgver=3.2.2 pkgrel=1 pkgdesc="a VNC server for the GNOME desktop" arch=('i686' 'x86_64') @@ -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/libre/mplayer-libre/PKGBUILD b/libre/mplayer-libre/PKGBUILD index 75184bbb8..4dd9b5b0b 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' @@ -13,9 +13,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() { @@ -34,6 +34,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 10ffbf6a5..76c2de5e4 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') -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/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/testing/curl/PKGBUILD b/testing/curl/PKGBUILD index 8e03a459e..0e40bfe8e 100644 --- a/testing/curl/PKGBUILD +++ b/testing/curl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 142823 2011-11-15 21:19:44Z dreisner $ +# $Id: PKGBUILD 142904 2011-11-17 21:30:16Z dreisner $ # Maintainer: Dave Reisner # Contributor: Angel Velasquez # Contributor: Eric Belanger @@ -6,7 +6,7 @@ # Contributor: Daniel J Griffiths pkgname=curl -pkgver=7.23.0 +pkgver=7.23.1 pkgrel=1 pkgdesc="An URL retrival utility and library" arch=('i686' 'x86_64') @@ -17,8 +17,8 @@ makedepends=('perl-libwww') options=('!libtool') source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc} curlbuild.h) -md5sums=('018a9acee77ed70017c6f6cec855635a' - '6a0d4a24923e587153462b8602468921' +md5sums=('8e23151f569fb54afef093ac0695077d' + '5d8eb7e2e38be0fb00a043f714f6d49f' '751bd433ede935c8fae727377625a8ae') ptrsize=$(cpp <<<'__SIZEOF_POINTER__' | sed '/^#/d') -- cgit v1.2.3-54-g00ecf From a3024f8996981b28ced27466cbd1d4ab40e57324 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 19 Nov 2011 23:14:49 +0000 Subject: Sat Nov 19 23:14:48 UTC 2011 --- community/aspell-pl/PKGBUILD | 12 +- community/blobby2/PKGBUILD | 6 +- community/calibre/PKGBUILD | 8 +- community/centerim/PKGBUILD | 4 +- community/dxpc/PKGBUILD | 5 +- community/eiciel/PKGBUILD | 6 +- community/extrema/PKGBUILD | 30 +- community/extrema/gcc46.patch | 15 + community/fbreader/PKGBUILD | 4 +- community/fltk2/PKGBUILD | 12 +- community/fox/PKGBUILD | 11 +- community/freemat/PKGBUILD | 7 +- community/freewrl/PKGBUILD | 5 +- community/gnash/PKGBUILD | 12 +- community/gnash/xul8.patch | 44 +++ community/gobby/PKGBUILD | 9 +- community/gphpedit/PKGBUILD | 12 +- community/gprolog/PKGBUILD | 4 +- community/gq/PKGBUILD | 6 +- community/gsql/PKGBUILD | 5 +- community/guifications/PKGBUILD | 14 +- community/gxmessage/PKGBUILD | 10 +- community/haskell-glib/PKGBUILD | 4 +- community/hex-a-hop/PKGBUILD | 4 +- community/iniparser/PKGBUILD | 5 +- community/ipsec-tools/PKGBUILD | 3 +- community/javasqlite/PKGBUILD | 12 +- community/kovpn/PKGBUILD | 16 +- community/kvirc/PKGBUILD | 4 +- community/kvpnc/PKGBUILD | 24 +- community/leafnode/PKGBUILD | 19 +- community/leafnode/leafnode.install | 11 +- community/libfbclient/PKGBUILD | 3 +- community/libmatchbox/PKGBUILD | 6 +- community/mcabber/PKGBUILD | 4 +- community/pigeonhole/PKGBUILD | 4 +- community/scummvm-tools/PKGBUILD | 6 +- community/wine/PKGBUILD | 11 +- core/pptpclient/PKGBUILD | 18 +- core/reiserfsprogs/PKGBUILD | 15 +- extra/dovecot/PKGBUILD | 6 +- extra/freetype2/PKGBUILD | 13 +- extra/glibmm/PKGBUILD | 20 +- extra/lua/PKGBUILD | 26 +- extra/mesa/PKGBUILD | 32 +- extra/oxygen-gtk/PKGBUILD | 6 +- extra/rasqal/PKGBUILD | 11 +- extra/telepathy-farstream/PKGBUILD | 10 +- extra/varnish/PKGBUILD | 9 +- extra/xf86-input-joystick/PKGBUILD | 11 +- extra/xf86-input-joystick/git-fixes.patch | 399 +++++++++++++++++++++ extra/xorg-server/PKGBUILD | 20 +- ...ssive-keygrabs-on-the-XIAll-Master-Device.patch | 31 ++ extra/xorg-server/git-fixes.patch | 44 +++ .../xserver-1.11.2-record-crasher.patch | 241 +++++++++++++ libre/audacious-plugins-libre/PKGBUILD | 29 +- multilib/lib32-mesa/PKGBUILD | 12 +- multilib/wine/PKGBUILD | 11 +- staging/gdbm/PKGBUILD | 57 +++ staging/gdbm/gdbm-1.10-zeroheaders.patch | 33 ++ staging/gdbm/gdbm.install | 21 ++ staging/mutt/PKGBUILD | 48 +++ staging/mutt/install | 8 + staging/ypserv/PKGBUILD | 37 ++ staging/ypserv/yppasswd | 34 ++ staging/ypserv/ypserv | 34 ++ testing/p11-kit/PKGBUILD | 29 ++ testing/xf86-video-intel/PKGBUILD | 31 ++ testing/xfsprogs/PKGBUILD | 6 +- 69 files changed, 1422 insertions(+), 257 deletions(-) create mode 100644 community/extrema/gcc46.patch create mode 100644 community/gnash/xul8.patch create mode 100644 extra/xf86-input-joystick/git-fixes.patch create mode 100644 extra/xorg-server/Xi-allow-passive-keygrabs-on-the-XIAll-Master-Device.patch create mode 100644 extra/xorg-server/xserver-1.11.2-record-crasher.patch create mode 100644 staging/gdbm/PKGBUILD create mode 100644 staging/gdbm/gdbm-1.10-zeroheaders.patch create mode 100644 staging/gdbm/gdbm.install create mode 100644 staging/mutt/PKGBUILD create mode 100644 staging/mutt/install create mode 100644 staging/ypserv/PKGBUILD create mode 100755 staging/ypserv/yppasswd create mode 100755 staging/ypserv/ypserv create mode 100644 testing/p11-kit/PKGBUILD create mode 100644 testing/xf86-video-intel/PKGBUILD (limited to 'libre') diff --git a/community/aspell-pl/PKGBUILD b/community/aspell-pl/PKGBUILD index b96f9ac35..3b0df74f5 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 +# $Id: PKGBUILD 58727 2011-11-18 05:20:53Z bpiotrowski $ +# Maintainer: Bartłomiej Piotrowski +# Contributor: Jaroslaw Swierczynski # Contributor: Arkadiusz Laczynski pkgname=aspell-pl -pkgver=20111022 +pkgver=20111117 pkgrel=1 pkgdesc="Polish dictionary for aspell" arch=('i686' 'x86_64') 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/blobby2/PKGBUILD b/community/blobby2/PKGBUILD index 29b405fb5..1bcd9e068 100644 --- a/community/blobby2/PKGBUILD +++ b/community/blobby2/PKGBUILD @@ -3,17 +3,17 @@ # Contributor: Urs Wolfer pkgname=blobby2 -pkgver=0.9b +pkgver=0.9c arch=('x86_64' 'i686') 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/calibre/PKGBUILD b/community/calibre/PKGBUILD index c550afef0..a4f3f3a61 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 # Contributor: Petrov Roman # Contributor: Andrea Fagiani pkgname=calibre -pkgver=0.8.26 -pkgrel=3 +pkgver=0.8.27 +pkgrel=1 pkgdesc="Ebook management application" arch=('i686' 'x86_64') 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/centerim/PKGBUILD b/community/centerim/PKGBUILD index b846f526c..2e668188f 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 # Maintainer: # Contributor: Aaron Griffin @@ -19,11 +19,11 @@ md5sums=('7565c3c8cac98a4e2d8524076a44676f') build() { cd "${srcdir}/${pkgname}-${pkgver}" sed -i 's#python#python2#' misc/CenterIMLog2HTML.py + sed -i '1,1i#include ' libicq2000/libicq2000/sigslot.h ./configure --prefix=/usr \ --with-ssl \ --with-openssl \ --enable-locales-fix - make } diff --git a/community/dxpc/PKGBUILD b/community/dxpc/PKGBUILD index 8d4993f99..298989028 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 # Contributor: Sergej Pupykin @@ -10,12 +10,13 @@ arch=('i686' 'x86_64') 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 057c3fe28..d4a03681c 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 # Maintainer: Daniel J Griffiths @@ -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 317ea83d4..233b55fa3 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 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') 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 +--- a/src/Graphics/GRA_thiessenTriangulation.h ++++ b/src/Graphics/GRA_thiessenTriangulation.h +@@ -19,6 +19,7 @@ + #define GRA_THIESSENTRIANGULATION + + #include ++#include + + class GRA_thiessenTriangulation + { diff --git a/community/fbreader/PKGBUILD b/community/fbreader/PKGBUILD index a5df7c37f..29ac34a54 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 # Contributor: William Rea @@ -10,7 +10,7 @@ arch=('i686' 'x86_64') 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/fltk2/PKGBUILD b/community/fltk2/PKGBUILD index 32d4dc562..d3da63100 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 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) 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/fox/PKGBUILD b/community/fox/PKGBUILD index 6a84a73b6..76f92966a 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 # Contributor: Ben 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') @@ -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 a62515e89..0dc55bb14 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 # Contributor: William Rea 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') 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 0e8da2e6c..56ec0047c 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 # Contributor: Sergej Pupykin @@ -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 68f826412..0b4a6d049 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) 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(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 b4171ea9d..c371380c0 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 # Contributor: William Rea # Maintainer: Angel 'angvp' Velasquez @@ -10,16 +10,19 @@ pkgdesc="A collaborative text editor" arch=('i686' 'x86_64') 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 83287457c..08cb64110 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 # Maintainer: tobias # Contributor: Tobias Kieslich @@ -10,23 +10,19 @@ pkgdesc="a scintilla/gnome based editor specialized on php-files" arch=(i686 x86_64) 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 62b4f92ae..6d4f0c2b5 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 # Maintainer: Geoffroy Carrier # Contributer: Jason Chu @@ -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 f5ab49586..fe5382f8b 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 # Contributor: Gergely Tamas @@ -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') 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/gsql/PKGBUILD b/community/gsql/PKGBUILD index 83d73b846..88d05ff87 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 pkgname=gsql @@ -8,7 +8,8 @@ pkgdesc="Integrated database development tool for GNOME" url="http://gsql.org/" license=('GPL') arch=('i686' 'x86_64') -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/guifications/PKGBUILD b/community/guifications/PKGBUILD index 7f2d5e375..f89cc9268 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 # Contributor: Link Dupont pkgname=guifications pkgver=2.16 -pkgrel=2 +pkgrel=3 pkgdesc="A set of GUI popup notifications for pidgin" arch=(i686 x86_64) 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 afc4f56e9..5a91a2e14 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 # Maintainer: Geoffroy Carrier # Contributor: Jaroslav Lichtblau @@ -11,7 +11,7 @@ arch=('i686' 'x86_64') 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/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 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 80e12e8ac..aeda535bc 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 # Contributor: insulae @@ -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/iniparser/PKGBUILD b/community/iniparser/PKGBUILD index 32a4c4b5b..e2b7fbb15 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 # Maintainer: Roman Kyrylych # Contributor: Roman Kyrylych @@ -11,9 +11,8 @@ arch=('i686' 'x86_64') 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 77a72f6df..9f6494038 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 # Contributor: Allan Henriksen @@ -9,6 +9,7 @@ pkgdesc="KAME IPSec tools ported to Linux" arch=('i686' 'x86_64') 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 4202d75c1..c622da7e6 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 pkgname=javasqlite -pkgver=20110106 +pkgver=20110827 pkgrel=1 pkgdesc="Java support for SQLite database engine" arch=('i686' 'x86_64') 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 f2023587c..13b780799 100644 --- a/community/kovpn/PKGBUILD +++ b/community/kovpn/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 58625 2011-11-16 15:52:08Z spupykin $ +# $Id: PKGBUILD 58772 2011-11-18 14:01:32Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Douglas Soares de Andrade @@ -14,12 +14,13 @@ depends=('openvpn' 'kdelibs3' 'xdg-utils') makedepends=('automake' 'autoconf') options=('libtool') install=kovpn.install +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" - 'traywindow_x86_64.patch') + "kovpn-disable-dcop.patch::https://bugs.archlinux.org/task/15464?getfile=4173") md5sums=('19b61cf9f84088baffbd5bb0a287422c' - '21171b74f76289daea1cc61eedaa4dba' - 'bf6218bf2686b6fe41874d5df4e71d63') + '21171b74f76289daea1cc61eedaa4dba') build() { cd $srcdir/$pkgname-$_pkgver @@ -30,12 +31,9 @@ build() { 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 make prefix=$pkgdir/usr install } diff --git a/community/kvirc/PKGBUILD b/community/kvirc/PKGBUILD index bfcee39d5..bd83293b7 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 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 f80a814c3..205f3b682 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 -# Maintainer: Danial Olsen +# Contributor: Danial Olsen 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) 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/leafnode/PKGBUILD b/community/leafnode/PKGBUILD index f9782f1fa..a09bf47e4 100644 --- a/community/leafnode/PKGBUILD +++ b/community/leafnode/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 58613 2011-11-16 15:33:07Z spupykin $ +# $Id: PKGBUILD 58812 2011-11-18 15:35:58Z spupykin $ # Maintainer: Sergej Pupykin # 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') url="http://leafnode.sourceforge.net/" -depends=(pcre xinetd) +depends=('pcre' 'xinetd') license=('GPL') 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/libfbclient/PKGBUILD b/community/libfbclient/PKGBUILD index d8cccccfa..ea0ed67f0 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 # Contributor: Douglas Soares de Andrade @@ -10,6 +10,7 @@ arch=('i686' 'x86_64') 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 f0a056430..63eb2cb29 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 # Contributor: Henrique C. Alves @@ -10,8 +10,8 @@ arch=('i686' 'x86_64') 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/mcabber/PKGBUILD b/community/mcabber/PKGBUILD index eb90c52c6..603298562 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 # Maintainer: Thorsten Töpper # Contributor: 3ED @@ -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/pigeonhole/PKGBUILD b/community/pigeonhole/PKGBUILD index fc1bc0fd8..9ea99b21a 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') url="http://pigeonhole.dovecot.org/" diff --git a/community/scummvm-tools/PKGBUILD b/community/scummvm-tools/PKGBUILD index 56ae948d0..1dba7faf0 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 # Contributor: Jérémie Dimino # Contributor: Sebastian Hase # Contributor: Joe Davison 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') source=(http://downloads.sourceforge.net/sourceforge/scummvm/${pkgname}-${pkgver}.tar.gz) -md5sums=('0239cb022e508f2399d584efa6f177b2') +md5sums=('43cbf9f5c4939876cf4149dd59e68044') build() { cd ${pkgname}-${pkgver} 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 # Contributor: Jan "heftig" Steffens # Contributor: Eduardo Romero # Contributor: Giovanni Scafora 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/core/pptpclient/PKGBUILD b/core/pptpclient/PKGBUILD index 85bf0544e..b27c7d5bc 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 # Contributor: Mark Nikkel -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') 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 6b7beb8f6..ca73bf439 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 # Contributor: judd pkgname=reiserfsprogs pkgver=3.6.21 -pkgrel=3 +pkgrel=4 pkgdesc="Reiserfs utilities" arch=('i686' 'x86_64') -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/extra/dovecot/PKGBUILD b/extra/dovecot/PKGBUILD index de9dfa97b..5589facb8 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 # Contributor: Paul Mattal # Contributor: Federico Quagliata (quaqo) # Contributor: GARETTE Emmanuel 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') @@ -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/freetype2/PKGBUILD b/extra/freetype2/PKGBUILD index c7094a53a..66b741634 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 pkgname=freetype2 -pkgver=2.4.7 +pkgver=2.4.8 pkgrel=1 pkgdesc="TrueType font rendering library" arch=(i686 x86_64) 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/glibmm/PKGBUILD b/extra/glibmm/PKGBUILD index a6a64bcc5..dd8fce6d2 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 # Contributor: Tom Newsom pkgbase=glibmm pkgname=('glibmm' 'glibmm-docs') -pkgver=2.30.0 +pkgver=2.30.1 pkgrel=1 arch=('i686' 'x86_64') 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/lua/PKGBUILD b/extra/lua/PKGBUILD index 871d8f655..2020b0270 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 # Contributor: Damir Perisa 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') 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 a13c53003..bb7e6c83f 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 # Maintainer: Andreas Radke 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') # prepare 7.12/8.0 #pkgname=('mesa' 'libgl' 'libglapi' 'libgles' 'libegl' 'ati-dri' 'intel-dri' 'nouveau-dri') # 'llvm-dri') @@ -15,9 +15,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') 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' 'dri2proto>=2.6' 'python2' 'libxml2' 'imake' 'llvm' 'udev') @@ -29,12 +29,12 @@ 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 md5sums=('5c65a0fe315dd347e09b1f2826a1df5a' - '774eb6f30b31fa08c04e16e00ca070e1') + 'a77307102cee844ff6544ffa8fafeac1') build() { cd ${srcdir}/?esa-* @@ -114,7 +114,7 @@ package_libglapi() { } package_libgles() { - depends=('libglapi') + depends=('libglapi' 'khrplatform-devel') pkgdesc="Mesa GLES libraries and headers" cd ${srcdir}/?esa-* @@ -135,7 +135,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-* @@ -145,7 +145,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" @@ -154,13 +153,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' 'dri2proto>=2.6' 'glproto>=1.4.14') #dri2proto + glproto needed for gl.pc optdepends=('opengl-man-pages: for the OpenGL API man pages') diff --git a/extra/oxygen-gtk/PKGBUILD b/extra/oxygen-gtk/PKGBUILD index 03f661181..b577b8db9 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 # Contributor: birdflesh 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') @@ -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/rasqal/PKGBUILD b/extra/rasqal/PKGBUILD index d4c261db8..8a482fb92 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 # Contributor: Lawrence Lee 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') 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/telepathy-farstream/PKGBUILD b/extra/telepathy-farstream/PKGBUILD index d31e534e9..a4354dac5 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 pkgname=telepathy-farstream -pkgver=0.1.1 +pkgver=0.1.2 pkgrel=1 pkgdesc="A telepathy-backend to use stream engine." arch=(i686 x86_64) @@ -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/varnish/PKGBUILD b/extra/varnish/PKGBUILD index 05ab8890f..18ed8e7a4 100644 --- a/extra/varnish/PKGBUILD +++ b/extra/varnish/PKGBUILD @@ -5,20 +5,21 @@ # Contributor: Roberto Alsina pkgname=varnish -pkgver=3.0.1 -pkgrel=1 +pkgver=3.0.2 +pkgrel=2 pkgdesc="High-performance HTTP accelerator" arch=('i686' 'x86_64') 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/xf86-input-joystick/PKGBUILD b/extra/xf86-input-joystick/PKGBUILD index f908ac10f..7badf2933 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 pkgname=xf86-input-joystick pkgver=1.6.0 -pkgrel=2 +pkgrel=3 pkgdesc="X.Org Joystick input driver" arch=(i686 x86_64) 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 +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 +Reviewed-by: Stephane Marchesin +Signed-off-by: Peter Hutterer +--- +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 +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 +Signed-off-by: Peter Hutterer +--- +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 +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 +--- +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="[] \*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. ++ * Copyright 2007-2011 by Sascha Hlusiak. + * Copyright 1995-1999 by Frederic Lepied, France. + * + * 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 +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 +Reviewed-by: Jeremy Huddleston +--- +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 +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 +Reviewed-by: Jeremy Huddleston +Reviewed-by: Chase Douglas +--- +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 +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 +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 +--- +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/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD index 7145bb168..a55107e61 100644 --- a/extra/xorg-server/PKGBUILD +++ b/extra/xorg-server/PKGBUILD @@ -1,20 +1,22 @@ -# $Id: PKGBUILD 142252 2011-11-07 09:31:56Z andyrtr $ +# $Id: PKGBUILD 142918 2011-11-18 09:17:26Z jgc $ # Maintainer: Jan de Groot 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') 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') +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) @@ -22,7 +24,9 @@ md5sums=('8796fff441e5435ee36a72579008af24' '6c7e87d63ac4b535e19a80c89d0cf091' 'f8194638ca4872c2b0a67862a70bcebf' 'f6c84f4936f8e00abdfbd9fb4eda83fb' - 'b9cdb3855cc2b2e974a98b9a20d1ec2b' + '6fb42ec979ecd6125b6599f54dc00d14' + '3f9de4dbfee2da90167192d8ca9eb2b4' + '47f9b979fe38043b42ff86eeee6fd0d0' '52fd3effd80d7bc6c1660d4ecf23d31c' '376c70308715cd2643f7bff936d9934b' 'd4f7dfc6be4ef4e2c6dd7632a9d88abe') @@ -42,6 +46,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 ./configure --prefix=/usr \ --enable-ipv6 \ 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 +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 +Tested-by: Bastien Nocera +--- + 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 +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 +Reviewed-by: Julien Cristau +(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 +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 +Reviewed-by: Rami Ylimäki + +--- +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/libre/audacious-plugins-libre/PKGBUILD b/libre/audacious-plugins-libre/PKGBUILD index d92a363c6..9cbde26be 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') -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/multilib/lib32-mesa/PKGBUILD b/multilib/lib32-mesa/PKGBUILD index c98e5208b..aeab086d2 100644 --- a/multilib/lib32-mesa/PKGBUILD +++ b/multilib/lib32-mesa/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 57652 2011-10-31 21:25:39Z lcarlier $ +# $Id: PKGBUILD 58846 2011-11-18 21:09:53Z lcarlier $ # Contributor: Jan de Groot # Contributor: Andreas Radke @@ -16,10 +16,10 @@ 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=(x86_64) makedepends=('glproto>=1.4.14' 'lib32-libdrm>=2.4.26' 'lib32-libxxf86vm>=1.1.1' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.0.1' 'lib32-libx11>=1.4.3' 'lib32-libxt>=1.1.1' 'lib32-gcc-libs>=4.6.1' 'dri2proto>=2.6' 'python2' 'libxml2' 'gcc-multilib' imake 'lib32-udev' 'lib32-llvm' 'namcap') @@ -31,9 +31,9 @@ if [ "${_git}" = "true" ]; then source=("MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-ef9f16f6322a89fb699fbe3da868b10f9acaef98.tar.bz2") md5sums=('817a63bb60b81f4f817ffc9ed0a3dddd') else - #source=("ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2") - source=("MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-4464ee1a9aa3745109cee23531e3fb2323234d07.tar.bz2") - md5sums=('774eb6f30b31fa08c04e16e00ca070e1') + 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") + md5sums=('a77307102cee844ff6544ffa8fafeac1') fi build() { diff --git a/multilib/wine/PKGBUILD b/multilib/wine/PKGBUILD index 8f5e4d6db..264d7e38f 100644 --- a/multilib/wine/PKGBUILD +++ b/multilib/wine/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 58209 2011-11-08 21:40:19Z bluewind $ +# $Id: PKGBUILD 58858 2011-11-19 02:53:46Z svenstaro $ # Maintainer: Sven-Hendrik Haase # Contributor: Jan "heftig" Steffens # Contributor: Eduardo Romero # Contributor: Giovanni Scafora pkgname=wine -pkgver=1.3.32 -pkgrel=2 +pkgver=1.3.33 +pkgrel=1 _pkgbasever=${pkgver/rc/-rc} source=(http://ibiblio.org/pub/linux/system/emulators/$pkgname/$pkgname-$_pkgbasever.tar.bz2) -md5sums=('2f8655434711b0ef11247f1bf7c28d13') +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 ) @@ -47,6 +46,7 @@ makedepends=(autoconf ncurses bison perl fontforge flex prelink openal lib32-openal libcups lib32-libcups v4l-utils lib32-v4l-utils + alsa-lib lib32-alsa-lib oss ) @@ -62,6 +62,7 @@ optdepends=( v4l-utils lib32-v4l-utils libpulse lib32-libpulse alsa-plugins lib32-alsa-plugins + alsa-lib lib32-alsa-lib oss ) 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 +# Contributor: Allan McRae +# Contributor: judd + +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/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 + +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 < For GPG support, add the following to your muttrc: +==> source /etc/Muttrc.gpg.dist + +EOF +} 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 +# Contributor: judd +# Contributor: Tom Newsom + +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/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 + +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/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 + +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 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}" -- cgit v1.2.3-54-g00ecf