diff options
Diffstat (limited to 'community')
35 files changed, 791 insertions, 188 deletions
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 <pupykin.s+arch@gmail.com> pkgname=aumix @@ -8,6 +8,7 @@ pkgdesc="A color text mode sound mixer with GPM support" arch=('i686' 'x86_64') 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 <pupykin.s+arch@gmail.com> # Maintainer: tobias <tobias@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=avifile pkgver=0.7.45 -pkgrel=7 +pkgrel=8 pkgdesc="A library that allows you to read and write compressed AVI files" arch=('i686' 'x86_64') -depends=('qt' 'sdl' 'freetype2' 'libpng' 'libjpeg' \ +depends=('qt' 'sdl' 'freetype2' 'libpng' 'libjpeg' 'libvorbis' 'xvidcore' 'libxxf86dga' 'libxi' 'libxv') -makedepends=('lame' 'qt3') +makedepends=('lame' 'qt3' 'v4l-utils' 'chrpath') url="http://avifile.sourceforge.net" license=('GPL') +options=('!libtool') source=("http://downloads.sourceforge.net/sourceforge/avifile/$pkgname-0.7-$pkgver.tar.bz2" - 'gcc.patch') + 'gcc.patch' + 'videodev.patch') md5sums=('7da94802f120d1b69e04a13170dcd21d' - '588c3ce7bdebc1244f46ba56d8ef8a42') + '588c3ce7bdebc1244f46ba56d8ef8a42' + '6cca050885afe85c2d98982f75f5e3b0') build() { cd $pkgname-0.7-$pkgver - patch -Np1 <../gcc.patch + patch -Np1 <$srcdir/gcc.patch + patch -Np1 <$srcdir/videodev.patch ./configure \ --prefix=/usr \ @@ -36,8 +40,8 @@ build() { package() { cd $pkgname-0.7-$pkgver - make prefix=$pkgdir/usr install - find $pkgdir -name '*.la' -exec rm {} \; + cd $pkgdir/usr/bin + chrpath -d avibench avicap avicat avirec kv4lsetup avimake aviplay avitype avirecompress } diff --git a/community/avifile/videodev.patch b/community/avifile/videodev.patch new file mode 100644 index 000000000..0729c8ab9 --- /dev/null +++ b/community/avifile/videodev.patch @@ -0,0 +1,180 @@ +diff -wbBur avifile-0.7-0.7.45/acinclude.m4 avifile-0.7-0.7.45.my/acinclude.m4 +--- avifile-0.7-0.7.45/acinclude.m4 2006-03-06 12:11:19.000000000 +0300 ++++ avifile-0.7-0.7.45.my/acinclude.m4 2011-11-17 13:20:52.000000000 +0400 +@@ -1158,7 +1158,7 @@ + AC_ARG_ENABLE(v4l, [ --enable-v4l support v4l video interface. (autodetect)], + [], enable_v4l=yes) + if test x$enable_v4l = xyes; then +- AC_CHECK_HEADER([linux/videodev.h], [], [ enable_v4l=no; ]) ++ AC_CHECK_HEADER([libv4l1-videodev.h], [], [ enable_v4l=no; ]) + fi + + if test x$enable_v4l = xyes; then +diff -wbBur avifile-0.7-0.7.45/configure avifile-0.7-0.7.45.my/configure +--- avifile-0.7-0.7.45/configure 2006-03-06 12:11:32.000000000 +0300 ++++ avifile-0.7-0.7.45.my/configure 2011-11-17 13:20:47.000000000 +0400 +@@ -27667,8 +27667,8 @@ + fi; + if test x$enable_v4l = xyes; then + if test "${ac_cv_header_linux_videodev_h+set}" = set; then +- echo "$as_me:$LINENO: checking for linux/videodev.h" >&5 +-echo $ECHO_N "checking for linux/videodev.h... $ECHO_C" >&6 ++ echo "$as_me:$LINENO: checking for libv4l1-videodev.h" >&5 ++echo $ECHO_N "checking for libv4l1-videodev.h... $ECHO_C" >&6 + if test "${ac_cv_header_linux_videodev_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + fi +@@ -27676,8 +27676,8 @@ + echo "${ECHO_T}$ac_cv_header_linux_videodev_h" >&6 + else + # Is the header compilable? +-echo "$as_me:$LINENO: checking linux/videodev.h usability" >&5 +-echo $ECHO_N "checking linux/videodev.h usability... $ECHO_C" >&6 ++echo "$as_me:$LINENO: checking libv4l1-videodev.h usability" >&5 ++echo $ECHO_N "checking libv4l1-videodev.h usability... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -27685,7 +27685,7 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + $ac_includes_default +-#include <linux/videodev.h> ++#include <libv4l1-videodev.h> + _ACEOF + rm -f conftest.$ac_objext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +@@ -27720,15 +27720,15 @@ + echo "${ECHO_T}$ac_header_compiler" >&6 + + # Is the header present? +-echo "$as_me:$LINENO: checking linux/videodev.h presence" >&5 +-echo $ECHO_N "checking linux/videodev.h presence... $ECHO_C" >&6 ++echo "$as_me:$LINENO: checking libv4l1-videodev.h presence" >&5 ++echo $ECHO_N "checking libv4l1-videodev.h presence... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include <linux/videodev.h> ++#include <libv4l1-videodev.h> + _ACEOF + if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +@@ -27762,25 +27762,25 @@ + # So? What about this header? + case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) +- { echo "$as_me:$LINENO: WARNING: linux/videodev.h: accepted by the compiler, rejected by the preprocessor!" >&5 +-echo "$as_me: WARNING: linux/videodev.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { echo "$as_me:$LINENO: WARNING: linux/videodev.h: proceeding with the compiler's result" >&5 +-echo "$as_me: WARNING: linux/videodev.h: proceeding with the compiler's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: libv4l1-videodev.h: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: libv4l1-videodev.h: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: libv4l1-videodev.h: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: libv4l1-videodev.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) +- { echo "$as_me:$LINENO: WARNING: linux/videodev.h: present but cannot be compiled" >&5 +-echo "$as_me: WARNING: linux/videodev.h: present but cannot be compiled" >&2;} +- { echo "$as_me:$LINENO: WARNING: linux/videodev.h: check for missing prerequisite headers?" >&5 +-echo "$as_me: WARNING: linux/videodev.h: check for missing prerequisite headers?" >&2;} +- { echo "$as_me:$LINENO: WARNING: linux/videodev.h: see the Autoconf documentation" >&5 +-echo "$as_me: WARNING: linux/videodev.h: see the Autoconf documentation" >&2;} +- { echo "$as_me:$LINENO: WARNING: linux/videodev.h: section \"Present But Cannot Be Compiled\"" >&5 +-echo "$as_me: WARNING: linux/videodev.h: section \"Present But Cannot Be Compiled\"" >&2;} +- { echo "$as_me:$LINENO: WARNING: linux/videodev.h: proceeding with the preprocessor's result" >&5 +-echo "$as_me: WARNING: linux/videodev.h: proceeding with the preprocessor's result" >&2;} +- { echo "$as_me:$LINENO: WARNING: linux/videodev.h: in the future, the compiler will take precedence" >&5 +-echo "$as_me: WARNING: linux/videodev.h: in the future, the compiler will take precedence" >&2;} ++ { echo "$as_me:$LINENO: WARNING: libv4l1-videodev.h: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: libv4l1-videodev.h: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: libv4l1-videodev.h: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: libv4l1-videodev.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: libv4l1-videodev.h: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: libv4l1-videodev.h: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: libv4l1-videodev.h: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: libv4l1-videodev.h: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: libv4l1-videodev.h: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: libv4l1-videodev.h: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: libv4l1-videodev.h: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: libv4l1-videodev.h: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX + ## ------------------------------------------ ## +@@ -27791,8 +27791,8 @@ + sed "s/^/$as_me: WARNING: /" >&2 + ;; + esac +-echo "$as_me:$LINENO: checking for linux/videodev.h" >&5 +-echo $ECHO_N "checking for linux/videodev.h... $ECHO_C" >&6 ++echo "$as_me:$LINENO: checking for libv4l1-videodev.h" >&5 ++echo $ECHO_N "checking for libv4l1-videodev.h... $ECHO_C" >&6 + if test "${ac_cv_header_linux_videodev_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +diff -wbBur avifile-0.7-0.7.45/ffmpeg/libavformat/grab.c avifile-0.7-0.7.45.my/ffmpeg/libavformat/grab.c +--- avifile-0.7-0.7.45/ffmpeg/libavformat/grab.c 2006-02-04 11:57:34.000000000 +0300 ++++ avifile-0.7-0.7.45.my/ffmpeg/libavformat/grab.c 2011-11-17 13:21:12.000000000 +0400 +@@ -23,7 +23,7 @@ + #include <sys/mman.h> + #include <sys/time.h> + #define _LINUX_TIME_H 1 +-#include <linux/videodev.h> ++#include <libv4l1-videodev.h> + #include <time.h> + + typedef struct { +diff -wbBur avifile-0.7-0.7.45/ffmpeg/libavformat/v4l2.c avifile-0.7-0.7.45.my/ffmpeg/libavformat/v4l2.c +--- avifile-0.7-0.7.45/ffmpeg/libavformat/v4l2.c 2006-03-02 00:36:52.000000000 +0300 ++++ avifile-0.7-0.7.45.my/ffmpeg/libavformat/v4l2.c 2011-11-17 13:29:40.000000000 +0400 +@@ -31,7 +31,8 @@ + #include <sys/mman.h> + #include <sys/time.h> + #define _LINUX_TIME_H 1 +-#include <linux/videodev.h> ++#include <libv4l1-videodev.h> ++#include <linux/videodev2.h> + #include <time.h> + + static const int desired_video_buffers = 256; +diff -wbBur avifile-0.7-0.7.45/m4/v4l.m4 avifile-0.7-0.7.45.my/m4/v4l.m4 +--- avifile-0.7-0.7.45/m4/v4l.m4 2004-02-18 23:53:58.000000000 +0300 ++++ avifile-0.7-0.7.45.my/m4/v4l.m4 2011-11-17 13:20:56.000000000 +0400 +@@ -10,7 +10,7 @@ + AC_ARG_ENABLE(v4l, [ --enable-v4l support v4l video interface. (autodetect)], + [], enable_v4l=yes) + if test x$enable_v4l = xyes; then +- AC_CHECK_HEADER([linux/videodev.h], [], [ enable_v4l=no; ]) ++ AC_CHECK_HEADER([libv4l1-videodev.h], [], [ enable_v4l=no; ]) + fi + + if test x$enable_v4l = xyes; then +diff -wbBur avifile-0.7-0.7.45/samples/qtvidcap/kv4lsetup.cpp avifile-0.7-0.7.45.my/samples/qtvidcap/kv4lsetup.cpp +--- avifile-0.7-0.7.45/samples/qtvidcap/kv4lsetup.cpp 2005-03-23 18:18:21.000000000 +0300 ++++ avifile-0.7-0.7.45.my/samples/qtvidcap/kv4lsetup.cpp 2011-11-17 13:29:34.000000000 +0400 +@@ -39,7 +39,7 @@ + + /* Necessary to prevent collisions between <linux/time.h> and <sys/time.h> when V4L2 is installed. */ + #define _LINUX_TIME_H +-#include <linux/videodev.h> ++#include <libv4l1-videodev.h> + + #ifndef X_DISPLAY_MISSING + #include <X11/Xlib.h> +diff -wbBur avifile-0.7-0.7.45/samples/qtvidcap/v4lxif.h avifile-0.7-0.7.45.my/samples/qtvidcap/v4lxif.h +--- avifile-0.7-0.7.45/samples/qtvidcap/v4lxif.h 2003-11-14 19:42:04.000000000 +0300 ++++ avifile-0.7-0.7.45.my/samples/qtvidcap/v4lxif.h 2011-11-17 13:35:57.000000000 +0400 +@@ -32,7 +32,8 @@ + + /* Necessary to prevent collisions between <linux/time.h> and <sys/time.h> when V4L2 is installed. */ + #define _LINUX_TIME_H +-#include <linux/videodev.h> ++#include <libv4l1-videodev.h> ++#define BASE_VIDIOCPRIVATE 192 /* 192-255 are private */ + + #define V4L_DEVICE "/dev/video" + #define V4L_VBI_DEVICE "/dev/vbi" diff --git a/community/beye/PKGBUILD b/community/beye/PKGBUILD index 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 <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=beye pkgver=6.1.0 _lver=610 -pkgrel=1 +pkgrel=2 pkgdesc="Binary viewer" arch=(i686 x86_64) license=('GPL') -depends=(slang gpm) -replaces=(biew) +depends=('slang' 'gpm') +replaces=('biew') url="http://beye.sourceforge.net/" options=(zipman) source=(http://downloads.sourceforge.net/project/beye/biew/$pkgver/biew-${_lver}-src.tar.bz2) md5sums=('1b6477defaa61b8ca0f2ae1254978e94') build() { - cd $startdir/src/biew-${_lver} - + cd $srcdir/biew-${_lver} CFLAGS="$CFLAGS -mmmx -msse" ./configure --prefix=/usr + make +} - make || return 1 - - sed -i "s|PREFIX=/usr|PREFIX=$startdir/pkg/usr|" config.mak - sed -i "s|DATADIR=/usr/share/biew|DATADIR=$startdir/pkg/usr/share/biew|" config.mak - sed -i "s|LIBDIR=/usr/lib/biew|LIBDIR=$startdir/pkg/usr/lib/biew|" config.mak - - patch makefile <<EOF -266,267c266,266 -< \$(INSTALL) -D -c -m 644 bin_rc/xlt/* \$(DATADIR)/xlt -< \$(INSTALL) -D -c -m 644 bin_rc/xlt/russian/* \$(DATADIR)/xlt/russian ---- -> cp -r bin_rc/xlt/* \${DATADIR}/xlt -EOF - - make prefix=$startdir/pkg/usr install || return 1 - +package() { + cd $srcdir/biew-${_lver} + make DESTDIR=$pkgdir install mv $pkgdir/usr/man $pkgdir/usr/share/ } diff --git a/community/binutils-avr/PKGBUILD b/community/binutils-avr/PKGBUILD index 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 <bradfanella@archlinux.us> # Contributor: Corrado Primier <bardo@aur.archlinux.org> # Contributor: danst0 <danst0@west.de> pkgname=binutils-avr pkgver=2.21.1 -pkgrel=1 +pkgrel=2 pkgdesc="A set of programs to assemble and manipulate binary and object files for the avr architecture" arch=('i686' 'x86_64') 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 <pupykin.s+arch@gmail.com> # Contributor: durbatuluk <dvdscripter@gmail.org> # Contributor: Steve Ponsford <sp4d@lavabit.com> pkgname=blackbox pkgver=0.70.1 -pkgrel=9 +pkgrel=10 pkgdesc="A window manager for X11" url="http://blackboxwm.sourceforge.net/" arch=('i686' 'x86_64') -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 <pupykin.s+arch@gmail.com> # Maintainer: Christian Himpel <chressie at gmail dot com> # Contributor: Johannes Hanika <hanatos at gmail dot com> @@ -6,14 +6,15 @@ pkgname=darktable pkgver=0.9.3 _pkgver=0.9 -pkgrel=1 +pkgrel=2 pkgdesc="Utility to organize and develop raw images" arch=('i686' 'x86_64') 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 <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=floyd pkgver=2.0.1 -pkgrel=3 +pkgrel=4 pkgdesc="displays system load with pulse of keyboard LED" -arch=(i686 x86_64) +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 <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> @@ -9,13 +9,13 @@ pkgdesc="console font editor" arch=('i686' 'x86_64') 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 <vesa@archlinux.org> +# $Id: PKGBUILD 58668 2011-11-17 12:39:33Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Vesa Kaihlavirta <vesa@archlinux.org> # Contributor: Arch Haskell Team <arch-haskell@haskell.org> -# As generated by cabal2arch 0.7.6 pkgname=haddock pkgver=2.9.2 -pkgrel=2 -pkgdesc="Documentation-generation tool for Haskell libraries" -url="http://hackage.haskell.org/package/${pkgname}" +pkgrel=3 +pkgdesc="Tool for generating documentation for Haskell libraries" +url="http://hackage.haskell.org/package/$pkgname" license=('custom:BSD3') -arch=('i686' 'x86_64') -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 <pupykin.s+arch@gmail.com> # Maintainer: Charles Mauch <cmauch@gmail.com> pkgname=hashcash pkgver=1.22 pkgrel=2 -pkgdesc="Hashcash is a denial-of-service counter measure tool for email/spam." +pkgdesc="a denial-of-service counter measure tool for email/spam." arch=('i686' 'x86_64') 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 <archlinux at cryptocrack dot de> # Contributor: Ali H. Caliskan <ali.h.caliskan AT gmail DOT com> # Contributor: Ryan Coyner <rcoyner@gmail.com> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> pkgname=mixxx -pkgver=1.9.0 +pkgver=1.9.2 pkgrel=1 pkgdesc="Free, open source software for digital DJ'ing." arch=('i686' 'x86_64') @@ -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 <atsutane-tu@freethoughts.de> # Contributor: Alois Nespor <alois.nespor@gmail.com> # Contributor: JerichoKru <jerichokru(AT)htomail.com> pkgname=pragha -pkgver=0.99.1 +pkgver=0.99.1.1 pkgrel=1 pkgdesc="A lightweight GTK+ music manager - fork of Consonance Music Manager." arch=('i686' 'x86_64') @@ -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 <pupykin.s+arch@gmail.com> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Maintainer: Jason Chu <jason@archlinux.org> @@ -11,15 +12,14 @@ license=('GPL') source=(http://downloads.sourceforge.net/herdtools/$pkgname.tar.gz) md5sums=('1fdeaf05ca6337f5c02e76a76c53c407') url="http://www.phy.duke.edu/brahma/" +md5sums=('1fdeaf05ca6337f5c02e76a76c53c407') build() { -cd $startdir/src/$pkgname -# Get rid of the funky mkae install forever bug -sed -i 's/make install/echo/;s/cd watchman/echo/' Makefile -make || return 1 -make INSTDIR=$startdir/pkg/usr install -mkdir ${pkgdir}/usr/share -mv ${pkgdir}/usr/man ${pkgdir}/usr/share/man -#mkdir -p $startdir/pkg/usr/share/procstatd-extras -#cp -R webwatch $startdir/pkg/usr/share/procstatd-extras/ + cd $srcdir/$pkgname + # Get rid of the funky make install forever bug + sed -i 's/make install/echo/;s/cd watchman/echo/' Makefile + make + make INSTDIR=$pkgdir/usr install + mkdir ${pkgdir}/usr/share + mv ${pkgdir}/usr/man ${pkgdir}/usr/share/man } diff --git a/community/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 <pupykin.s+arch@gmail.com> # Contributor: JJDaNiMoTh <jjdanimoth@gmail.com> pkgname=qmc2 -pkgver=0.2.b20 +pkgver=0.34 pkgrel=1 pkgdesc="Qt 4 based UNIX MAME frontend supporting SDLMAME" url="http://qmc2.arcadehits.net" @@ -12,7 +12,7 @@ arch=('i686' 'x86_64') depends=('qt' 'phonon' 'sdl' 'libxmu') makedepends=('rsync' 'mesa') source=("http://downloads.sourceforge.net/project/qmc2/qmc2/$pkgver/qmc2-$pkgver.tar.bz2") -md5sums=('e868144815ff44a2146e839c2395c6d1') +md5sums=('3439fb62c95ff702e3c4194c05353169') build() { cd "$srcdir/$pkgname" diff --git a/community/r8168/PKGBUILD b/community/r8168/PKGBUILD new file mode 100644 index 000000000..10afb9759 --- /dev/null +++ b/community/r8168/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 58713 2011-11-17 21:35:20Z mtorromeo $ +# Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> +# Contributor: Bob Fanger < bfanger(at)gmail > +# Contributor: Filip <fila pruda com>, Det < nimetonmaili(at)gmail > + +pkgname=r8168 +pkgver=8.026.00 +pkgrel=3 +pkgdesc="A kernel module for Realtek 8168 network cards" +url="http://www.realtek.com.tw" +license=("GPL") +arch=('i686' 'x86_64') +depends=('glibc' 'linux>=3.1' 'linux<3.2') +makedepends=('linux-headers') +source=(http://r8168.googlecode.com/files/$pkgname-$pkgver.tar.bz2) +install=$pkgname.install + +_extramodules=extramodules-3.1-ARCH +_kernver="$(cat /lib/modules/$_extramodules/version || true)" + +build() { + cd "$srcdir/$pkgname-$pkgver" + make clean SYSSRC=/usr/src/linux-$_kernver modules +} + +package() { + cd "$srcdir/$pkgname-$pkgver/src" + install -D -m644 $pkgname.ko "$pkgdir/lib/modules/$_extramodules/$pkgname.ko" +} + +md5sums=('cd0b93af17e18eb20cbfb8c5dee40f51') +sha256sums=('e0a58706a956f22f6f44a617d218693888bfc5d3eba7197e61ed6cb75eebb425') diff --git a/community/r8168/r8168.install b/community/r8168/r8168.install new file mode 100644 index 000000000..ff6d6ee42 --- /dev/null +++ b/community/r8168/r8168.install @@ -0,0 +1,17 @@ +rebuild_module_dependencies() { + EXTRAMODULES='extramodules-3.1-ARCH' + depmod $(cat /lib/modules/$EXTRAMODULES/version) +} + +post_install() { + rebuild_module_dependencies + echo '>>> The module r8168 conflicts with r8169. You can blacklist it with:' + echo '>>> `echo "blacklist r8169" > /etc/modprobe.d/r8169_blacklist.conf`' +} +post_upgrade() { + rebuild_module_dependencies +} + +post_remove() { + rebuild_module_dependencies +} diff --git a/community/rt3562sta/PKGBUILD b/community/rt3562sta/PKGBUILD new file mode 100644 index 000000000..1f8de793d --- /dev/null +++ b/community/rt3562sta/PKGBUILD @@ -0,0 +1,74 @@ +# $Id: PKGBUILD 58717 2011-11-17 21:59:14Z mtorromeo $ +# Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> +# Based on SUSE spec https://build.opensuse.org/package/files?package=rt3562sta&project=driver%3Awireless + +pkgname=rt3562sta +pkgver=2.4.1.1 +pkgrel=1 +pkgdesc="Ralink RT3562 PCI WLAN adaptors kernel module" +arch=(i686 x86_64) +url="http://www.ralinktech.com/support.php?s=2" +license=('GPL') +depends=('linux>=3.1' 'linux<3.2') +source=( + http://dl.dropbox.com/u/362439/DPO_RT3562_3592_3062_LinuxSTA_V${pkgver}_20101217.tgz + $pkgname-$pkgver-config.patch + $pkgname-$pkgver-gcc-warnings-x86_64.patch + $pkgname-$pkgver-WPA-mixed.patch + $pkgname-$pkgver-convert-devicename-to-wlanX.patch + $pkgname-$pkgver-remove-potential-conflicts-with-rt2860sta.patch + $pkgname-$pkgver-return_nonvoid.patch + $pkgname-$pkgver-reduce_debug_output.patch + $pkgname-$pkgver-remove_date_time.patch +) +install=$pkgname.install + +_extramodules=extramodules-3.1-ARCH +_kernver="$(cat /lib/modules/$_extramodules/version || true)" + +build() { + cd "$srcdir/DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217" + patch -p0 -i "$srcdir/$pkgname-$pkgver-config.patch" + [ "$CARCH" == "x86_64" ] && patch -p0 -i "$srcdir/$pkgname-$pkgver-gcc-warnings-x86_64.patch" + patch -p0 -i "$srcdir/$pkgname-$pkgver-WPA-mixed.patch" + patch -p0 -i "$srcdir/$pkgname-$pkgver-convert-devicename-to-wlanX.patch" + patch -p0 -i "$srcdir/$pkgname-$pkgver-remove-potential-conflicts-with-rt2860sta.patch" + patch -p0 -i "$srcdir/$pkgname-$pkgver-return_nonvoid.patch" + patch -p0 -i "$srcdir/$pkgname-$pkgver-reduce_debug_output.patch" + patch -p0 -i "$srcdir/$pkgname-$pkgver-remove_date_time.patch" + + # clean up this mess of mixing RT2860STA with RT3562STA + # in documentation files + mv RT2860STA.dat RT3562STA.dat + mv RT2860STACard.dat RT3562STACard.dat + sed -i 's/2860/3562/g' *STA* iwpriv_usage.txt + + # as we change the default name of the interface from raX to wlanX, change respective references in documentation, too + sed -i 's|ra0|wlan0|g' *.txt README* *.dat + sed -i 's|ra1|wlan1|g' *.txt README* *.dat + sed -i 's|ra2|wlan2|g' *.txt README* *.dat + + export EXTRA_CFLAGS="-DVERSION=$pkgver" + make +} + +package() { + cd "$srcdir/DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217" + + install -Dm 0640 RT3562STA.dat "$pkgdir/etc/Wireless/RT3562STA/RT3562STA.dat" + install -Dm 0644 os/linux/$pkgname.ko "$pkgdir/lib/modules/$_extramodules/$pkgname.ko" + install -dm 0755 "$pkgdir/usr/share/doc/$pkgname" + install -m 0644 iwpriv_usage.txt README* RT3562STA* sta_ate_iwpriv_usage.txt "$pkgdir/usr/share/doc/$pkgname" + + find "$pkgdir" -name '*.ko' -exec gzip -9 {} \; +} + +md5sums=('a5e9af70abccdb7b86d1ef605bb34491' + '5cff38fb070fd181cf4beb52acc99616' + 'ca40e951c0799d395a74bf274459b950' + '743b45ad2bf60bf757e53439c26edb71' + 'f2d0fbe845415cdb4f31e365876f740e' + '874619383576e38c5c048f0a068c9844' + '466df4e09896836082db417e52f0224e' + 'edc79dd0de1e8fabcec1e4791feb4391' + 'c8e174ea362bf94ce46038f8388439b6') diff --git a/community/rt3562sta/rt3562sta-2.4.1.1-WPA-mixed.patch b/community/rt3562sta/rt3562sta-2.4.1.1-WPA-mixed.patch new file mode 100644 index 000000000..caf2b1c6a --- /dev/null +++ b/community/rt3562sta/rt3562sta-2.4.1.1-WPA-mixed.patch @@ -0,0 +1,11 @@ +--- common/cmm_wpa.c.orig 2010-11-26 04:18:41.000000000 +0100 ++++ common/cmm_wpa.c 2010-12-01 15:09:22.000000000 +0100 +@@ -2410,7 +2410,7 @@ + UCHAR PrimaryRsnie; + BOOLEAN bMixCipher = FALSE; // indicate the pairwise and group cipher are different + UCHAR p_offset; +- WPA_MIX_PAIR_CIPHER FlexibleCipher = MIX_CIPHER_NOTUSE; // it provide the more flexible cipher combination in WPA-WPA2 and TKIPAES mode ++ WPA_MIX_PAIR_CIPHER FlexibleCipher = WPA_TKIPAES_WPA2_TKIPAES; // it provide the more flexible cipher combination in WPA-WPA2 and TKIPAES mode + + rsnielen_cur_p = NULL; + rsnielen_ex_cur_p = NULL; diff --git a/community/rt3562sta/rt3562sta-2.4.1.1-config.patch b/community/rt3562sta/rt3562sta-2.4.1.1-config.patch new file mode 100644 index 000000000..dc245e38e --- /dev/null +++ b/community/rt3562sta/rt3562sta-2.4.1.1-config.patch @@ -0,0 +1,98 @@ +--- os/linux/config.mk.orig 2010-12-17 12:44:47.000000000 +0100 ++++ os/linux/config.mk 2010-12-17 19:53:36.000000000 +0100 +@@ -9,10 +9,10 @@ + + + # Support Wpa_Supplicant +-HAS_WPA_SUPPLICANT=n ++HAS_WPA_SUPPLICANT=y + + # Support Native WpaSupplicant for Network Maganger +-HAS_NATIVE_WPA_SUPPLICANT_SUPPORT=n ++HAS_NATIVE_WPA_SUPPLICANT_SUPPORT=y + + #Support Net interface block while Tx-Sw queue full + HAS_BLOCK_NET_IF=n +@@ -283,7 +283,7 @@ + endif + + ifeq ($(CHIPSET),3562) +-WFLAGS +=-DRTMP_MAC_PCI -DRT2860 -DRT28xx -DRT30xx -DRT35xx -DRTMP_PCI_SUPPORT -DRTMP_RF_RW_SUPPORT -DRTMP_EFUSE_SUPPORT -DA_BAND_SUPPORT ++WFLAGS +=-DRTMP_MAC_PCI -DRT2860 -DRT28xx -DRT30xx -DRT35xx -DRTMP_PCI_SUPPORT -DRTMP_RF_RW_SUPPORT -DRTMP_EFUSE_SUPPORT -DA_BAND_SUPPORT -DDOT11N_SS3_SUPPORT -DNEW_RATE_ADAPT_SUPPORT -DRT3593 + ifeq ($(HAS_DFS_SUPPORT),y) + WFLAGS += -DDFS_HARDWARE_SUPPORT -DDFS_DEBUG + endif +--- Makefile.orig 2010-12-17 12:44:47.000000000 +0100 ++++ Makefile 2010-12-17 19:51:39.000000000 +0100 +@@ -284,26 +284,26 @@ + endif + + ifeq ($(RT28xx_MODE),AP) +- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)ap.o /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)ap.o /tftpboot + ifeq ($(OSABL),YES) +- cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)ap.o /tftpboot +- cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)ap.o /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)ap.o /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)ap.o /tftpboot + endif + ifeq ($(PLATFORM),INF_AMAZON_SE) +- cp -f /tftpboot/rt2870ap.o /backup/ifx/build/root_filesystem/lib/modules/2.4.31-Amazon_SE-3.6.2.2-R0416_Ralink/kernel/drivers/net ++# cp -f /tftpboot/rt2870ap.o /backup/ifx/build/root_filesystem/lib/modules/2.4.31-Amazon_SE-3.6.2.2-R0416_Ralink/kernel/drivers/net + endif + else + ifeq ($(RT28xx_MODE),APSTA) +- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)apsta.o /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)apsta.o /tftpboot + ifeq ($(OSABL),YES) +- cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)apsta.o /tftpboot +- cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)apsta.o /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)apsta.o /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)apsta.o /tftpboot + endif + else +- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.o /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.o /tftpboot + ifeq ($(OSABL),YES) +- cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)sta.o /tftpboot +- cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)sta.o /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)sta.o /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)sta.o /tftpboot + endif + endif + endif +@@ -331,25 +331,25 @@ + endif + + ifeq ($(RT28xx_MODE),AP) +- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)ap.ko /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)ap.ko /tftpboot + ifeq ($(OSABL),YES) +- cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)ap.ko /tftpboot +- cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)ap.ko /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)ap.ko /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)ap.ko /tftpboot + endif + rm -f os/linux/rt$(CHIPSET)ap.ko.lzma + /root/bin/lzma e os/linux/rt$(CHIPSET)ap.ko os/linux/rt$(CHIPSET)ap.ko.lzma + else + ifeq ($(RT28xx_MODE),APSTA) +- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)apsta.ko /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)apsta.ko /tftpboot + ifeq ($(OSABL),YES) +- cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)apsta.ko /tftpboot +- cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)apsta.ko /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)apsta.ko /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)apsta.ko /tftpboot + endif + else +- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.ko /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.ko /tftpboot + ifeq ($(OSABL),YES) +- cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)sta.ko /tftpboot +- cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)sta.ko /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)sta.ko /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)sta.ko /tftpboot + endif + endif + endif diff --git a/community/rt3562sta/rt3562sta-2.4.1.1-convert-devicename-to-wlanX.patch b/community/rt3562sta/rt3562sta-2.4.1.1-convert-devicename-to-wlanX.patch new file mode 100644 index 000000000..5ec4d5028 --- /dev/null +++ b/community/rt3562sta/rt3562sta-2.4.1.1-convert-devicename-to-wlanX.patch @@ -0,0 +1,13 @@ +--- include/rtmp_def.h.orig 2010-11-26 04:18:41.000000000 +0100 ++++ include/rtmp_def.h 2010-12-01 14:57:05.000000000 +0100 +@@ -1451,8 +1451,8 @@ + #define SET_ENTRY_CLIWDS(_x) CLIENT_STATUS_SET_FLAG((_x), fCLIENT_STATUS_CLI_WDS) + #endif // CLIENT_WDS // + +-#define INF_MAIN_DEV_NAME "ra" +-#define INF_MBSSID_DEV_NAME "ra" ++#define INF_MAIN_DEV_NAME "wlan" ++#define INF_MBSSID_DEV_NAME "wlan" + #define INF_WDS_DEV_NAME "wds" + #define INF_APCLI_DEV_NAME "apcli" + #define INF_MESH_DEV_NAME "mesh" diff --git a/community/rt3562sta/rt3562sta-2.4.1.1-gcc-warnings-x86_64.patch b/community/rt3562sta/rt3562sta-2.4.1.1-gcc-warnings-x86_64.patch new file mode 100644 index 000000000..a53dbde86 --- /dev/null +++ b/community/rt3562sta/rt3562sta-2.4.1.1-gcc-warnings-x86_64.patch @@ -0,0 +1,14 @@ +--- os/linux/rt_linux.c.orig 2010-11-26 04:18:41.000000000 +0100 ++++ os/linux/rt_linux.c 2010-12-01 14:57:53.000000000 +0100 +@@ -479,9 +479,9 @@ + MEM_DBG_PKT_ALLOC_INC(pAd); + + skb_reserve(skb, 2); +- NdisMoveMemory(skb->tail, pHeader802_3, HdrLen); ++ NdisMoveMemory(skb_tail_pointer(skb), pHeader802_3, HdrLen); // + skb_put(skb, HdrLen); +- NdisMoveMemory(skb->tail, pData, DataSize); ++ NdisMoveMemory(skb_tail_pointer(skb), pData, DataSize); // + skb_put(skb, DataSize); + skb->dev = get_netdev_from_bssid(pAd, FromWhichBSSID); + pPacket = OSPKT_TO_RTPKT(skb); diff --git a/community/rt3562sta/rt3562sta-2.4.1.1-reduce_debug_output.patch b/community/rt3562sta/rt3562sta-2.4.1.1-reduce_debug_output.patch new file mode 100644 index 000000000..6754f214d --- /dev/null +++ b/community/rt3562sta/rt3562sta-2.4.1.1-reduce_debug_output.patch @@ -0,0 +1,15 @@ +--- include/os/rt_linux.h.orig 2011-01-07 11:20:02.000000000 +0100 ++++ include/os/rt_linux.h 2011-01-07 11:21:30.000000000 +0100 +@@ -611,10 +611,10 @@ + + #define DBGPRINT_RAW(Level, Fmt) \ + do{ \ +- if (Level <= RTDebugLevel) \ ++/* if (Level <= RTDebugLevel) \ + { \ + printk Fmt; \ +- } \ ++ }*/ \ + }while(0) + + #define DBGPRINT(Level, Fmt) DBGPRINT_RAW(Level, Fmt) diff --git a/community/rt3562sta/rt3562sta-2.4.1.1-remove-potential-conflicts-with-rt2860sta.patch b/community/rt3562sta/rt3562sta-2.4.1.1-remove-potential-conflicts-with-rt2860sta.patch new file mode 100644 index 000000000..a0d00d6e3 --- /dev/null +++ b/community/rt3562sta/rt3562sta-2.4.1.1-remove-potential-conflicts-with-rt2860sta.patch @@ -0,0 +1,47 @@ +--- include/os/rt_linux.h.orig 2010-11-26 04:18:41.000000000 +0100 ++++ include/os/rt_linux.h 2010-12-01 14:58:46.000000000 +0100 +@@ -111,10 +111,10 @@ + + #ifdef CONFIG_STA_SUPPORT + #ifdef RTMP_MAC_PCI +-#define STA_PROFILE_PATH "/etc/Wireless/RT2860STA/RT2860STA.dat" ++#define STA_PROFILE_PATH "/etc/Wireless/RT3562STA/RT3562STA.dat" + #define STA_DRIVER_VERSION "2.4.1.1" + #ifdef MULTIPLE_CARD_SUPPORT +-#define CARD_INFO_PATH "/etc/Wireless/RT2860STA/RT2860STACard.dat" ++#define CARD_INFO_PATH "/etc/Wireless/RT3562STA/RT3562STACard.dat" + #endif // MULTIPLE_CARD_SUPPORT // + #endif // RTMP_MAC_PCI // + +--- os/linux/pci_main_dev.c.orig 2010-12-17 19:59:25.000000000 +0100 ++++ os/linux/pci_main_dev.c 2010-12-17 20:00:12.000000000 +0100 +@@ -90,14 +90,15 @@ + MODULE_VERSION(STA_DRIVER_VERSION); + #endif + #endif // CONFIG_STA_SUPPORT // +- ++MODULE_DESCRIPTION("RT3562 Wireless Lan Linux Driver"); ++MODULE_LICENSE("GPL"); + + // + // Our PCI driver structure + // + static struct pci_driver rt2860_driver = + { +- name: "rt2860", ++ name: "rt3562", + id_table: rt2860_pci_tbl, + probe: rt2860_probe, + #if LINUX_VERSION_CODE >= 0x20412 +@@ -317,9 +318,9 @@ + } + + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) +- print_name = pci_dev ? pci_name(pci_dev) : "rt2860"; ++ print_name = pci_dev ? pci_name(pci_dev) : "rt3562"; + #else +- print_name = pci_dev ? pci_dev->slot_name : "rt2860"; ++ print_name = pci_dev ? pci_dev->slot_name : "rt3562"; + #endif // LINUX_VERSION_CODE // + + if ((rv = pci_request_regions(pci_dev, print_name)) != 0) diff --git a/community/rt3562sta/rt3562sta-2.4.1.1-remove_date_time.patch b/community/rt3562sta/rt3562sta-2.4.1.1-remove_date_time.patch new file mode 100644 index 000000000..b17ba5a12 --- /dev/null +++ b/community/rt3562sta/rt3562sta-2.4.1.1-remove_date_time.patch @@ -0,0 +1,11 @@ +--- os/linux/sta_ioctl.c.orig 2010-12-17 12:44:47.000000000 +0100 ++++ os/linux/sta_ioctl.c 2011-08-02 14:52:37.000000000 +0200 +@@ -1812,7 +1812,7 @@ + wrq->length = strlen(extra) + 1; // 1: size of '\0' + break; + case SHOW_DRVIER_VERION: +- sprintf(extra, "Driver version-%s, %s %s\n", STA_DRIVER_VERSION, __DATE__, __TIME__ ); ++ sprintf(extra, "Driver version-%s, %s %s\n", STA_DRIVER_VERSION, NULL, NULL ); + wrq->length = strlen(extra) + 1; // 1: size of '\0' + break; + #ifdef DOT11_N_SUPPORT diff --git a/community/rt3562sta/rt3562sta-2.4.1.1-return_nonvoid.patch b/community/rt3562sta/rt3562sta-2.4.1.1-return_nonvoid.patch new file mode 100644 index 000000000..7416a31f9 --- /dev/null +++ b/community/rt3562sta/rt3562sta-2.4.1.1-return_nonvoid.patch @@ -0,0 +1,11 @@ +--- os/linux/rt_main_dev.c.orig 2010-12-17 12:44:47.000000000 +0100 ++++ os/linux/rt_main_dev.c 2010-12-17 19:42:23.000000000 +0100 +@@ -1247,7 +1247,7 @@ + RTMP_OS_TASK *pTask; + + if (pAd->bWriteDat == FALSE) +- return; ++ return 0; + + DBGPRINT(RT_DEBUG_TRACE, ("-->WriteDatThreadInit()\n")); + diff --git a/community/rt3562sta/rt3562sta.install b/community/rt3562sta/rt3562sta.install new file mode 100644 index 000000000..82ec4d462 --- /dev/null +++ b/community/rt3562sta/rt3562sta.install @@ -0,0 +1,16 @@ +rebuild_module_dependencies() { + EXTRAMODULES='extramodules-3.1-ARCH' + depmod $(cat /lib/modules/$EXTRAMODULES/version) +} + +post_install() { + rebuild_module_dependencies +} + +post_upgrade() { + rebuild_module_dependencies +} + +post_remove() { + rebuild_module_dependencies +} diff --git a/community/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 <pupykin.s+arch@gmail.com> # Contributor: Anders Bergh <anders1@gmail.com> # Contributor: Markus Volkmann <mcfock@counterstrike.de> pkgname=wol pkgver=0.7.1 -pkgrel=4 +pkgrel=5 arch=('i686' 'x86_64') -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 <pupykin.s+arch@gmail.com> pkgname=xnc pkgver=5.0.4 -pkgrel=3 +pkgrel=4 pkgdesc="X nortern captain file manager" arch=(i686 x86_64) 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 <sillywilly@gmail.com> 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 <pupykin.s+arch@gmail.com> # Contributor: Benjamin Andresen <benny@klapmuetz.org> # Contributor: Mikko Seppдlд <t-r-a-y@mbnet.fi> pkgname=xvkbd pkgver=3.2 -pkgrel=1 +pkgrel=2 pkgdesc="virtual (graphical) keyboard program for X Window System" arch=('i686' 'x86_64') url="http://homepage3.nifty.com/tsato/xvkbd/" @@ -17,22 +17,17 @@ md5sums=('1bce8d6c27e6e7df92ec09b414f82dad') build() { cd "$srcdir/$pkgname-$pkgver" - -# patch xvkbd.c <<EOF -#diff xvkbd-2.8/xvkbd.c xvkbd-2.8.my/xvkbd.c -#45a46 -#> #include <X11/extensions/XKB.h> -#1988a1990 -#> XkbLockGroup(dpy, XkbUseCoreKbd, (shift_state & altgr_mask) ? 1 : 0); -#EOF - xmkmf - make || return 1 - make DESTDIR=$pkgdir install || return 1 + sed -i 's|#include <X11/Xaw/|#include <X11/Xaw3d/|' xvkbd.c + make +} +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR=$pkgdir install # fix - rm -f $pkgdir/usr/lib/X11/app-defaults && \ - mkdir -p $pkgdir/usr/lib/X11 && \ - mv $pkgdir/etc/X11/app-defaults $pkgdir/usr/lib/X11/ && \ + rm -f $pkgdir/usr/lib/X11/app-defaults + mkdir -p $pkgdir/usr/lib/X11 + mv $pkgdir/etc/X11/app-defaults $pkgdir/usr/lib/X11/ rm -rf $pkgdir/etc/ } |