From 71f58605e914de11f3a9b7cc2f27b0c52fb8d4ba Mon Sep 17 00:00:00 2001 From: root Date: Fri, 24 Jun 2011 23:06:35 +0000 Subject: Fri Jun 24 23:06:35 UTC 2011 --- extra/avidemux/PKGBUILD | 12 ++-- extra/avidemux/avidemux-2.5.4-x264-build115.patch | 45 ++++++++++++++ extra/cdargs/PKGBUILD | 18 +++--- extra/cdargs/cdargs.install | 4 -- extra/curl/PKGBUILD | 24 ++++---- extra/ethstatus/PKGBUILD | 18 +++--- extra/ffcall/PKGBUILD | 30 ++++++---- extra/ffmpeg/PKGBUILD | 18 +++--- extra/gimp-refocus/PKGBUILD | 45 +++++++------- extra/gstreamer0.10-ugly/PKGBUILD | 4 +- extra/gtkglextmm/PKGBUILD | 25 +++++--- extra/gtkglextmm/gdkspanfunc.patch | 13 +++++ extra/hd2u/PKGBUILD | 8 +-- extra/hexedit/PKGBUILD | 11 ++-- extra/keytouch/PKGBUILD | 71 ++++++++++++++--------- extra/keytouch/keytouch.daemon | 3 - extra/metacity/PKGBUILD | 12 ++-- extra/nx-common/PKGBUILD | 12 ++-- extra/nxserver/PKGBUILD | 12 ++-- extra/paprefs/PKGBUILD | 6 +- extra/pdksh/PKGBUILD | 28 +++++---- extra/pdksh/pdksh.install | 2 +- extra/pulseaudio/PKGBUILD | 24 ++++---- extra/pulseaudio/pulseaudio.install | 3 - extra/terminal/PKGBUILD | 17 ++---- extra/vlc/PKGBUILD | 4 +- extra/x264/PKGBUILD | 6 +- extra/xfce4-panel/PKGBUILD | 6 +- 28 files changed, 282 insertions(+), 199 deletions(-) create mode 100644 extra/avidemux/avidemux-2.5.4-x264-build115.patch create mode 100644 extra/gtkglextmm/gdkspanfunc.patch (limited to 'extra') diff --git a/extra/avidemux/PKGBUILD b/extra/avidemux/PKGBUILD index 59dec52ad..9fd24d47b 100644 --- a/extra/avidemux/PKGBUILD +++ b/extra/avidemux/PKGBUILD @@ -1,22 +1,26 @@ -# $Id: PKGBUILD 126410 2011-06-05 07:19:37Z eric $ +# $Id: PKGBUILD 127810 2011-06-18 16:08:40Z ibiru $ # Maintainer: Eric Bélanger pkgbase=avidemux pkgname=('avidemux-cli' 'avidemux-gtk' 'avidemux-qt') pkgver=2.5.5 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') license=('GPL') url="http://fixounet.free.fr/avidemux/" makedepends=('cmake' 'libxslt' 'gtk2' 'qt' 'jack' 'esound' 'libvorbis' 'sdl' 'libxv' \ 'alsa-lib' 'lame' 'xvidcore' 'faad2' 'faac' 'x264' 'libsamplerate' \ 'opencore-amr' 'yasm' 'mesa' 'libvpx' 'libpulse') -source=(http://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz) -md5sums=('33bbe210c6826cea1987ed18a41d57a7') +source=(http://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz + avidemux-2.5.4-x264-build115.patch) +md5sums=('33bbe210c6826cea1987ed18a41d57a7' + '24a18b53a58b678b9e87d30566985751') build() { cd "${srcdir}/${pkgbase}_${pkgver}" + patch -Np1 -i "${srcdir}/avidemux-2.5.4-x264-build115.patch" + mkdir build cd build cmake -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release -D CMAKE_SKIP_RPATH=ON -D GTK=1 -D QT4=1 .. diff --git a/extra/avidemux/avidemux-2.5.4-x264-build115.patch b/extra/avidemux/avidemux-2.5.4-x264-build115.patch new file mode 100644 index 000000000..c627667ec --- /dev/null +++ b/extra/avidemux/avidemux-2.5.4-x264-build115.patch @@ -0,0 +1,45 @@ +diff -ru avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp +--- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp 2011-04-28 22:35:36.000000000 +0200 ++++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp 2011-04-28 22:40:26.000000000 +0200 +@@ -488,8 +488,10 @@ + printf("[x264] analyse.b_transform_8x8 = %d\n", x264Param->analyse.b_transform_8x8); + printf("[x264] analyse.inter = %d\n", x264Param->analyse.inter); + printf("[x264] b_cabac = %d\n", x264Param->b_cabac); +-#if X264_BUILD > 101 ++#if X264_BUILD > 101 && X264_BUILD < 115 + printf("[x264] i_open_gop = %d\n", x264Param->i_open_gop); ++#elif X264_BUILD > 114 ++ printf("[x264] b_open_gop = %d\n", x264Param->b_open_gop); + #endif + printf("[x264] b_interlaced = %d\n", x264Param->b_interlaced); + #if X264_BUILD > 88 +diff -ru avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp +--- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp 2011-04-28 22:35:36.000000000 +0200 ++++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp 2011-04-28 22:43:36.000000000 +0200 +@@ -417,7 +417,7 @@ + _param.b_cabac = cabac; + } + +-#if X264_BUILD > 101 ++#if X264_BUILD > 101 && X264_BUILD < 115 + unsigned int x264Options::getOpenGopMode(void) + { + return _param.i_open_gop; +@@ -428,6 +428,17 @@ + if (openGopMode < 3) + _param.i_open_gop = openGopMode; + } ++#elif X264_BUILD > 114 ++unsigned int x264Options::getOpenGopMode(void) ++{ ++ return _param.b_open_gop; ++} ++ ++void x264Options::setOpenGopMode(unsigned int openGopMode) ++{ ++ if (openGopMode < 3) ++ _param.b_open_gop = openGopMode; ++} + #endif + + unsigned int x264Options::getInterlaced(void) diff --git a/extra/cdargs/PKGBUILD b/extra/cdargs/PKGBUILD index 987321e06..28e471e84 100644 --- a/extra/cdargs/PKGBUILD +++ b/extra/cdargs/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 104930 2011-01-05 15:27:14Z andrea $ +# $Id: PKGBUILD 128462 2011-06-24 02:21:59Z eric $ # Maintainer: Aaron Griffin # Contributor: Damir Perisa pkgname=cdargs pkgver=1.35 -pkgrel=2 +pkgrel=3 pkgdesc="A replacement for 'cd' that includes bookmarks/browsing for faster navigation" arch=('i686' 'x86_64') license=('GPL') url="http://www.skamphausen.de/cgi-bin/ska/CDargs" depends=('ncurses' 'gcc-libs') +install=cdargs.install source=("http://www.skamphausen.de/downloads/${pkgname}/${pkgname}-${pkgver}.tar.gz") -install=${pkgname}.install md5sums=('50be618d67f0b9f2439526193c69c567') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --mandir=/usr/share/man make @@ -24,13 +24,13 @@ build() { } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install # install helper scripts cd contrib - make DESTDIR=${pkgdir} install + make DESTDIR="${pkgdir}" install - install -d ${pkgdir}/usr/share/cdargs - install $pkgname-{tcsh.csh,bash.sh} ${pkgdir}/usr/share/cdargs + install -d "${pkgdir}/usr/share/cdargs" + install $pkgname-{tcsh.csh,bash.sh} "${pkgdir}/usr/share/cdargs" } diff --git a/extra/cdargs/cdargs.install b/extra/cdargs/cdargs.install index b1a5c1d9d..2b29beba7 100644 --- a/extra/cdargs/cdargs.install +++ b/extra/cdargs/cdargs.install @@ -1,7 +1,3 @@ post_install() { echo "cdargs: helper scripts are in /usr/share/cdargs/" } - -post_upgrade() { - echo "cdargs: helper scripts are in /usr/share/cdargs/" -} diff --git a/extra/curl/PKGBUILD b/extra/curl/PKGBUILD index 13048e9d9..07712c045 100644 --- a/extra/curl/PKGBUILD +++ b/extra/curl/PKGBUILD @@ -1,12 +1,13 @@ -# $Id: PKGBUILD 123955 2011-05-14 18:55:23Z angvp $ -# Maintainer: Angel Velasquez +# $Id: PKGBUILD 128353 2011-06-23 12:54:15Z dreisner $ +# Maintainer: Dave Reisner +# Contributor: Angel Velasquez # Contributor: Eric Belanger # Contributor: Lucien Immink # Contributor: Daniel J Griffiths pkgname=curl -pkgver=7.21.6 -pkgrel=2 +pkgver=7.21.7 +pkgrel=1 pkgdesc="An URL retrival utility and library" arch=('i686' 'x86_64') url="http://curl.haxx.se" @@ -18,7 +19,7 @@ source=(http://curl.haxx.se/download/${pkgname}-${pkgver}.tar.bz2 [[ $CARCH == "x86_64" ]] && _curlbuild=curlbuild-64.h [[ $CARCH == "i686" ]] && _curlbuild=curlbuild-32.h -md5sums=('6611989a81ebd7b03a35adc3001ddee0' +md5sums=('5f6d50c4d4ee38c57fe37e3cff75adbd' '751bd433ede935c8fae727377625a8ae') build() { @@ -41,13 +42,12 @@ build() { } package() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "$srcdir/$pkgname-$pkgver" - make DESTDIR=${pkgdir} install - install -Dm644 COPYING \ - ${pkgdir}/usr/share/licenses/${pkgname}/COPYING + make DESTDIR="$pkgdir" install + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" install -Dm644 docs/libcurl/libcurl.m4 \ - ${pkgdir}/usr/share/aclocal/libcurl.m4 - mv "${pkgdir}/usr/include/curl/curlbuild.h" "${pkgdir}/usr/include/curl/${_curlbuild}" - install -m 644 ${srcdir}/curlbuild.h "${pkgdir}/usr/include/curl/curlbuild.h" + "$pkgdir/usr/share/aclocal/libcurl.m4" + mv "$pkgdir/usr/include/curl/curlbuild.h" "$pkgdir/usr/include/curl/$_curlbuild" + install -m644 "$srcdir/curlbuild.h" "$pkgdir/usr/include/curl/curlbuild.h" } diff --git a/extra/ethstatus/PKGBUILD b/extra/ethstatus/PKGBUILD index 7698321bb..9333a6adf 100644 --- a/extra/ethstatus/PKGBUILD +++ b/extra/ethstatus/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 28971 2009-03-04 02:59:17Z eric $ +# $Id: PKGBUILD 128471 2011-06-24 03:12:05Z eric $ # Maintainer: Juergen Hoetzel # Contributor: Tom Newsom pkgname=ethstatus pkgver=0.4.3 -pkgrel=1 -pkgdesc="EthStatus was developed for Linux users that are usually in console mode, based on PPPStatus" +pkgrel=2 +pkgdesc="A simple program for displaying commonly needed/wanted statistics in real time of incoming and outgoing traffic" arch=('i686' 'x86_64') url="http://packages.qa.debian.org/e/ethstatus.html" license=('GPL') @@ -14,8 +14,12 @@ source=(http://ftp.debian.org/debian/pool/main/e/ethstatus/ethstatus_$pkgver.tar md5sums=('088412ddff67f50e32bc9d45e56b2658') build() { - cd $srcdir/ethstatus-$pkgver - make || return 1 - install -D -m755 ethstatus $pkgdir/usr/bin/ethstatus || return 1 - install -D -m644 ethstatus.1 $pkgdir/usr/share/man/man1/ethstatus.1 || return 1 + cd "$srcdir/ethstatus-$pkgver" + make +} + +package() { + cd "$srcdir/ethstatus-$pkgver" + install -D -m755 ethstatus "$pkgdir/usr/bin/ethstatus" + install -D -m644 ethstatus.1 "$pkgdir/usr/share/man/man1/ethstatus.1" } diff --git a/extra/ffcall/PKGBUILD b/extra/ffcall/PKGBUILD index fcf0a0f66..5d21a3d7b 100644 --- a/extra/ffcall/PKGBUILD +++ b/extra/ffcall/PKGBUILD @@ -1,26 +1,32 @@ -# $Id: PKGBUILD 2176 2008-05-28 20:52:39Z eric $ +# $Id: PKGBUILD 128452 2011-06-24 01:23:15Z eric $ # Maintainer: Vesa Kaihlavirta # Contributor: Michael Baehr pkgname=ffcall pkgver=1.10 -pkgrel=3 +pkgrel=4 pkgdesc="C library for implementing foreign function calls in embedded interpreters" arch=('i686' 'x86_64') -url="http://www.haible.de/bruno/packages-ffcall.html" +url="http://www.gnu.org/software/libffcall/" license=('GPL2') options=('!libtool' '!makeflags') source=(http://www.haible.de/bruno/gnu/${pkgname}-${pkgver}.tar.gz) md5sums=('2db95007e901f3bc2ae7e5a9fe9ebea4') build() { - cd ${startdir}/src/${pkgname}-${pkgver} - if [ "$CARCH" = "x86_64" ]; then - ./configure --prefix=/usr --mandir=/usr/share/man --with-pic || return 1 - else - ./configure --prefix=/usr --mandir=/usr/share/man || return 1 - fi - make || return 1 - install -d ${startdir}/pkg/usr/share/man || return 1 - make DESTDIR=${startdir}/pkg/ install || return 1 + cd "${srcdir}/${pkgname}-${pkgver}" + [ "$CARCH" = "x86_64" ] && CONFIGFLAG="--with-pic" + ./configure --prefix=/usr --mandir=/usr/share/man $CONFIGFLAG + make +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + install -d "${pkgdir}"/usr/share/{man,doc/ffcall} + make DESTDIR="${pkgdir}" htmldir=/usr/share/doc/ffcall install } diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD index 466fe6629..f81b87b90 100644 --- a/extra/ffmpeg/PKGBUILD +++ b/extra/ffmpeg/PKGBUILD @@ -1,28 +1,24 @@ -# $Id: PKGBUILD 122938 2011-05-07 11:51:04Z ibiru $ +# $Id: PKGBUILD 128284 2011-06-22 13:37:20Z ibiru $ # Maintainer : Ionut Biru # Contributor: Tom Newsom # Contributor: Paul Mattal pkgname=ffmpeg -pkgver=20110330 -pkgrel=2 +pkgver=20110622 +pkgrel=1 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" arch=('i686' 'x86_64') url="http://ffmpeg.org/" license=('GPL') -depends=('bzip2' 'lame' 'sdl' 'libvorbis' 'xvidcore' 'zlib' 'x264' 'libtheora' 'opencore-amr' 'alsa-lib' 'libvdpau' 'libxfixes' 'schroedinger' 'libvpx' 'libva' 'openjpeg') +depends=('bzip2' 'lame' 'sdl' 'libvorbis' 'xvidcore' 'zlib' 'x264' 'libtheora' 'opencore-amr' 'alsa-lib' 'libvdpau' 'libxfixes' 'schroedinger' 'libvpx' 'libva' 'openjpeg' 'rtmpdump') makedepends=('yasm' 'git') #git clone git://git.videolan.org/ffmpeg.git -source=(ftp://ftp.archlinux.org/other/ffmpeg/${pkgname}-${pkgver}.tar.xz - avutils-make-aes-and-sha-public.patch) -md5sums=('dd682a876a496b9f9ae8afb3b3b70389' - '06eb45335669cb742fdcbea48f0605ce') +source=(ftp://ftp.archlinux.org/other/ffmpeg/${pkgname}-${pkgver}.tar.xz) +md5sums=('ff3636c6601f68cdcc777fadaf0eba46') build() { cd "$srcdir/$pkgname" - patch -Np1 -i "$srcdir/avutils-make-aes-and-sha-public.patch" - ./configure \ --prefix=/usr \ --enable-libmp3lame \ @@ -38,6 +34,7 @@ build() { --enable-libopencore_amrwb \ --enable-libschroedinger \ --enable-libopenjpeg \ + --enable-librtmp \ --enable-gpl \ --enable-version3 \ --enable-runtime-cpudetect \ @@ -52,3 +49,4 @@ build() { } # vim:set ts=2 sw=2 et: +md5sums=('6003afa1f87857db729d697e3ec1be36') diff --git a/extra/gimp-refocus/PKGBUILD b/extra/gimp-refocus/PKGBUILD index 6d78aad67..5cc3b5703 100644 --- a/extra/gimp-refocus/PKGBUILD +++ b/extra/gimp-refocus/PKGBUILD @@ -1,34 +1,35 @@ -# $Id: PKGBUILD 54791 2009-10-11 19:30:09Z giovanni $ +# $Id: PKGBUILD 128457 2011-06-24 02:06:37Z eric $ # Maintainer: Tobias Kieslich # Contributor: Tobias Kieslich pkgname=gimp-refocus -_pname=refocus pkgver=0.9.0 -pkgrel=2 -arch=(i686 x86_64) -license=(GPL2) -pkgdesc="a sharpen plugin for gimp using FIR Wiener filtering" -depends=('gimp>=2.0.0') +pkgrel=3 +pkgdesc="A sharpen plugin for gimp using FIR Wiener filtering" +arch=('i686' 'x86_64') url="http://refocus.sourceforge.net/" -source=(http://downloads.sourceforge.net/sourceforge/${_pname}/${_pname}-${pkgver}.tar.gz -\ - ${_pname}-gimp-2.0.patch ${_pname}-mirror-fix.patch ${_pname}-gimp-preview.patch) -md5sums=('8d4eac4ef45c904fb5e73021696bec94' '8ef9dfe697cd20be2be14c1ee53a240a'\ - '532593cba030feab8ffa7800fc9cd782' '6b55dbdc656646c765064cf21e1a3c57') +license=('GPL2') +depends=('gimp') +source=(http://downloads.sourceforge.net/sourceforge/refocus/refocus-${pkgver}.tar.gz \ + refocus-gimp-2.0.patch refocus-mirror-fix.patch refocus-gimp-preview.patch) +md5sums=('8d4eac4ef45c904fb5e73021696bec94' + '8ef9dfe697cd20be2be14c1ee53a240a' + '532593cba030feab8ffa7800fc9cd782' + '6b55dbdc656646c765064cf21e1a3c57') build() { - cd ${startdir}/src/${_pname}-${pkgver} - # we need a *load of patches now to compile - patch -Np0 -i ../${_pname}-gimp-2.0.patch || return 1 - patch -Np0 -i ../${_pname}-mirror-fix.patch || return 1 - patch -Np0 -i ../${_pname}-gimp-preview.patch || return 1 + cd "${srcdir}/refocus-${pkgver}" + patch -Np0 -i ../refocus-gimp-2.0.patch + patch -Np0 -i ../refocus-mirror-fix.patch + patch -Np0 -i ../refocus-gimp-preview.patch aclocal - automake -a --gnu --include-deps Makefile - automake -a --gnu --include-deps lib/Makefile autoconf - echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" + automake --add-missing ./configure --prefix=/usr --bindir=/usr/lib/gimp/2.0/plug-ins - make || return 1 - make DESTDIR=${startdir}/pkg install + make +} + +package() { + cd "${srcdir}/refocus-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/gstreamer0.10-ugly/PKGBUILD b/extra/gstreamer0.10-ugly/PKGBUILD index 4ab9fea99..9f1074038 100644 --- a/extra/gstreamer0.10-ugly/PKGBUILD +++ b/extra/gstreamer0.10-ugly/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 124039 2011-05-16 08:56:43Z jgc $ +# $Id: PKGBUILD 127813 2011-06-18 16:10:52Z ibiru $ # Maintainer: Jan de Groot pkgbase=gstreamer0.10-ugly pkgname=('gstreamer0.10-ugly' 'gstreamer0.10-ugly-plugins') pkgver=0.10.18 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') license=('LGPL') makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.34' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libid3tag' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr') diff --git a/extra/gtkglextmm/PKGBUILD b/extra/gtkglextmm/PKGBUILD index a0e738c96..7a4c1fca8 100644 --- a/extra/gtkglextmm/PKGBUILD +++ b/extra/gtkglextmm/PKGBUILD @@ -1,24 +1,35 @@ -# $Id: PKGBUILD 47716 2009-07-25 16:36:45Z giovanni $ +# $Id: PKGBUILD 128291 2011-06-22 14:49:45Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Bastien Bouclet pkgname=gtkglextmm pkgver=1.2.0 -pkgrel=4 +pkgrel=5 pkgdesc="Cpp C++ bindings for gtkglext" arch=('i686' 'x86_64') url="http://gtkglext.sourceforge.net/" -depends=('gtkmm>=2.10.1' 'gtkglext') +depends=('gtkmm' 'gtkglext') makedepends=('pkgconfig') options=('!libtool') license=('GPL') -source=(http://downloads.sourceforge.net/sourceforge/gtkglext/${pkgname}-${pkgver}.tar.bz2) -md5sums=('27c05f4d45c5fd07b6fb0f044add3056') +source=(http://downloads.sourceforge.net/sourceforge/gtkglext/${pkgname}-${pkgver}.tar.bz2 + gdkspanfunc.patch) +md5sums=('27c05f4d45c5fd07b6fb0f044add3056' + 'd7c8ea33c748a6857ee629c16b2d9bff') build() { cd ${srcdir}/${pkgname}-${pkgver} + + # FS#24706 + patch -Np1 -i ${srcdir}/gdkspanfunc.patch + ./configure --prefix=/usr \ --disable-gtkglext-test - make || return 1 - make DESTDIR=${pkgdir}/ install + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + + make DESTDIR=${pkgdir} install } diff --git a/extra/gtkglextmm/gdkspanfunc.patch b/extra/gtkglextmm/gdkspanfunc.patch new file mode 100644 index 000000000..ae5672a8c --- /dev/null +++ b/extra/gtkglextmm/gdkspanfunc.patch @@ -0,0 +1,13 @@ +--- a/gtkglext/gtkmm/gl/widget.cc 2004-05-18 03:01:50.000000000 -0300 ++++ b/gtkglext/gtkmm/gl/widget.cc 2011-06-12 17:57:13.075541070 -0300 +@@ -17,9 +17,8 @@ + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. + */ + +-#include +- + #include "widget.h" ++#include + + namespace Gtk + { diff --git a/extra/hd2u/PKGBUILD b/extra/hd2u/PKGBUILD index a06530a7a..846ee3015 100644 --- a/extra/hd2u/PKGBUILD +++ b/extra/hd2u/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 13826 2008-09-29 02:37:37Z douglas $ +# $Id: PKGBUILD 128435 2011-06-23 23:30:35Z dan $ # Maintainer: Giovanni Scafora # Contributor: Damir Perisa pkgname=hd2u pkgver=1.0.3 -pkgrel=1 +pkgrel=2 pkgdesc="Dos2Unix text file converter" arch=('i686' 'x86_64') license=('GPL2') @@ -16,6 +16,6 @@ md5sums=('8f6668fafb279aa19f956ec0515717b6') build() { cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr - make || return 1 - make prefix=$pkgdir/usr install + make + make prefix="$pkgdir/usr" install } diff --git a/extra/hexedit/PKGBUILD b/extra/hexedit/PKGBUILD index 32f9749df..cbf963d64 100644 --- a/extra/hexedit/PKGBUILD +++ b/extra/hexedit/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 68045 2010-02-10 15:26:23Z giovanni $ +# $Id: PKGBUILD 128432 2011-06-23 23:29:54Z dan $ # Maintainer: Giovanni Scafora # Contributor: Paul Mattal pkgname=hexedit pkgver=1.2.12 -pkgrel=2 +pkgrel=3 pkgdesc="Hex Editor for Linux" arch=('i686' 'x86_64') url="http://merd.net/pixel/hexedit.html" @@ -15,8 +15,9 @@ md5sums=('0d2f48610006278cd93359fea9a06d5c') build() { cd "${srcdir}/${pkgname}" + CFLAGS="$CFLAGS -Wall" - ./configure || return 1 - make || return 1 - make prefix="${pkgdir}/usr" install || return 1 + ./configure + make + make prefix="${pkgdir}/usr" install } diff --git a/extra/keytouch/PKGBUILD b/extra/keytouch/PKGBUILD index 34a5c53a6..bfc3d182f 100644 --- a/extra/keytouch/PKGBUILD +++ b/extra/keytouch/PKGBUILD @@ -1,46 +1,59 @@ -# $Id: PKGBUILD 56013 2009-10-17 20:37:01Z eric $ -# Maintainer: Eric Belanger +# $Id: PKGBUILD 128421 2011-06-23 23:07:34Z eric $ +# Contributor: Eric Bélanger # Contributor: mouse256 & AndyRTR +# Maintainer: Daniel J Griffiths pkgname=keytouch pkgver=2.4.1 -pkgrel=2 +pkgrel=3 pkgdesc="A program which allows you to easily configure the extra function keys of your keyboard" arch=('i686' 'x86_64') url="http://keytouch.sourceforge.net/" license=('GPL') -depends=('libxtst' 'gnome-menus' 'alsa-lib') -makedepends=('pkgconfig') +depends=('libxtst' 'gnome-menus' 'alsa-lib' 'gtk2') +optdepends=('acpid: for ACPI support') options=('!makeflags') install=keytouch.install source=(http://downloads.sourceforge.net/sourceforge/keytouch/${pkgname}-${pkgver}.tar.gz \ keytouch.daemon keytouch.desktop Xsession) -md5sums=('c3a917ae9666c9649d43d9aa09ecc96a' 'a35776aee9361577220f718be81c2b4d'\ - 'c5ffe28988dc74fae812ffe204f8883b' '795430001f4fdb6691d0e93b09a241a9') -sha1sums=('f1f26dc95c21afd404aebe2b1066e75c8313ca80' 'af23f4526cb1f3e5b9a3680af6a24d1566dabb7d'\ - '5bac2f62f1ac26caa32da02a8075dc090d981cfb' '960b2fa51cfdeb2bc3fa7e086dc9f3a3be483dff') +md5sums=('c3a917ae9666c9649d43d9aa09ecc96a' + '5bd72f347f56c0524c7a7c8f44fc9a3a' + 'c5ffe28988dc74fae812ffe204f8883b' + '795430001f4fdb6691d0e93b09a241a9') +sha1sums=('f1f26dc95c21afd404aebe2b1066e75c8313ca80' + '9c3ff4fd979fd0322014768bec132ddf005c7f7b' + '5bac2f62f1ac26caa32da02a8075dc090d981cfb' + '960b2fa51cfdeb2bc3fa7e086dc9f3a3be483dff') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc || return 1 - make || return 1 - install -d "${pkgdir}"/etc/{rc.d,X11/Xsession.d} || return 1 - install -d "${pkgdir}/usr/share/keytouch" || return 1 - make DESTDIR="${pkgdir}" install || return 1 - - cd "${srcdir}/${pkgname}-${pkgver}/keytouch-config" - ./configure --prefix=/usr --sysconfdir=/etc || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 - - cd "${srcdir}/${pkgname}-${pkgver}/keytouch-keyboard" - ./configure --prefix=/usr --sysconfdir=/etc || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 - - install -D -m755 "${srcdir}/keytouch.daemon" "${pkgdir}/etc/rc.d/keytouch" || return 1 - install -D -m644 "${srcdir}/keytouch.desktop" "${pkgdir}/usr/share/applications/keytouch.desktop" || return 1 - install -D -m755 "${srcdir}/Xsession" "${pkgdir}/etc/X11/Xsession" || return 1 - chmod 755 "${pkgdir}"/etc/X11/Xsession.d/* || return 1 + ./configure --prefix=/usr --sysconfdir=/etc + make + + cd keytouch-config + ./configure --prefix=/usr --sysconfdir=/etc + make + + cd ../keytouch-keyboard + ./configure --prefix=/usr --sysconfdir=/etc + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + install -d "${pkgdir}"/etc/{rc.d,X11/Xsession.d} + install -d "${pkgdir}/usr/share/keytouch" + make DESTDIR="${pkgdir}" install + + cd keytouch-config + make DESTDIR="${pkgdir}" install + + cd ../keytouch-keyboard + make DESTDIR="${pkgdir}" install + + install -Dm755 "${srcdir}/keytouch.daemon" "${pkgdir}/etc/rc.d/keytouch" + install -Dm644 "${srcdir}/keytouch.desktop" "${pkgdir}/usr/share/applications/keytouch.desktop" + install -Dm755 "${srcdir}/Xsession" "${pkgdir}/etc/X11/Xsession" + chmod 755 "${pkgdir}"/etc/X11/Xsession.d/* rm "${pkgdir}"/etc/rc.d/*.sh } diff --git a/extra/keytouch/keytouch.daemon b/extra/keytouch/keytouch.daemon index e43bea979..d705b3dfc 100755 --- a/extra/keytouch/keytouch.daemon +++ b/extra/keytouch/keytouch.daemon @@ -7,9 +7,6 @@ PID=$(pidof -o %PPID /usr/bin/keytouch-acpid) case "$1" in start) stat_busy "Starting keyTouch Daemon" - if [ -x /etc/rc.d/acpid ]; then - ck_daemon acpid && /etc/rc.d/acpid start - fi /usr/bin/keytouch-init if [ -z "$PID" ]; then /usr/bin/keytouch-acpid &> /dev/null & diff --git a/extra/metacity/PKGBUILD b/extra/metacity/PKGBUILD index 14e5d12a0..3d028d55b 100644 --- a/extra/metacity/PKGBUILD +++ b/extra/metacity/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 118084 2011-04-05 11:18:53Z ibiru $ +# $Id: PKGBUILD 128306 2011-06-22 17:53:59Z ibiru $ # Maintainer: Jan de Groot pkgname=metacity -pkgver=2.34.0 +pkgver=2.34.1 pkgrel=1 -pkgdesc="A window manager for GNOME2" +pkgdesc="A window manager for GNOME" arch=(i686 x86_64) license=('GPL') depends=('startup-notification' 'gconf' 'zenity' 'libcanberra' 'libgtop' 'libwnck' 'libsm') -makedepends=('intltool' 'pkgconfig' 'gnome-doc-utils' 'gnome-common') +makedepends=('intltool' 'pkgconfig' 'gnome-doc-utils') url="http://www.gnome.org" groups=('gnome') options=('!libtool' '!emptydirs') install=metacity.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('e316beff76658c98e21ddf4e7eaba12cd761b35002dc38701441db6740a6d698') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('f144cb43925ca00d8eaac129a14df3260c54a32324b5cd0a4d78b0fd7ff1028a') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/nx-common/PKGBUILD b/extra/nx-common/PKGBUILD index 85fc78ce6..7ee8cac19 100644 --- a/extra/nx-common/PKGBUILD +++ b/extra/nx-common/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 126698 2011-06-06 18:56:52Z andyrtr $ +# $Id: PKGBUILD 128326 2011-06-22 20:29:20Z andyrtr $ # Maintainer: Tobias Powalowski # Contributed: eliott , Andre Naumann pkgname=nx-common pkgver=3.5.0 -pkgrel=1 +pkgrel=2 pkgdesc="NoMachine NX common package for client and server" arch=('i686' 'x86_64') license=('GPL') @@ -12,14 +12,14 @@ url="http://nomachine.com/" depends=('libjpeg-turbo>=1.1.1' 'libpng>=1.4.5' 'openssl>=1.0.0' 'gcc-libs' 'bash') makedepends=('xorg-server-devel') source=( #Compression libs and proxy sources - http://64.34.161.181/download/$pkgver/sources/nxcomp-$pkgver-1.tar.gz + http://64.34.161.181/download/$pkgver/sources/nxcomp-$pkgver-2.tar.gz http://64.34.161.181/download/$pkgver/sources/nxcompsh-$pkgver-1.tar.gz - http://64.34.161.181/download/$pkgver/sources/nxssh-$pkgver-1.tar.gz + http://64.34.161.181/download/$pkgver/sources/nxssh-$pkgver-2.tar.gz nxcompsh-gcc43.patch) options=(!libtool) -md5sums=('30a182146479004ec63b8a1b9adccfcf' +md5sums=('ad8c0f133122c6d07732ca69c8759410' '84ade443b79ea079380b754aba9d392e' - '9f13262bc0bf5187fcc7e22924955bc7' + 'f52fcdb38e09f8dcfb9ff0344dfbbbd6' 'b6c279654dac421fc3dd1a27d66ff53c') build() { diff --git a/extra/nxserver/PKGBUILD b/extra/nxserver/PKGBUILD index 99b5bc2aa..50177cf29 100644 --- a/extra/nxserver/PKGBUILD +++ b/extra/nxserver/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 126704 2011-06-06 19:21:37Z andyrtr $ +# $Id: PKGBUILD 128331 2011-06-22 20:48:01Z andyrtr $ # Maintainer: Tobias Powalowski # Contributed: eliott , Andre Naumann pkgname=nxserver pkgver=3.5.0 -pkgrel=1 +pkgrel=2 pkgdesc="NoMachine NX is the next-generation X compression and roundtrip suppression scheme." arch=(i686 x86_64) url="http://nomachine.com/" @@ -16,9 +16,9 @@ makedepends=('imake') source=( #X11 support programs and libraries http://64.34.161.181/download/$pkgver/sources/nx-X11-$pkgver-1.tar.gz -http://64.34.161.181/download/$pkgver/sources/nxwin-$pkgver-1.tar.gz +http://64.34.161.181/download/$pkgver/sources/nxwin-$pkgver-2.tar.gz http://64.34.161.181/download/$pkgver/sources/nxauth-$pkgver-1.tar.gz -http://64.34.161.181/download/$pkgver/sources/nxcomp-$pkgver-1.tar.gz # needed to provide NX.h and -LXcomp - part of nx-common +http://64.34.161.181/download/$pkgver/sources/nxcomp-$pkgver-2.tar.gz # needed to provide NX.h and -LXcomp - part of nx-common #X11 Agent sources http://64.34.161.181/download/$pkgver/sources/nxagent-$pkgver-2.tar.gz http://64.34.161.181/download/$pkgver/sources/nxcompsh-$pkgver-1.tar.gz # needed to get X11 built - part of nx-common @@ -30,9 +30,9 @@ http://64.34.161.181/download/$pkgver/sources/nxcompshad-$pkgver-2.tar.gz nxcompsh-gcc43.patch) options=(!libtool) md5sums=('54ac7dd8806928b991b0819cf76b37dd' - '271cef5b5345b8de77b0f6a0ce1a3b0d' + '84c7f1575d9a1506370125ed050514ab' 'cf38ec1e5a5f6453946cd387c14f2684' - '30a182146479004ec63b8a1b9adccfcf' + 'ad8c0f133122c6d07732ca69c8759410' '7b0f60d5a3c54f22da7d81aac055836e' '84ade443b79ea079380b754aba9d392e' '488bb4d9b8e9f82dc272b4e6e9c57d30' diff --git a/extra/paprefs/PKGBUILD b/extra/paprefs/PKGBUILD index a2566b10a..99bf26f3e 100644 --- a/extra/paprefs/PKGBUILD +++ b/extra/paprefs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 101942 2010-12-02 22:07:04Z heftig $ +# $Id: PKGBUILD 128447 2011-06-23 23:50:20Z heftig $ # Maintainer: Jan "heftig" Steffens # Contributor: Corrado Primier # Contributor: William Rea @@ -6,12 +6,12 @@ pkgname=paprefs pkgver=0.9.9 -pkgrel=6 +pkgrel=7 pkgdesc="A simple GTK-based configuration dialog for PulseAudio" arch=(i686 x86_64) url="http://0pointer.de/lennart/projects/paprefs" license=(GPL) -depends=(gconfmm gnome-icon-theme libglademm 'pulseaudio=0.9.22' libsigc++) +depends=(gconfmm gnome-icon-theme libglademm 'pulseaudio=0.9.23' libsigc++) makedepends=(intltool) source=(http://0pointer.de/lennart/projects/paprefs/$pkgname-$pkgver.tar.gz paprefs.desktop) diff --git a/extra/pdksh/PKGBUILD b/extra/pdksh/PKGBUILD index 6f592e39c..388952747 100644 --- a/extra/pdksh/PKGBUILD +++ b/extra/pdksh/PKGBUILD @@ -1,27 +1,31 @@ -# $Id: PKGBUILD 30639 2009-03-21 04:22:46Z eric $ +# $Id: PKGBUILD 128476 2011-06-24 03:30:58Z eric $ # Maintainer: Aaron Griffin # Contributor: Tom Newsom pkgname=pdksh pkgver=5.2.14 -pkgrel=5 +pkgrel=6 pkgdesc="A public domain clone of the AT&T Korn shell" arch=('i686' 'x86_64') url="http://www.cs.mun.ca/~michael/pdksh/" license=('custom') depends=('glibc') -install=$pkgname.install -source=(ftp://ftp.cs.mun.ca/pub/$pkgname/$pkgname-$pkgver.tar.gz $pkgname-$pkgver.patch usr_ksh.sh) +install=pdksh.install +#ftp://ftp.cs.mun.ca/pub/$pkgname/$pkgname-$pkgver.tar.gz +source=(http://www.cs.mun.ca/~michael/pdksh/files/$pkgname-$pkgver.tar.gz pdksh-5.2.14.patch usr_ksh.sh) md5sums=('871106b3bd937e1afba9f2ef7c43aef3' 'f11d1e711627d21a547c09e344e30dd3'\ '56084a657ecafd5dd0813a6056036712') build() { - cd $srcdir/$pkgname-$pkgver - patch -Np1 -i ../$pkgname-$pkgver.patch || return 1 - ./configure --prefix=/ --mandir=/usr/share/man || return 1 - make || return 1 - make prefix=$pkgdir mandir=$pkgdir/usr/share/man/man1 install || return 1 - install -D -m 755 ${srcdir}/usr_ksh.sh ${pkgdir}/usr/bin/ksh || return 1 - install -D -m644 LEGAL $pkgdir/usr/share/licenses/$pkgname/LICENSE || return 1 + cd "$srcdir/$pkgname-$pkgver" + patch -Np1 -i ../$pkgname-$pkgver.patch + ./configure --prefix=/ --mandir=/usr/share/man + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make prefix="$pkgdir" mandir="$pkgdir/usr/share/man/man1" install + install -D -m 755 "${srcdir}/usr_ksh.sh" "${pkgdir}/usr/bin/ksh" + install -D -m644 LEGAL "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } -# vim: ts=2 sw=2 et ft=sh diff --git a/extra/pdksh/pdksh.install b/extra/pdksh/pdksh.install index 844a4e731..17463a17e 100644 --- a/extra/pdksh/pdksh.install +++ b/extra/pdksh/pdksh.install @@ -1,5 +1,5 @@ post_install() { - if [ ! "`grep /bin/ksh etc/shells`" ]; then + if [ ! "$(grep /bin/ksh etc/shells)" ]; then echo "updating /etc/shells... done." sed -i "s|/bin/bash|/bin/bash\n/bin/ksh|" etc/shells else diff --git a/extra/pulseaudio/PKGBUILD b/extra/pulseaudio/PKGBUILD index 9d8c6945e..d62fd9ca7 100644 --- a/extra/pulseaudio/PKGBUILD +++ b/extra/pulseaudio/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 103255 2010-12-17 00:02:37Z heftig $ +# $Id: PKGBUILD 128442 2011-06-23 23:49:30Z heftig $ # Maintainer: Jan "heftig" Steffens # Contributor: Daniel J Griffiths # Contributor: Corrado Primier @@ -6,18 +6,18 @@ pkgbase=pulseaudio pkgname=(pulseaudio libpulse) -pkgver=0.9.22 -pkgrel=2 +pkgver=0.9.23 +pkgrel=1 arch=(i686 x86_64) url="http://pulseaudio.org/" license=(GPL LGPL) -makedepends=(libasyncns libcap attr libxtst libsm tcp_wrappers libsndfile - libtool rtkit speex libsamplerate tdb udev dbus-core xcb-util - avahi bluez gconf intltool jack lirc-utils pkgconfig openssl) +makedepends=(libasyncns libcap attr libxtst libsm libsndfile libtool rtkit + speex libsamplerate tdb udev dbus-core xcb-util avahi bluez + gconf intltool jack lirc-utils openssl) options=(!emptydirs !libtool !makeflags) -source=("http://0pointer.de/lennart/projects/$pkgbase/$pkgbase-$pkgver.tar.gz" +source=("http://freedesktop.org/software/$pkgbase/releases/$pkgbase-$pkgver.tar.gz" $pkgbase.xinit) -md5sums=('ca85ab470669b05e100861654cf5eb3c' +md5sums=('7391205a337d1e04a9ff38025f684034' 'eb1cfae28eb2e4d3fdbe45a90e4318ab') build() { @@ -32,6 +32,7 @@ build() { --localstatedir=/var \ --with-database=tdb \ --disable-hal \ + --disable-tcpwrap \ --disable-rpath \ --disable-default-build-tests @@ -53,7 +54,7 @@ package_pulseaudio() { cd "$srcdir/$pkgbase-$pkgver" make DESTDIR="$pkgdir" install - # Lower resample quality + # Lower resample quality, saves CPU sed -e '/resample-method/iresample-method=speex-float-0' \ -i "$pkgdir/etc/pulse/daemon.conf" @@ -63,7 +64,7 @@ package_pulseaudio() { -i "$pkgdir/usr/bin/start-$pkgbase-x11" # Make module-console-kit optional - sed -e $'/module-console-kit/{i.nofail\n;a.fail\n;}' \ + sed -e $'/load-module module-console-kit/{i.nofail\n;a.fail\n;}' \ -i "$pkgdir/etc/pulse/default.pa" install -Dm755 "$srcdir/$pkgbase.xinit" "$pkgdir/etc/X11/xinit/xinitrc.d/$pkgbase" @@ -89,8 +90,7 @@ package_pulseaudio() { package_libpulse() { pkgdesc="A featureful, general-purpose sound server (client library)" - depends=(tcp_wrappers dbus-core xcb-util libasyncns libcap libxtst libsm - libsndfile) + depends=(dbus-core xcb-util libasyncns libcap libxtst libsm libsndfile) optdepends=('alsa-plugins: ALSA support' 'avahi: zeroconf support') backup=(etc/pulse/client.conf) diff --git a/extra/pulseaudio/pulseaudio.install b/extra/pulseaudio/pulseaudio.install index 67a346759..fd7db3b36 100755 --- a/extra/pulseaudio/pulseaudio.install +++ b/extra/pulseaudio/pulseaudio.install @@ -4,9 +4,6 @@ post_install() { on configuring your system for PulseAudio. >>> Make sure to install pulseaudio-alsa to configure ALSA for PulseAudio. - ->>> You might want to blacklist the "snd-pcm-oss" module in /etc/rc.conf to - keep ALSA's OSS emulation from interfering with ALSA or PulseAudio. MES } diff --git a/extra/terminal/PKGBUILD b/extra/terminal/PKGBUILD index 8df14db89..44383a3e1 100644 --- a/extra/terminal/PKGBUILD +++ b/extra/terminal/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 123714 2011-05-12 17:42:28Z foutrelis $ +# $Id: PKGBUILD 128296 2011-06-22 15:43:57Z andyrtr $ # Maintainer: AndyRTR # Contributor: tobias # Contributor: Aurelien Foret pkgname=terminal -pkgver=0.4.7 -pkgrel=2 +pkgver=0.4.8 +pkgrel=1 pkgdesc="A modern terminal emulator primarly for the Xfce desktop environment" arch=(i686 x86_64) license=('GPL2') @@ -16,18 +16,11 @@ depends=('exo>=0.5.4' "vte" 'dbus-glib' makedepends=('pkgconfig' 'intltool') options=('!libtool') install=terminal.install -source=(http://archive.xfce.org/src/apps/${pkgname}/0.4/Terminal-${pkgver}.tar.bz2 - bug-7595-go-menu-single-tab-sensitivity.patch) -md5sums=('34daa0090e1bc9014a5b9849103a129f' - '043774c11e2f8c1c424510847dc82fae') +source=(http://archive.xfce.org/src/apps/${pkgname}/0.4/Terminal-${pkgver}.tar.bz2) +md5sums=('8dff62234da14e1a5e542fb56560ebe2') build() { cd ${srcdir}/Terminal-${pkgver} - - # Add upstream patch for Xfce bug #7595 - # (Only make go menu action sensitive if tabs) - patch -Np1 -i ${srcdir}/bug-7595-go-menu-single-tab-sensitivity.patch - ./configure --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib/xfce4 \ diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD index ecdad6626..95361e280 100644 --- a/extra/vlc/PKGBUILD +++ b/extra/vlc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 126993 2011-06-09 15:41:16Z giovanni $ +# $Id: PKGBUILD 127816 2011-06-18 16:12:17Z ibiru $ # Maintainer: Giovanni Scafora # Contributor: Sarah Hay # Contributor: Martin Sandsmark pkgname=vlc pkgver=1.1.10 -pkgrel=2 +pkgrel=4 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" arch=('i686' 'x86_64') url="http://www.videolan.org/vlc/" diff --git a/extra/x264/PKGBUILD b/extra/x264/PKGBUILD index a0aacc6ea..90508716e 100644 --- a/extra/x264/PKGBUILD +++ b/extra/x264/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 117096 2011-03-28 18:20:15Z ibiru $ +# $Id: PKGBUILD 127804 2011-06-18 16:05:03Z ibiru $ # Maintainer : Ionut Biru # Contributor: damir # Contributor: Paul Mattal pkgname=x264 -pkgver=20110327 +pkgver=20110617 pkgrel=1 pkgdesc="free library for encoding H264/AVC video streams" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ license=('GPL') depends=('glibc') makedepends=('yasm') source=(ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-$pkgver-2245.tar.bz2) -md5sums=('7579aff8166a974a1b293cd18b9ead92') +md5sums=('928717aa2f0c7ca91e589d6b60e688f1') build() { cd "$srcdir/$pkgname-snapshot-$pkgver-2245" diff --git a/extra/xfce4-panel/PKGBUILD b/extra/xfce4-panel/PKGBUILD index 3e942a3c1..f0096c1b1 100644 --- a/extra/xfce4-panel/PKGBUILD +++ b/extra/xfce4-panel/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 127913 2011-06-19 20:00:47Z andyrtr $ +# $Id: PKGBUILD 128301 2011-06-22 15:48:28Z andyrtr $ # Maintainer: AndyRTR # Contributor: tobias pkgname=xfce4-panel -pkgver=4.8.4 +pkgver=4.8.5 pkgrel=1 pkgdesc="Panel for the Xfce desktop environment" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ makedepends=('intltool' 'gtk-doc') options=('!libtool') install=${pkgname}.install source=(http://archive.xfce.org/src/xfce/${pkgname}/4.8/${pkgname}-${pkgver}.tar.bz2) -md5sums=('44f06660226723fdd8de3ad59d648546') +md5sums=('3c00e92821709baa2a71b166a32d46a2') build() { cd ${srcdir}/${pkgname}-${pkgver} -- cgit v1.2.3-54-g00ecf From 8999fa1750304fb2367fb7743e49e013405e88be Mon Sep 17 00:00:00 2001 From: root Date: Sat, 25 Jun 2011 23:07:08 +0000 Subject: Sat Jun 25 23:07:08 UTC 2011 --- community/calibre/PKGBUILD | 6 ++-- community/cgit/PKGBUILD | 12 +++----- community/fotoxx/PKGBUILD | 4 +-- community/pcsclite/PKGBUILD | 8 +++--- community/qtcreator/PKGBUILD | 28 +++++++++++------- community/scrotwm/PKGBUILD | 9 +++++- extra/catdoc/PKGBUILD | 19 +++++++------ extra/fortune-mod/PKGBUILD | 34 ++++++++++++---------- extra/gimp-dbp/PKGBUILD | 29 +++++++++---------- extra/gnutls/PKGBUILD | 6 ++-- extra/grantlee/PKGBUILD | 12 ++++---- extra/hexedit/PKGBUILD | 8 ++++-- extra/pidgin/PKGBUILD | 6 ++-- extra/x2x/PKGBUILD | 28 +++++++++++------- libre/libretools/PKGBUILD | 11 ++++--- libre/libretools/libretools.install | 5 ++-- multilib/wine/PKGBUILD | 6 ++-- testing/dbus-core/PKGBUILD | 57 +++++++++++++++++++++++++++++++++++++ testing/dbus-core/dbus | 57 +++++++++++++++++++++++++++++++++++++ testing/dbus-core/dbus.install | 24 ++++++++++++++++ testing/dbus-glib/PKGBUILD | 27 ++++++++++++++++++ testing/dbus-python/PKGBUILD | 26 +++++++++++++++++ testing/dbus/30-dbus | 9 ++++++ testing/dbus/PKGBUILD | 41 ++++++++++++++++++++++++++ testing/libreoffice/PKGBUILD | 44 ++++++++++++++-------------- testing/pidgin/PKGBUILD | 8 +++--- testing/psmisc/PKGBUILD | 26 +++++++++++++++++ 27 files changed, 424 insertions(+), 126 deletions(-) create mode 100644 testing/dbus-core/PKGBUILD create mode 100644 testing/dbus-core/dbus create mode 100644 testing/dbus-core/dbus.install create mode 100644 testing/dbus-glib/PKGBUILD create mode 100644 testing/dbus-python/PKGBUILD create mode 100644 testing/dbus/30-dbus create mode 100644 testing/dbus/PKGBUILD create mode 100644 testing/psmisc/PKGBUILD (limited to 'extra') diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD index cb05d8e31..49bc53644 100644 --- a/community/calibre/PKGBUILD +++ b/community/calibre/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 49493 2011-06-17 22:21:07Z giovanni $ +# $Id: PKGBUILD 50108 2011-06-24 19:28:04Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Petrov Roman # Contributor: Andrea Fagiani pkgname=calibre -pkgver=0.8.6 +pkgver=0.8.7 pkgrel=1 pkgdesc="Ebook management application" arch=('i686' 'x86_64') @@ -20,7 +20,7 @@ optdepends=('ipython: to use calibre-debug') install=calibre.install source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz desktop_integration.patch) -md5sums=('859d856bdcbd12189ffb91c581928ed9' +md5sums=('d7132ec75f5e742e04e196fc8e2c0884' '253ce4fe5d01f8ff76b63cd3825755ea') build() { diff --git a/community/cgit/PKGBUILD b/community/cgit/PKGBUILD index 503cac629..c09ef110a 100644 --- a/community/cgit/PKGBUILD +++ b/community/cgit/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 43711 2011-03-29 10:19:12Z spupykin $ +# $Id: PKGBUILD 50113 2011-06-24 20:01:46Z spupykin $ # Maintainer: Sergej Pupykin # Current Maintainer: Patrick Palka # Previous Maintainer: Loui Chang @@ -6,8 +6,8 @@ # Development: http://closure.ath.cx/aur-dev pkgname=cgit -pkgver=0.9 -pkgrel=2 +pkgver=0.9.0.1 +pkgrel=1 pkgdesc="A web interface for git written in plain C" arch=('i686' 'x86_64') url="http://hjemli.net/git/cgit" @@ -16,11 +16,10 @@ depends=('openssl') makedepends=('git' 'zlib' 'curl' 'asciidoc') install=cgit.install source=("http://hjemli.net/git/cgit/snapshot/$pkgname-$pkgver.tar.bz2") -md5sums=('b55f953c5c8a418bca72b3de3c297270') +md5sums=('dddae5bcfc1eeb469fc2b95531a75c1c') build() { cd "$pkgname-$pkgver" - make get-git make make doc-man @@ -28,10 +27,7 @@ build() { package() { cd "$pkgname-$pkgver" - make CGIT_SCRIPT_PATH=/srv/http/cgit DESTDIR="$pkgdir" install install-man install -vDm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" install -vd "$pkgdir/var/cache/$pkgname" } - -md5sums=('b55f953c5c8a418bca72b3de3c297270') diff --git a/community/fotoxx/PKGBUILD b/community/fotoxx/PKGBUILD index d243c8c33..fb8242bad 100644 --- a/community/fotoxx/PKGBUILD +++ b/community/fotoxx/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Stefan Husmann pkgname=fotoxx -pkgver=11.06.1 +pkgver=11.06.2 pkgrel=1 pkgdesc="A program for improving image files made with a digital camera" url="http://kornelix.squarespace.com/fotoxx" @@ -9,7 +9,7 @@ license=('GPL3') depends=('gimp-ufraw' 'perl-exiftool' 'xdg-utils' 'desktop-file-utils') optdepends=('mashup: for composing pages to print from within fotoxx' 'brasero: for burning') source=("http://kornelix.squarespace.com/storage/downloads/$pkgname-$pkgver.tar.gz") -md5sums=('d485750bd0d808e5df41bddeae8de00c') +md5sums=('03fac30ee3239f379d5a9fcdc8ba3933') install=fotoxx.install build() { diff --git a/community/pcsclite/PKGBUILD b/community/pcsclite/PKGBUILD index 55008944c..7e222b301 100644 --- a/community/pcsclite/PKGBUILD +++ b/community/pcsclite/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 49923 2011-06-22 14:26:41Z giovanni $ +# $Id: PKGBUILD 50103 2011-06-24 19:11:00Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Daniel Plaza pkgname=pcsclite -pkgver=1.7.3 +pkgver=1.7.4 pkgrel=1 pkgdesc="PC/SC Architecture smartcard middleware library" arch=('i686' 'x86_64') @@ -12,9 +12,9 @@ license=('BSD') depends=('udev') makedepends=('pkgconfig') options=('!libtool' '!docs') -source=(https://alioth.debian.org/frs/download.php/3591/pcsc-lite-${pkgver}.tar.bz2 +source=(https://alioth.debian.org/frs/download.php/3598/pcsc-lite-${pkgver}.tar.bz2 pcscd) -md5sums=('0dfc1639e4020fb3c04ab37425abbb12' +md5sums=('1caf0b8ca2ecbf82fe3b035b3fff22dd' '80d90388e4d2a551cb7aefe3bd5147bd') build() { diff --git a/community/qtcreator/PKGBUILD b/community/qtcreator/PKGBUILD index 6e3619898..866bff343 100644 --- a/community/qtcreator/PKGBUILD +++ b/community/qtcreator/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 49861 2011-06-21 12:55:45Z svenstaro $ +# $Id: PKGBUILD 50079 2011-06-24 08:49:19Z svenstaro $ # Maintainer: Imanol Celaya # Maintainer: Sven-Hendrik Haase # Contributor: Lukas Jirkovsky @@ -11,34 +11,33 @@ pkgbase=qtcreator #pkgname=('qtcreator' 'qtcreator-todo-plugin' 'qtcreator-artisticstyle-plugin') pkgname=('qtcreator' 'qtcreator-todo-plugin') pkgver=2.2.1 -pkgrel=1 +pkgrel=2 pkgdesc='Lightweight, cross-platform integrated development environment' arch=('i686' 'x86_64') url='http://qt.nokia.com/products/developer-tools' license=('LGPL') depends=('qt>=4.7.3') -makedepends=('qt-private-headers>=4.7.3') +makedepends=('qt-private-headers>=4.7.3' 'git') options=('docs') source=("http://get.qt.nokia.com/qtcreator/qt-creator-${pkgver}-src.tar.gz" 'http://download.berlios.de/astyleplugin/ArtisticStylePlugin-0.6-src.zip' - "https://gitorious.org/qt-creator-todo-plugin/qt-creator-todo-plugin/archive-tarball/88f8fc50" 'qtcreator.desktop') md5sums=('35d74837e48b12ee58379e1c029a9a6c' '4dab1bb07ba5c39ae4c975a333d32ec1' - '734a6f375e595de796f9802087845dfe' '2c3ffbd66845b37be9804f2966815a10') build() { cd ${srcdir} - mkdir build - cd build + [[ -d build ]] && rm -r build + mkdir build && cd build qmake ${srcdir}/qt-creator-${pkgver}-src/qtcreator.pro make --quiet # Building TODO plugin + git clone git://gitorious.org/qt-creator-todo-plugin/qt-creator-todo-plugin.git $srcdir/qt-creator-todo-plugin msg "Starting TODO plugin build...." - cd $srcdir/qt-creator-todo-plugin-qt-creator-todo-plugin + cd $srcdir/qt-creator-todo-plugin sed -i "s|QTC_BUILD_DIR = .*|QTC_BUILD_DIR = ${srcdir}/build|g" todoplugin.pro sed -i "s|QTC_SOURCE_DIR = .*|QTC_SOURCE_DIR = $srcdir/qt-creator-${pkgver}-src/|g" todoplugin.pro sed -i "s|\"2.1.81\"|\"${pkgver}\"|g" todo.pluginspec @@ -66,12 +65,21 @@ package_qtcreator() { # qt already fixed this if [[ -f "$pkgdir/usr/bin/qmlpuppet" ]]; then - echo "Remove this manual install as it is now unnecessary (probably qtcreator 2.2.1)" + echo "Remove this manual install as it is now unnecessary (probably qtcreator 2.3.0)" return 1 fi install -Dm755 bin/qmlpuppet "$pkgdir/usr/bin/qmlpuppet" # remove it soon + # qt already fixed this as well + if [[ -f "$pkgdir/usr/lib/qmldesigner/libqtquickplugin.so" ]]; then + echo "Remove this manual install as it is now unnecessary (probably qtcreator 2.3.0)" + return 1 + fi + mkdir "$pkgdir/usr/lib/qmldesigner" + cp lib/qmldesigner/*.so "$pkgdir/usr/lib/qmldesigner/" + # remove it soon + install -Dm644 ${srcdir}/qtcreator.desktop \ ${pkgdir}/usr/share/applications/qtcreator.desktop install -Dm644 ${srcdir}/qt-creator-${pkgver}-src/LGPL_EXCEPTION.TXT \ @@ -88,7 +96,7 @@ package_qtcreator-todo-plugin() { install -Dm644 ${srcdir}/qt-creator-${pkgver}-src/LGPL_EXCEPTION.TXT \ o-plugin' - cd $srcdir/qt-creator-todo-plugin-qt-creator-todo-plugin + cd $srcdir/qt-creator-todo-plugin make INSTALL_ROOT=$pkgdir/usr/ install install -Dm644 LICENSE.BSD \ diff --git a/community/scrotwm/PKGBUILD b/community/scrotwm/PKGBUILD index 3d1d7b6cc..cd6c2363a 100644 --- a/community/scrotwm/PKGBUILD +++ b/community/scrotwm/PKGBUILD @@ -3,7 +3,7 @@ pkgname=scrotwm pkgver=0.9.32 -pkgrel=1 +pkgrel=2 pkgdesc="A minimalistic dynamic tiling window manager that tries to stay out of the way." arch=('i686' 'x86_64') url="http://www.scrotwm.org" @@ -45,4 +45,11 @@ package() { ln -s /usr/lib/libswmhack.so.0.0 "$pkgdir/usr/lib/libswmhack.so.0" ln -s /usr/lib/libswmhack.so.0.0 "$pkgdir/usr/lib/libswmhack.so" + + # fix this for real in the makefile + mkdir -p "$pkgdir"/usr/share/man/{es,it,pt,ru}/man1/ + mv "$pkgdir/usr/share/man/man1/scrotwm_es.1" "$pkgdir/usr/share/man/es/man1/" + mv "$pkgdir/usr/share/man/man1/scrotwm_it.1" "$pkgdir/usr/share/man/it/man1/" + mv "$pkgdir/usr/share/man/man1/scrotwm_pt.1" "$pkgdir/usr/share/man/pt/man1/" + mv "$pkgdir/usr/share/man/man1/scrotwm_ru.1" "$pkgdir/usr/share/man/ru/man1/" } diff --git a/extra/catdoc/PKGBUILD b/extra/catdoc/PKGBUILD index 2b46013c6..cf8523bff 100644 --- a/extra/catdoc/PKGBUILD +++ b/extra/catdoc/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 31735 2009-03-28 03:50:45Z eric $ +# $Id: PKGBUILD 128489 2011-06-24 04:50:44Z eric $ # Maintainer: Juergen Hoetzel # Contributor: Paulius Palevicius pkgname=catdoc pkgver=0.94.2 -pkgrel=2 +pkgrel=3 pkgdesc="A convertor for Microsoft Word, Excel, PowerPoint and RTF Files to text" -arch=(i686 x86_64) +arch=('i686' 'x86_64') url="http://www.wagner.pp.ru/~vitus/software/catdoc/" license=('GPL') depends=('glibc') @@ -16,9 +16,12 @@ source=(http://ftp.wagner.pp.ru/pub/catdoc/$pkgname-$pkgver.tar.gz) md5sums=('243e1680bb3e703616f5adecfee24491') build() { - cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --with-wish=/usr/bin/wish || return 1 - make || return 1 - make installroot=$pkgdir mandir=/usr/share/man/man1 install || return 1 + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr --with-wish=/usr/bin/wish + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make installroot="$pkgdir" mandir=/usr/share/man/man1 install } -# vim: ts=2 sw=2 et ft=sh diff --git a/extra/fortune-mod/PKGBUILD b/extra/fortune-mod/PKGBUILD index 0737c5ab2..9cc9b6ac7 100644 --- a/extra/fortune-mod/PKGBUILD +++ b/extra/fortune-mod/PKGBUILD @@ -1,32 +1,36 @@ -# $Id: PKGBUILD 30775 2009-03-21 22:49:21Z eric $ +# $Id: PKGBUILD 128484 2011-06-24 04:37:24Z eric $ # Maintainer: Kevin Piche # Contributor: Dale Blount pkgname=fortune-mod pkgver=1.99.1 -pkgrel=4 +pkgrel=5 pkgdesc="The Fortune Cookie Program from BSD games" arch=('i686' 'x86_64') url="http://www.redellipse.net/code/fortune" license=('BSD') depends=('recode') source=(ftp://ftp.archlinux.org/other/fortune-mod/$pkgname-$pkgver.tar.gz LICENSE 01_all_fortune_all-fix.patch) -md5sums=('f208805b3b712e32997d7667e0ec52d8' '0217481ae93971296cfb7872157cabb7'\ +md5sums=('f208805b3b712e32997d7667e0ec52d8' + '0217481ae93971296cfb7872157cabb7' 'e85b073f16dc6f0e8f0ed90044797aa3') build() { - cd $srcdir/$pkgname-$pkgver - patch -p0 < ../01_all_fortune_all-fix.patch || return 1 + cd "$srcdir/$pkgname-$pkgver" + patch -p0 < ../01_all_fortune_all-fix.patch make REGEXDEFS='-DHAVE_REGEX_H -DPOSIX_REGEX -DHAVE_STDBOOL' \ COOKIEDIR=/usr/share/fortune \ - LOCALDIR=/usr/local/share/fortune || return 1 - make COOKIEDIR=/usr/share/fortune fortune/fortune.man || return 1 - make FORTDIR=$pkgdir/usr/bin \ - COOKIEDIR=$pkgdir/usr/share/fortune \ - BINDIR=$pkgdir/usr/sbin \ - BINMANDIR=$pkgdir/usr/share/man/man1 \ - FORTMANDIR=$pkgdir/usr/share/man/man6 install || return 1 - rm $pkgdir/usr/share/fortune/*.u8 - rm $pkgdir/usr/share/fortune/off/*.u8 - install -D -m644 ../LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE + LOCALDIR=/usr/local/share/fortune all fortune/fortune.man +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make FORTDIR="$pkgdir"/usr/bin \ + COOKIEDIR="$pkgdir"/usr/share/fortune \ + BINDIR="$pkgdir"/usr/sbin \ + BINMANDIR="$pkgdir"/usr/share/man/man1 \ + FORTMANDIR="$pkgdir"/usr/share/man/man6 install + rm "$pkgdir"/usr/share/fortune/*.u8 + rm "$pkgdir"/usr/share/fortune/off/*.u8 + install -D -m644 ../LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE } diff --git a/extra/gimp-dbp/PKGBUILD b/extra/gimp-dbp/PKGBUILD index 9cec2e706..f09db2f20 100644 --- a/extra/gimp-dbp/PKGBUILD +++ b/extra/gimp-dbp/PKGBUILD @@ -1,26 +1,25 @@ -# $Id: PKGBUILD 37038 2009-04-30 05:11:53Z eric $ +# $Id: PKGBUILD 128499 2011-06-24 05:56:11Z eric $ # Maintainer: tobias # Contributor: Tobias Kieslich pkgname=gimp-dbp -_srcname=dbp pkgver=1.1.9 -pkgrel=1 +pkgrel=2 pkgdesc="David's batch processor for the GIMP" -arch=(i686 x86_64) -license=('GPL') -depends=('gimp>=2.4') +arch=('i686' 'x86_64') url="http://members.ozemail.com.au/~hodsond/dbp.html" -source=(http://www.ozemail.com.au/~hodsond/${_srcname}Src-${pkgver//./-}.tgz) +license=('GPL') +depends=('gimp') +source=(http://www.ozemail.com.au/~hodsond/dbpSrc-${pkgver//./-}.tgz) md5sums=('1106625707798ab8ea1317ac6bece1c5') build() { - cd ${srcdir}/${_srcname}-${pkgver} - # Tweak Makefile -- remove auto-install - sed -i 's|^\tgimptool.*$||' Makefile || return 1 - sed -i "s|||" op.h || return 1 - #sed -i '/DISABLE_DEPRECATED/d' Makefile - # create gimp-2.0 plugin and install it - make ${_srcname} || return 1 - install -Dsm755 ${_srcname} ${pkgdir}/usr/lib/gimp/2.0/plug-ins/${_srcname} || return 1 + cd "${srcdir}/dbp-${pkgver}" + sed -i "s|||" op.h + make +} + +package() { + cd "${srcdir}/dbp-${pkgver}" + install -D -m755 dbp "${pkgdir}/usr/lib/gimp/2.0/plug-ins/dbp" } diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD index 9ade982c2..1e814b88a 100644 --- a/extra/gnutls/PKGBUILD +++ b/extra/gnutls/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 126447 2011-06-05 13:11:49Z andyrtr $ +# $Id: PKGBUILD 128504 2011-06-24 07:05:04Z andyrtr $ # Maintainer: Jan de Groot pkgname=gnutls -pkgver=2.12.6.1 +pkgver=2.12.7 pkgrel=1 pkgdesc="A library which provides a secure layer over a reliable transport layer" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ install=gnutls.install options=('!libtool' '!zipman') depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'libgcrypt') source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.bz2) -md5sums=('e724e37f96984f3b0a215c11f03729bd') +md5sums=(4b48aa3119f549d30d550bf4162c721b'') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/grantlee/PKGBUILD b/extra/grantlee/PKGBUILD index fb95cc7b9..339906704 100644 --- a/extra/grantlee/PKGBUILD +++ b/extra/grantlee/PKGBUILD @@ -1,8 +1,8 @@ -# $Id$ +# $Id: PKGBUILD 128623 2011-06-24 16:39:02Z andrea $ # Maintainer: Andrea Scarpino pkgname=grantlee -pkgver=0.1.8 +pkgver=0.1.9 pkgrel=1 pkgdesc="A string template engine based on the Django template system and written in Qt" arch=('i686' 'x86_64') @@ -11,10 +11,10 @@ license=('LGPL3') depends=('qt') makedepends=('cmake') source=("http://downloads.grantlee.org/${pkgname}-${pkgver}.tar.gz") -md5sums=('67c24d9eb6be66997ac5d0803bde06de') +md5sums=('3d93b5312814ebee373fba5509d88bdb') build() { - cd ${srcdir} + cd "${srcdir}" mkdir build cd build cmake ../${pkgname}-${pkgver} \ @@ -24,6 +24,6 @@ build() { } package() { - cd ${srcdir}/build - make DESTDIR=${pkgdir} install + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install } diff --git a/extra/hexedit/PKGBUILD b/extra/hexedit/PKGBUILD index cbf963d64..bc2a5bfd0 100644 --- a/extra/hexedit/PKGBUILD +++ b/extra/hexedit/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 128432 2011-06-23 23:29:54Z dan $ +# $Id: PKGBUILD 128628 2011-06-24 17:38:13Z ibiru $ # Maintainer: Giovanni Scafora # Contributor: Paul Mattal pkgname=hexedit pkgver=1.2.12 -pkgrel=3 +pkgrel=4 pkgdesc="Hex Editor for Linux" arch=('i686' 'x86_64') url="http://merd.net/pixel/hexedit.html" @@ -19,5 +19,9 @@ build() { ./configure make +} + +package() { + cd "${srcdir}/${pkgname}" make prefix="${pkgdir}/usr" install } diff --git a/extra/pidgin/PKGBUILD b/extra/pidgin/PKGBUILD index d7930f9f7..0d939ffd2 100644 --- a/extra/pidgin/PKGBUILD +++ b/extra/pidgin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 126832 2011-06-07 15:43:55Z foutrelis $ +# $Id: PKGBUILD 128509 2011-06-24 07:30:26Z foutrelis $ # Maintainer: Evangelos Foutras # Contributor: Ionut Biru # Contributor: Andrea Scarpino @@ -6,7 +6,7 @@ # Contributor: Lucien Immink pkgname=('pidgin' 'libpurple' 'finch') -pkgver=2.8.0 +pkgver=2.9.0 pkgrel=1 arch=('i686' 'x86_64') url="http://pidgin.im/" @@ -18,7 +18,7 @@ makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm' options=('!libtool') source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2 nm09-more.patch) -md5sums=('d1656c443a5d91f4aa0d95915f1f50c3' +md5sums=('2cd285c7a40f93b7a51bfe733971d3a6' 'a673659d86c7a65aa710f7c8c7feda82') build() { diff --git a/extra/x2x/PKGBUILD b/extra/x2x/PKGBUILD index bccbba6a4..8389e2ef8 100644 --- a/extra/x2x/PKGBUILD +++ b/extra/x2x/PKGBUILD @@ -1,23 +1,29 @@ -# $Id: PKGBUILD 36334 2009-04-21 02:04:21Z eric $ +# $Id: PKGBUILD 128494 2011-06-24 05:31:20Z eric $ # Maintainer: dorphell # Contributor: Judd Vinet + pkgname=x2x pkgver=1.27 -pkgrel=5 +pkgrel=6 pkgdesc="Control one X display from another" -arch=(i686 x86_64) -url="http://x2x.dottedmag.net/" +arch=('i686' 'x86_64') +url="https://github.com/dottedmag/x2x" license=('custom') depends=('libxtst') makedepends=('imake') -source=(http://x2x.dottedmag.net/releases/$pkgname-$pkgver.tar.gz LICENSE) -md5sums=('3d1bc863f3209ec37caf7f57bde7e8f0' '7ebc35f66a8ded9b8d8d7ca4131c7ae8') +source=(https://github.com/downloads/dottedmag/x2x/$pkgname-$pkgver.tar.gz LICENSE) +md5sums=('3d1bc863f3209ec37caf7f57bde7e8f0' + '7ebc35f66a8ded9b8d8d7ca4131c7ae8') build() { - cd $srcdir/$pkgname-$pkgver + cd "$srcdir/$pkgname-$pkgver" mv x2x.1 x2x.man - xmkmf || return 1 - make || return 1 - make DESTDIR=$pkgdir MANPATH=/usr/share/man install install.man || return 1 - install -D -m644 ../LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + xmkmf + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" MANPATH=/usr/share/man install install.man + install -D -m644 ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD index 7f859fa3f..a7024228a 100644 --- a/libre/libretools/PKGBUILD +++ b/libre/libretools/PKGBUILD @@ -23,7 +23,7 @@ build() { ## Git checkout if [ -d $srcdir/${_gitname} ] ; then msg "Git checkout: Updating existing tree" - cd ${_gitname} && git pull origin + cd ${_gitname} && git pull ${_gitroot} msg "Git checkout: Tree has been updated" else msg "Git checkout: Retrieving sources" @@ -34,12 +34,14 @@ build() { } package() { - install -d ${pkgdir}/usr/bin - install -d ${pkgdir}/usr/sbin - install -d ${pkgdir}/etc + install -d ${pkgdir}/etc install -m644 ${_gitname}/libretools.conf ${pkgdir}/etc/ + install -d ${pkgdir}/etc/libretools.d + install -m644 ${_gitname}/cleansystem ${pkgdir}/etc/libretools.d + + install -d ${pkgdir}/usr/bin install -m755 ${_gitname}/abslibre-commit ${pkgdir}/usr/bin install -m755 ${_gitname}/add-mips64el ${pkgdir}/usr/bin install -m755 ${_gitname}/aur ${pkgdir}/usr/bin @@ -59,6 +61,7 @@ package() { install -m755 ${_gitname}/toru ${pkgdir}/usr/bin install -m755 ${_gitname}/updateabslibre ${pkgdir}/usr/bin + install -d ${pkgdir}/usr/sbin install -m755 ${_gitname}/libremakepkg ${pkgdir}/usr/sbin/ } \ No newline at end of file diff --git a/libre/libretools/libretools.install b/libre/libretools/libretools.install index 8eea37689..f8f447e2f 100644 --- a/libre/libretools/libretools.install +++ b/libre/libretools/libretools.install @@ -1,4 +1,3 @@ - # arg 1: the new package version post_install() { cat < # Contributor: Jan "heftig" Steffens # Contributor: Eduardo Romero # Contributor: Giovanni Scafora pkgname=wine -pkgver=1.3.22 +pkgver=1.3.23 pkgrel=1 _pkgbasever=${pkgver/rc/-rc} source=(http://ibiblio.org/pub/linux/system/emulators/$pkgname/$pkgname-$_pkgbasever.tar.bz2) -md5sums=('46f313013644d31ad37b8fc5c2c16467') +md5sums=('71f05bf37c25648f8dbc793dda3da45c') pkgdesc="A compatibility layer for running Windows programs" url="http://www.winehq.com" diff --git a/testing/dbus-core/PKGBUILD b/testing/dbus-core/PKGBUILD new file mode 100644 index 000000000..360802755 --- /dev/null +++ b/testing/dbus-core/PKGBUILD @@ -0,0 +1,57 @@ +# $Id: PKGBUILD 128605 2011-06-24 14:03:41Z ibiru $ +# Maintainer: Jan de Groot +# Contributor: Link Dupont +# +pkgname=dbus-core +pkgver=1.4.12 +pkgrel=1 +pkgdesc="Freedesktop.org message bus system" +url="http://www.freedesktop.org/Software/dbus" +arch=(i686 x86_64) +license=('GPL' 'custom') +depends=('expat>=2.0.1' 'coreutils' 'filesystem') +makedepends=('libx11') +conflicts=('dbus<1.2.3-2') +options=(!libtool) +install=dbus.install +source=(http://dbus.freedesktop.org/releases/dbus/dbus-${pkgver}.tar.gz + dbus) +md5sums=('104f2ea94c10a896dfb1edecb5714cb1' + '08f93dd19cffd1b45ab05c1fd4efb560') + +build() { + cd "${srcdir}/dbus-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --libexecdir=/usr/lib/dbus-1.0 --with-dbus-user=81 \ + --with-system-pid-file=/var/run/dbus.pid \ + --enable-inotify --disable-dnotify \ + --disable-verbose-mode --disable-static \ + --disable-tests --disable-asserts \ + --with-systemdsystemunitdir=/lib/systemd/system + make +} + +package(){ + cd "${srcdir}/dbus-${pkgver}" + make DESTDIR="${pkgdir}" install + + rm -f "${pkgdir}/usr/bin/dbus-launch" + rm -f "${pkgdir}/usr/share/man/man1/dbus-launch.1" + + chown 81:81 "${pkgdir}/var/run/dbus" + + install -m755 -d "${pkgdir}/etc/rc.d" + install -m755 "${srcdir}/dbus" "${pkgdir}/etc/rc.d/" + + #Fix configuration file + sed -i -e 's|81|dbus|' "${pkgdir}/etc/dbus-1/system.conf" + + #install .keep files so pacman doesn't delete empty dirs + touch "${pkgdir}/usr/share/dbus-1/services/.keep" + touch "${pkgdir}/usr/share/dbus-1/system-services/.keep" + touch "${pkgdir}/etc/dbus-1/session.d/.keep" + touch "${pkgdir}/etc/dbus-1/system.d/.keep" + + install -d -m755 "${pkgdir}/usr/share/licenses/dbus-core" + install -m644 COPYING "${pkgdir}/usr/share/licenses/dbus-core/" +} diff --git a/testing/dbus-core/dbus b/testing/dbus-core/dbus new file mode 100644 index 000000000..66b84cae0 --- /dev/null +++ b/testing/dbus-core/dbus @@ -0,0 +1,57 @@ +#!/bin/bash + +# general config +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + stat_busy "Starting D-BUS system messagebus" + if [ ! -x /var/run/dbus ] ; then + install -m755 -g 81 -o 81 -d /var/run/dbus + fi + if [ -x /usr/bin/dbus-uuidgen ] ; then + /usr/bin/dbus-uuidgen --ensure + fi + + /usr/bin/dbus-daemon --system + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon dbus + stat_done + fi + ;; + stop) + stat_busy "Stopping D-BUS system messagebus" + [ -f /var/run/dbus.pid ] && kill `cat /var/run/dbus.pid` >/dev/null 2>&1 + if [ $? -gt 0 ]; then + stat_fail + else + rm -f /var/run/dbus.pid + rm_daemon dbus + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + reload) + stat_busy "Reloading D-BUS configuration" + [ -f /var/run/dbus.pid ] && /usr/bin/dbus-send \ + --system --type=method_call \ + --dest=org.freedesktop.DBus \ + / org.freedesktop.DBus.ReloadConfig + if [ $? -gt 0 ]; then + stat_fail + else + stat_done + fi + ;; + *) + echo "usage: $0 {start|stop|restart|reload}" + ;; +esac +exit 0 diff --git a/testing/dbus-core/dbus.install b/testing/dbus-core/dbus.install new file mode 100644 index 000000000..44f4475ee --- /dev/null +++ b/testing/dbus-core/dbus.install @@ -0,0 +1,24 @@ +post_install() { + getent group dbus >/dev/null || usr/sbin/groupadd -g 81 dbus + getent passwd dbus >/dev/null || usr/sbin/useradd -c 'System message bus' -u 81 -g dbus -d '/' -s /bin/false dbus + usr/bin/passwd -l dbus &>/dev/null + dbus-uuidgen --ensure +} + +post_upgrade() { + post_install + + #Make sure new rc script can shutdown running dbus + if [ -f var/run/dbus/pid ]; then + mv var/run/dbus/pid var/run/dbus.pid + fi +} + +post_remove() { + if getent passwd dbus >/dev/null; then + usr/sbin/userdel dbus + fi + if getent group dbus >/dev/null; then + usr/sbin/groupdel dbus + fi +} diff --git a/testing/dbus-glib/PKGBUILD b/testing/dbus-glib/PKGBUILD new file mode 100644 index 000000000..fa15a7b85 --- /dev/null +++ b/testing/dbus-glib/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 128599 2011-06-24 13:51:01Z ibiru $ +# Maintainer: Jan de Groot + +pkgname=dbus-glib +pkgver=0.94 +pkgrel=1 +pkgdesc="GLib bindings for DBUS" +arch=(i686 x86_64) +license=('GPL') +url="http://www.freedesktop.org/wiki/Software/DBusBindings" +depends=('dbus-core' 'glib2') +makedepends=('pkgconfig') +options=('!libtool' '!emptydirs') +source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz) +md5sums=('e1f1506a6f4941e67bffd614b1ad5af6') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --enable-static=no --enable-bash-completion=no + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/dbus-python/PKGBUILD b/testing/dbus-python/PKGBUILD new file mode 100644 index 000000000..8cfacff43 --- /dev/null +++ b/testing/dbus-python/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 128602 2011-06-24 13:59:34Z ibiru $ +# Contributor: Jan de Groot + +pkgname=dbus-python +pkgver=0.84.0 +pkgrel=1 +pkgdesc="Python bindings for DBUS" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL') +url="http://www.freedesktop.org/wiki/Software/DBusBindings" +depends=('dbus-glib' 'python2') +makedepends=('pkg-config' 'docutils') +options=('!libtool') +source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz) +md5sums=('fe69a2613e824463e74f10913708c88a') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + PYTHON=python2 ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/dbus/30-dbus b/testing/dbus/30-dbus new file mode 100644 index 000000000..603e92d3e --- /dev/null +++ b/testing/dbus/30-dbus @@ -0,0 +1,9 @@ +#!/bin/bash + +# launches a session dbus instance + +dbuslaunch="`which dbus-launch 2>/dev/null`" +if [ -n "$dbuslaunch" ] && [ -x "$dbuslaunch" ] && [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then + eval `$dbuslaunch --sh-syntax --exit-with-session` +fi + diff --git a/testing/dbus/PKGBUILD b/testing/dbus/PKGBUILD new file mode 100644 index 000000000..bcac66a7a --- /dev/null +++ b/testing/dbus/PKGBUILD @@ -0,0 +1,41 @@ +# $Id: PKGBUILD 128609 2011-06-24 14:05:28Z ibiru $ +# Maintainer: Jan de Groot +# Contributor: Link Dupont +# +pkgname=dbus +pkgver=1.4.12 +pkgrel=1 +pkgdesc="Freedesktop.org message bus system" +url="http://www.freedesktop.org/Software/dbus" +arch=(i686 x86_64) +license=('GPL' 'custom') +depends=("dbus-core>=${pkgver}" 'libx11') +source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz + 30-dbus) +md5sums=('104f2ea94c10a896dfb1edecb5714cb1' + 'd14e59575f04e55d21a04907b6fd9f3c') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ECHO="echo" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --libexecdir=/usr/lib/dbus-1.0 --with-dbus-user=81 \ + --with-system-pid-file=/var/run/dbus.pid \ + --disable-verbose-mode --disable-static \ + --enable-inotify --disable-dnotify \ + --disable-tests --disable-asserts + make -C tools dbus-launch +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + install -m755 -d "${pkgdir}/usr/bin" + install -m755 -d "${pkgdir}/usr/share/man/man1" + install -m755 tools/dbus-launch "${pkgdir}/usr/bin/" + install -m644 doc/dbus-launch.1 "${pkgdir}/usr/share/man/man1/" + + install -m755 -d "${pkgdir}/etc/X11/xinit/xinitrc.d" + install -m755 "${srcdir}/30-dbus" "${pkgdir}/etc/X11/xinit/xinitrc.d/" + + install -d -m755 "${pkgdir}/usr/share/licenses/dbus" + install -m644 COPYING "${pkgdir}/usr/share/licenses/dbus/" +} diff --git a/testing/libreoffice/PKGBUILD b/testing/libreoffice/PKGBUILD index 646192a73..2410ee992 100644 --- a/testing/libreoffice/PKGBUILD +++ b/testing/libreoffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 128395 2011-06-23 18:37:12Z andyrtr $ +# $Id: PKGBUILD 128633 2011-06-24 19:50:33Z andyrtr $ # Maintainer: AndyRTR pkgbase="libreoffice" @@ -24,8 +24,8 @@ pkgname=('libreoffice' 'libreoffice-sdk' 'libreoffice-extension-validator' 'libreoffice-extension-watch-window' 'libreoffice-extension-wiki-publisher') -_LOver=3.4.1.2 -pkgver=3.4.1rc2 +_LOver=3.4.1.3 +pkgver=3.4.1rc3 pkgrel=1 arch=('i686' 'x86_64') #_LO_tree="3.4" @@ -132,25 +132,25 @@ noextract=(185d60944ea767075d27247c3162b3bc-unowinreg.dll b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt 90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2 f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2) -md5sums=('f38317f991b1c253c416c67be7c3754d' - 'aa0d333b2eeca843c55cd4fafb77cda4' - '571a1d550c7d2d0ae80d712611447f71' - '30794ddc83d1c2e79564f0788f09186a' - '6887bf7d9badf0f0822a0c85261b4679' - '5b9891c11e79a6131763c0131a5c442e' - '3b91cbeaa68f22b5c017cd5f3919c070' - '5578f0dc49d092c57285e3bf3a311702' - '117fc2edb8c0765d0d39dba2ed910ea7' - '6e7b4efe196c44519d0d438c5a65bd92' - '44eddc7cd60a61a347694aa9a1988c28' - '361d32db4b08954fd210219e2fcc45d8' - '793ceaf4c7af5bbcfd0b8feb369d1f54' - '58177e2ff875c494f08490b061171669' - '43d7f4910b01a826ea97f63af4bdb36c' - '852c34e284cddf499d80957e7c994da5' - '281fe1792a84129e33853ba3fea4d378' - 'cc2553bf6be74f818f2e9ad7178bef92' - 'fe8fb18f2d4e4a37a4c23bc59f7a730c' +md5sums=('10b3212002688e7ce49a276c68352b50' + 'c6547ec8f971284ea1e58bb39375c500' + '26328364a0804dedab94818c15e76871' + 'd26c6ab53c9404e82e04ea366d4db261' + '132aa87f2f3e7fff62d7211a86b769f3' + '801c254c28402df0c5fb5e2615817a6d' + 'b94208fdae537f0b026ee26cede9a946' + '096e3071949d1eedf73faa13a2cf7b7e' + 'e27e715b08cc6a35988aaa6efab6cc7f' + 'e94d7adb79f38d3fd8119b712b04cc6e' + '1d2e7ca24b9fffafeaf236817fc8cbe9' + '69a9af6536607340a57b54b5562077f7' + '3b4e819497ba695f5c64a0107c2aac8d' + '5a7370a79e563f649f6bf506bc71928c' + 'c480ed571703e68d851fbbcd4aa520be' + '222cec135152c108068baa4e370a3f68' + '93524298efb472503b12ae47c95de399' + '5420c40473f8bf8e5b400dd8a1e54f02' + '1516196f023bb1ae55fd1773a8db9d16' '1f24ab1d39f4a51faf22244c94a6203f' '35c94d2df8893241173de1d16b6034c0' '798b2ffdc8bcfe7bca2cf92b62caf685' diff --git a/testing/pidgin/PKGBUILD b/testing/pidgin/PKGBUILD index e0c7170bd..91e94bb66 100644 --- a/testing/pidgin/PKGBUILD +++ b/testing/pidgin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 126958 2011-06-08 23:47:29Z foutrelis $ +# $Id: PKGBUILD 128517 2011-06-24 07:46:40Z foutrelis $ # Maintainer: Evangelos Foutras # Contributor: Ionut Biru # Contributor: Andrea Scarpino @@ -6,8 +6,8 @@ # Contributor: Lucien Immink pkgname=('pidgin' 'libpurple' 'finch') -pkgver=2.8.0 -pkgrel=3 +pkgver=2.9.0 +pkgrel=2 arch=('i686' 'x86_64') url="http://pidgin.im/" license=('GPL') @@ -18,7 +18,7 @@ makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm' options=('!libtool') source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2 nm09-more.patch) -md5sums=('d1656c443a5d91f4aa0d95915f1f50c3' +md5sums=('2cd285c7a40f93b7a51bfe733971d3a6' 'a673659d86c7a65aa710f7c8c7feda82') build() { diff --git a/testing/psmisc/PKGBUILD b/testing/psmisc/PKGBUILD new file mode 100644 index 000000000..1783c528a --- /dev/null +++ b/testing/psmisc/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 128514 2011-06-24 07:34:22Z eric $ +# Maintainer: Eric Bélanger + +pkgname=psmisc +pkgver=22.14 +pkgrel=1 +pkgdesc="Miscellaneous procfs tools" +arch=('i686' 'x86_64') +url="http://psmisc.sourceforge.net/index.html" +license=('GPL') +groups=('base') +depends=('glibc' 'ncurses') +source=(http://downloads.sourceforge.net/psmisc/${pkgname}-${pkgver}.tar.gz) +md5sums=('ba3f4e971895c92bba7770d81c981503') +sha1sums=('dc6fc0ec131c11796d01512bbd80089719b04a66') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} -- cgit v1.2.3-54-g00ecf