diff options
45 files changed, 941 insertions, 223 deletions
diff --git a/community/duff/PKGBUILD b/community/duff/PKGBUILD index c1bb2e2cc..c97271ca7 100644 --- a/community/duff/PKGBUILD +++ b/community/duff/PKGBUILD @@ -1,21 +1,24 @@ -# $Id: PKGBUILD 11210 2010-02-07 18:33:36Z dgriffiths $ +# $Id: PKGBUILD 44930 2011-04-13 03:50:28Z shusmann $ # Contributor: Aaron Schaefer <aaron@elasticdog.com> pkgname=duff -pkgver=0.4 -pkgrel=3 +pkgver=0.5 +pkgrel=1 pkgdesc="A command-line utility for quickly finding duplicates in a given set of files" arch=('i686' 'x86_64') url="http://duff.sourceforge.net/" -license=('ZLIB') -depends=('glibc') +license=('custom') +depends=('glibc' 'sh') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('ca5043ceb1e16dac1aca5da1ed844149') +md5sums=('e42bedb278ab41081df3ebb9ce1cbe1d') build() { cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr --mandir=/usr/share/man - make || return 1 + make +} +package() { + cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING } diff --git a/community/flickcurl/PKGBUILD b/community/flickcurl/PKGBUILD new file mode 100644 index 000000000..47e29d560 --- /dev/null +++ b/community/flickcurl/PKGBUILD @@ -0,0 +1,25 @@ +# $Id: PKGBUILD 44887 2011-04-12 12:28:24Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> + +pkgname=flickcurl +pkgver=1.21 +pkgrel=1 +pkgdesc="C library for the Flickr API" +arch=(i686 x86_64) +url="http://librdf.org/flickcurl/" +license=('GPL') +depends=(raptor) +makedepends=() +source=(http://download.dajobe.org/flickcurl/flickcurl-$pkgver.tar.gz) +md5sums=('d4d364231505dc22a6af42be7bc85edf') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install +} diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD index 81e4dffd8..8c1becc67 100644 --- a/community/nginx/PKGBUILD +++ b/community/nginx/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 44016 2011-04-01 16:48:13Z spupykin $ +# $Id: PKGBUILD 44862 2011-04-12 10:26:44Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Miroslaw Szot <mss@czlug.icis.pcz.pl> @@ -11,8 +11,8 @@ _user=http _group=http pkgname=nginx -pkgver=0.8.54 -pkgrel=3 +pkgver=1.0.0 +pkgrel=1 pkgdesc="lightweight HTTP server and IMAP/POP3 proxy server" arch=('i686' 'x86_64') depends=('pcre' 'zlib' 'openssl') @@ -27,7 +27,7 @@ backup=("etc/nginx/conf/nginx.conf" "etc/logrotate.d/nginx") source=(http://sysoev.ru/nginx/nginx-${pkgver}.tar.gz nginx) -md5sums=('44df4eb6a22d725021288c570789046f' +md5sums=('5751c920c266ea5bb5fc38af77e9c71c' '837b010afcbdfe82d8e65ef00c4e14ba') build() { diff --git a/community/pcsc-tools/PKGBUILD b/community/pcsc-tools/PKGBUILD index 45bd7c450..8bfabddba 100644 --- a/community/pcsc-tools/PKGBUILD +++ b/community/pcsc-tools/PKGBUILD @@ -1,19 +1,16 @@ -# $Id: PKGBUILD 37124 2011-01-11 10:36:50Z giovanni $ +# $Id: PKGBUILD 44872 2011-04-12 10:42:15Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Lorenzo Nizzi Grifi Gargiolli <lorenzo.nizzi.grifi@gmail.com> # Contributor: marc0s <marc0s@fsfe.org> pkgname=pcsc-tools pkgver=1.4.17 -pkgrel=2 +pkgrel=4 pkgdesc="PC/SC Architecture smartcard tools" arch=('i686' 'x86_64') url="http://ludovic.rousseau.free.fr/softwares/pcsc-tools/" license=('GPL') -depends=('pcsclite' 'perl') -optdepends=('gtk2-perl: required by gscriptor' - 'glib-perl: required by gscriptor' - 'pcsc-perl: required by gscriptor and scriptor') +depends=('pcsclite' 'pcsc-perl' 'gtk2-perl' 'glib-perl') makedepends=('pkgconfig') source=(http://ludovic.rousseau.free.fr/softwares/${pkgname}/${pkgname}-${pkgver}.tar.gz) md5sums=('2767238e1e737f94d13a91bdab1174ca') @@ -22,6 +19,11 @@ build() { cd "${srcdir}/${pkgname}-${pkgver}" sed -i -e 's:-Wall -O2:${CFLAGS}:g' Makefile - make || return 1 - make DESTDIR="${pkgdir}/usr" install || return 1 + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}/usr" install } diff --git a/community/pragha/PKGBUILD b/community/pragha/PKGBUILD index 6d8f520cb..61ae12e91 100755 --- a/community/pragha/PKGBUILD +++ b/community/pragha/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 42505 2011-03-17 12:01:45Z ttopper $ +# $Id: PKGBUILD 44895 2011-04-12 14:24:48Z 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.94.0 +pkgver=0.94.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=('985947e7066827183a9ed6eea527dffc89acc549') +sha1sums=('ea7b8554028f9df3f1a001ca278edbb8cda37fb7') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/rawstudio/PKGBUILD b/community/rawstudio/PKGBUILD index 06730f73a..7164c77d2 100644 --- a/community/rawstudio/PKGBUILD +++ b/community/rawstudio/PKGBUILD @@ -1,30 +1,33 @@ -# $Id: PKGBUILD 40356 2011-02-23 08:05:16Z ebelanger $ +# $Id: PKGBUILD 44889 2011-04-12 12:28:53Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Roman Kyrylych <roman@archlinux.org> # Contributor: cdhotfire <cdhotfire@gmail.com> pkgname=rawstudio -pkgver=1.2 -pkgrel=6 +pkgver=2.0 +pkgrel=1 pkgdesc="An open source raw-image converter written in GTK+" arch=('i686' 'x86_64') license=('GPL') url="http://rawstudio.org/" -depends=('gconf' 'libxml2' 'lcms' 'libjpeg' 'libtiff' 'desktop-file-utils' 'exiv2') +depends=('exiv2' 'libgphoto2' 'flickcurl' 'libjpeg' 'fftw' 'gconf' 'lensfun' + 'raptor' 'lcms') install=${pkgname}.install -source=(http://rawstudio.org/files/release/${pkgname}-${pkgver}.tar.gz - 'rawstudio-const.patch') -md5sums=('25399cd80294fa44220a8940fc77689f' '6692b460e838ea56462aff7626b2dcef') -sha1sums=('9ce96c40e0b8feaf4627c14310646782578d4da1' '95d83914d5ae156f0fe747945516ae6cc93adac5') +options=('!libtool') +source=(http://rawstudio.org/files/release/${pkgname}-${pkgver}.tar.gz) +md5sums=('b2f86b8ca6b83ad954e3104c4cb89e9b') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/rawstudio-const.patch" - ./configure --prefix=/usr - make + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr + make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make prefix="${pkgdir}/usr" install + cd "${srcdir}/${pkgname}-${pkgver}" + make prefix="${pkgdir}/usr" install + mkdir $pkgdir/usr/lib/rawstudio + mv $pkgdir/usr/share/rawstudio/plugins $pkgdir/usr/lib/rawstudio + ln -s ../../lib/rawstudio/plugins $pkgdir/usr/share/rawstudio/plugins } diff --git a/community/rawstudio/rawstudio.install b/community/rawstudio/rawstudio.install index 5e5cfef4d..261adb7b4 100644 --- a/community/rawstudio/rawstudio.install +++ b/community/rawstudio/rawstudio.install @@ -1,11 +1,11 @@ post_install() { - update-desktop-database -q + update-desktop-database -q || true } post_upgrade() { - post_install $1 + update-desktop-database -q || true } post_remove() { - update-desktop-database -q + update-desktop-database -q || true } diff --git a/community/ruby-gtk2/PKGBUILD b/community/ruby-gtk2/PKGBUILD index 0d50843f3..b796f8416 100644 --- a/community/ruby-gtk2/PKGBUILD +++ b/community/ruby-gtk2/PKGBUILD @@ -1,22 +1,29 @@ -# $Id: PKGBUILD 44834 2011-04-12 02:45:00Z bfanella $ +# $Id: PKGBUILD 44925 2011-04-13 00:53:43Z bfanella $ # Maintainer: Brad Fanella <bradfanella@archlinux.us> # Contributor: Bjorn Lindeijer <bjorn@lindeijer.nl> # Contributor: kritoke <kritoke@nospam.gmail.com> pkgname=ruby-gtk2 pkgver=0.90.8 -pkgrel=1 +pkgrel=2 pkgdesc="Ruby bindings for gtk2." arch=('i686' 'x86_64') url="http://ruby-gnome2.sourceforge.jp" license=('LGPL') depends=('ruby-glib2' 'ruby-pango' 'ruby-atk' 'ruby-gdkpixbuf2') makedepends=('ruby-pkgconfig' 'ruby-cairo') -source=(http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk2-$pkgver.tar.gz) -md5sums=('74966bde5366bc9d09701e9f464d60c9') +source=(http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk2-$pkgver.tar.gz + 'mkmf-gnome2.patch') +md5sums=('74966bde5366bc9d09701e9f464d60c9' + '5674ec349bec878c36f70102ca7acb0b') build() { cd "$srcdir/ruby-gtk2-$pkgver" + + # Apply mkmf-gnome2.patch + patch -Np1 glib2/lib/mkmf-gnome2.rb < ${srcdir}/mkmf-gnome2.patch + + export LANG="en_US.UTF-8" ruby extconf.rb gtk2 --topdir=$pkgdir make } diff --git a/community/ruby-gtk2/mkmf-gnome2.patch b/community/ruby-gtk2/mkmf-gnome2.patch index a03ab9e4c..bf877cf9c 100644 --- a/community/ruby-gtk2/mkmf-gnome2.patch +++ b/community/ruby-gtk2/mkmf-gnome2.patch @@ -1,19 +1,31 @@ -*** mkmf-gnome2.rb.orig 2011-02-21 12:41:16.563334382 -0600 ---- mkmf-gnome2.rb 2011-02-21 12:41:37.610001048 -0600 -*************** -*** 364,370 **** - rescue LoadError - end - end -! return false if rcairo_source_dir.nil? - - if /mingw|cygwin|mswin32/ =~ RUBY_PLATFORM - options = {} ---- 364,370 ---- - rescue LoadError - end - end -! return false if rcairo_source_dir.nil? && !(PKGConfig.have_package('cairo') && have_header('rb_cairo.h')) - - if /mingw|cygwin|mswin32/ =~ RUBY_PLATFORM - options = {} +--- glib2/lib/mkmf-gnome2.rb.orig 2011-04-12 14:51:53.223390976 +0200 ++++ glib2/lib/mkmf-gnome2.rb 2011-04-12 14:52:21.240120725 +0200 +@@ -366,20 +366,19 @@ + rescue LoadError + end + end ++ return false if rcairo_source_dir.nil? && !(PKGConfig.have_package('cairo') && have_header('rb_cairo.h')) + +- unless rcairo_source_dir.nil? +- if /mingw|cygwin|mswin32/ =~ RUBY_PLATFORM +- options = {} +- build_dir = "tmp/#{RUBY_PLATFORM}/cairo/#{RUBY_VERSION}" +- if File.exist?(File.join(rcairo_source_dir, build_dir)) +- options[:target_build_dir] = build_dir +- end +- add_depend_package("cairo", "ext/cairo", rcairo_source_dir, options) +- $defs << "-DRUBY_CAIRO_PLATFORM_WIN32" ++ if /mingw|cygwin|mswin32/ =~ RUBY_PLATFORM ++ options = {} ++ build_dir = "tmp/#{RUBY_PLATFORM}/cairo/#{RUBY_VERSION}" ++ if File.exist?(File.join(rcairo_source_dir, build_dir)) ++ options[:target_build_dir] = build_dir + end +- $CFLAGS += " -I#{rcairo_source_dir}/ext/cairo" ++ add_depend_package("cairo", "ext/cairo", rcairo_source_dir, options) ++ $defs << "-DRUBY_CAIRO_PLATFORM_WIN32" + end + ++ $CFLAGS += " -I#{rcairo_source_dir}/ext/cairo" + PKGConfig.have_package('cairo') and have_header('rb_cairo.h') + end diff --git a/community/subtle/PKGBUILD b/community/subtle/PKGBUILD index 247479027..268736beb 100644 --- a/community/subtle/PKGBUILD +++ b/community/subtle/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 44650 2011-04-10 13:39:02Z angvp $ +# $Id: PKGBUILD 44915 2011-04-12 21:25:17Z angvp $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: unexist <unexist@dorfelite.net> # Past Contributors: Abakus <java5@arcor.de>, TDY <tdy@gmx.com>, Xilon <xilonmu@gmail.com> pkgname=subtle pkgver=0.9.2773 -pkgrel=1 +pkgrel=2 pkgdesc="A grid-based manual tiling window manager with a strong focus on easy but customizable look and feel" arch=("i686" "x86_64") url="http://subtle.subforge.org" @@ -16,6 +16,7 @@ conflicts=("subtle-hg") backup=("etc/xdg/subtle/subtle.rb") source=(http://subforge.org/attachments/download/50/$pkgname-$pkgver-mu.tbz2) md5sums=('bbae53d6c16cfe25186003e9e28504f8') +install=subtle.install build() { cd "$srcdir/$pkgname-$pkgver-mu" diff --git a/community/subtle/subtle.install b/community/subtle/subtle.install index c7ef727b7..36fa9bafe 100644 --- a/community/subtle/subtle.install +++ b/community/subtle/subtle.install @@ -1,3 +1,8 @@ post_upgrade() { - echo "If you have subtles on your system remember to upgrade them doing:\n\n\t sur upgrade " + echo "In order to use sur you have to install the following dependencies: curb and minitar with" + echo "You can use this gem command: " + echo " gem install curb minitar" + echo "" + echo "If you have subtles on your system remember to upgrade them doing:" + echo " sur upgrade " } diff --git a/community/swi-prolog/PKGBUILD b/community/swi-prolog/PKGBUILD index 007441a52..9e0faf6f9 100644 --- a/community/swi-prolog/PKGBUILD +++ b/community/swi-prolog/PKGBUILD @@ -3,8 +3,8 @@ # Contributor: Juergen Hoetzel <juergen@archlinux.org> pkgname=swi-prolog -pkgver=5.10.2 -pkgrel=2 +pkgver=5.10.4 +pkgrel=1 pkgdesc='Prolog environment' arch=('i686' 'x86_64') url='http://www.swi-prolog.org/' @@ -18,7 +18,7 @@ optdepends=('unixodbc: for using the odbc4pl library' 'libxft: for using the pl2xpce library') options=('!makeflags') source=("http://www.swi-prolog.org/download/stable/src/pl-${pkgver}.tar.gz") -md5sums=('7973bcfd3854ae0cb647cc62f2faabcf') +md5sums=('363433bb2f80a6c2befeaee7768197b4') build() { cd pl-${pkgver} diff --git a/community/tomoyo-tools/PKGBUILD b/community/tomoyo-tools/PKGBUILD new file mode 100644 index 000000000..ceda8d708 --- /dev/null +++ b/community/tomoyo-tools/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 44878 2011-04-12 10:45:41Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Jamie Nguyen <jamie AT tomoyolinux.co.uk> + +pkgname=tomoyo-tools +_basever=2.3.0 +_timestamp=20110211 +pkgver=${_basever}.${_timestamp} +pkgrel=4 +pkgdesc='TOMOYO Linux 2.3.x userspace tools for Linux kernel 2.6.36 and later' +arch=('i686' 'x86_64') +url='http://tomoyo.sourceforge.jp' +license=('GPL') +depends=('ncurses') +makedepends=('help2man') +conflicts=('ccs-tools') +install=tomoyo-tools.install +source=("http://sourceforge.jp/frs/redir.php?f=/tomoyo/48663/${pkgname}-${_basever}-${_timestamp}.tar.gz") +md5sums=('000015f85fe9aa814196d5a981fab5b6') + +build() { + cd "${srcdir}/${pkgname}" + make -j1 +} + +package() { + cd "${srcdir}/${pkgname}" + make INSTALLDIR="${pkgdir}" install +} diff --git a/community/tomoyo-tools/tomoyo-tools.install b/community/tomoyo-tools/tomoyo-tools.install new file mode 100644 index 000000000..6fb5e16d2 --- /dev/null +++ b/community/tomoyo-tools/tomoyo-tools.install @@ -0,0 +1,11 @@ +post_install () { + echo + echo " * To enable TOMOYO Linux, append 'security=tomoyo' to the kernel" + echo " boot options and initialize policy with this command:" + echo " /usr/lib/tomoyo/init_policy" + echo +} + +post_upgrade () { + post_install $1 +} diff --git a/community/udunits/PKGBUILD b/community/udunits/PKGBUILD index 6e9bc02e5..b1d7240a4 100644 --- a/community/udunits/PKGBUILD +++ b/community/udunits/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 44587 2011-04-09 04:53:44Z kchen $ +# $Id: PKGBUILD 44910 2011-04-12 18:07:39Z kchen $ # Maintainer: Kaiting Chen <kaitocracy@gmail.com> # Contributor: Anton Bazhenov <anton.bazhenov at gmail> pkgname=udunits pkgver=2.1.22 -pkgrel=1 +pkgrel=2 pkgdesc='A tool for calculations of physical quantities' arch=('i686' 'x86_64') url='http://www.unidata.ucar.edu/software/udunits/' license=('custom') options=('!libtool') -depends=('glibc') +depends=('glibc' 'expat') provides=('udunits2') install=udunits.install source=("ftp://ftp.unidata.ucar.edu/pub/$pkgname/$pkgname-$pkgver.tar.gz") diff --git a/community/unpaper/PKGBUILD b/community/unpaper/PKGBUILD index ea0e42e87..0a854130e 100644 --- a/community/unpaper/PKGBUILD +++ b/community/unpaper/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 21219 2010-07-15 09:47:52Z spupykin $ +# $Id: PKGBUILD 44854 2011-04-12 08:56:17Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Andreas Hauser <andy-aur@splashground.de> pkgname=unpaper pkgver=0.3 -pkgrel=1 +pkgrel=2 pkgdesc="post-processing tool for scanned sheets of paper" +arch=('i686' 'x86_64') url="http://$pkgname.berlios.de/" license="GPL" depends=() -arch=('i686' 'x86_64') -makedepends=(gcc) +makedepends=('gcc') source=("http://download.berlios.de/unpaper/$pkgname-${pkgver}.tar.gz") md5sums=('be41eaf8556e7df39ab53939c99c4f7b') @@ -18,4 +18,6 @@ build() { cd $srcdir/$pkgname-$pkgver/src gcc $CFLAGS -lm -funroll-all-loops -fomit-frame-pointer -ftree-vectorize -o unpaper unpaper.c install -D -m0755 unpaper $pkgdir/usr/bin/unpaper + install -d -m0755 $pkgdir/usr/share/doc/unpaper + cp -a ../doc/* $pkgdir/usr/share/doc/unpaper } diff --git a/community/virtualbox/18-system-xorg.patch b/community/virtualbox/18-system-xorg.patch new file mode 100644 index 000000000..4a28b93b6 --- /dev/null +++ b/community/virtualbox/18-system-xorg.patch @@ -0,0 +1,277 @@ +Description: Build the X.Org driver only for the selected system X Server version. +Author: Michael Meskes <meskes@debian.org>, Felix Geyer <debfx-pkg@fobos.de> + +diff --git a/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk b/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk +--- a/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk ++++ b/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk +@@ -40,8 +40,8 @@ LIBRARIES += \ + VBoxGuestR3LibShared + ifndef VBOX_ONLY_TESTSUITE + if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd) +- LIBRARIES += \ +- VBoxGuestR3LibXFree86 ++# LIBRARIES += \ ++# VBoxGuestR3LibXFree86 + endif + endif + LIBRARIES.win.amd64 += VBoxGuestR3Lib-x86 VBoxGuestR3LibShared-x86 +diff --git a/src/VBox/Additions/common/crOpenGL/Makefile.kmk b/src/VBox/Additions/common/crOpenGL/Makefile.kmk +--- a/src/VBox/Additions/common/crOpenGL/Makefile.kmk ++++ b/src/VBox/Additions/common/crOpenGL/Makefile.kmk +@@ -63,16 +63,12 @@ VBoxOGL_TEMPLATE = VBOXCROGLR3GUESTDLL + VBoxOGL_INCS = . + if1of ($(KBUILD_TARGET), linux solaris freebsd) + VBoxOGL_INCS += \ +- $(VBOX_PATH_X11_ROOT)/libXdamage-1.1 \ +- $(VBOX_PATH_X11_ROOT)/libXcomposite-0.4.0 \ +- $(VBOX_PATH_X11_ROOT)/libXfixes-4.0.3 \ +- $(VBOX_PATH_X11_ROOT)/damageproto-1.1.0 \ +- $(VBOX_PATH_X11_ROOT)/compositeproto-0.4 \ +- $(VBOX_PATH_X11_ROOT)/fixesproto-4.0 \ +- $(VBOX_PATH_X11_ROOT)/libx11-1.1.5-other \ +- $(VBOX_PATH_X11_ROOT)/1.3/xorg \ ++ /usr/include/x11 \ ++ /usr/include/xorg \ ++ /usr/include/pixman-1 \ + $(VBOX_MESA_INCS) \ +- $(PATH_ROOT)/src/VBox/Additions/x11/x11include/libdrm-2.4.13 ++ /usr/include/drm \ ++ /usr/include/libdrm + VBoxOGL_DEFS += VBOX_NO_NATIVEGL + endif + +diff --git a/src/VBox/Additions/x11/Makefile.kmk b/src/VBox/Additions/x11/Makefile.kmk +--- a/src/VBox/Additions/x11/Makefile.kmk ++++ b/src/VBox/Additions/x11/Makefile.kmk +@@ -17,6 +17,10 @@ + SUB_DEPTH = ../../../.. + include $(KBUILD_PATH)/subheader.kmk + ++ifn1of ($(XSERVER_VERSION), 13 14 15 16 17 18 19 110) ++ XSERVER_VERSION := 17 ++endif ++ + # Include sub-makefiles. + if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris) + include $(PATH_SUB_CURRENT)/VBoxClient/Makefile.kmk +diff --git a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk +--- a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk ++++ b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk +@@ -23,7 +23,6 @@ include $(KBUILD_PATH)/subheader.kmk + # vboxmouse_drv + # + if1of ($(KBUILD_TARGET), linux) +- SYSMODS += vboxmouse_drv + vboxmouse_drv_TEMPLATE = VBOXGUESTR3XF86MOD + vboxmouse_drv_DEFS.linux = linux + vboxmouse_drv_DEFS.x86 += __i386__ +@@ -59,7 +58,6 @@ endif + # + # vboxmouse_drv_70 + # +-DLLS += vboxmouse_drv_70 + vboxmouse_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD + vboxmouse_drv_70_DEFS = \ + XFree86Server IN_MODULE XFree86Module XFree86LOADER XINPUT XORG_7X IN_XF86_MODULE +@@ -80,7 +78,6 @@ vboxmouse_drv_70_SOURCES = \ + # + # vboxmouse_drv_71 + # +-DLLS += vboxmouse_drv_71 + vboxmouse_drv_71_TEMPLATE = VBOXGUESTR3XORGMOD + vboxmouse_drv_71_DEFS := $(vboxmouse_drv_70_DEFS) + vboxmouse_drv_71_INCS := \ +@@ -97,7 +94,6 @@ vboxmouse_drv_71_SOURCES = \ + # + # vboxmouse_drv_13 + # +-DLLS += vboxmouse_drv_13 + vboxmouse_drv_13_TEMPLATE = VBOXGUESTR3XORGMOD + vboxmouse_drv_13_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC + vboxmouse_drv_13_INCS := \ +@@ -112,7 +108,6 @@ vboxmouse_drv_13_SOURCES = \ + # + # vboxmouse_drv_14 + # +-DLLS += vboxmouse_drv_14 + vboxmouse_drv_14_TEMPLATE = VBOXGUESTR3XORGMOD + vboxmouse_drv_14_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC + vboxmouse_drv_14_INCS := \ +@@ -126,7 +121,6 @@ endif + # + # vboxmouse_drv_15 + # +-DLLS += vboxmouse_drv_15 + vboxmouse_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD + vboxmouse_drv_15_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC + vboxmouse_drv_15_INCS := \ +@@ -141,7 +135,6 @@ vboxmouse_drv_15_SOURCES = \ + # + # vboxmouse_drv_16 + # +-DLLS += vboxmouse_drv_16 + vboxmouse_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD + vboxmouse_drv_16_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC + vboxmouse_drv_16_INCS := \ +@@ -157,7 +150,6 @@ vboxmouse_drv_16_SOURCES = \ + # + # vboxmouse_drv_17 + # +-DLLS += vboxmouse_drv_17 + vboxmouse_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD + vboxmouse_drv_17_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC + ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local +@@ -177,7 +169,6 @@ vboxmouse_drv_17_SOURCES = \ + # + # vboxmouse_drv_18 + # +-DLLS += vboxmouse_drv_18 + vboxmouse_drv_18_TEMPLATE = VBOXGUESTR3XORGMOD + vboxmouse_drv_18_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC + ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local +@@ -197,7 +188,6 @@ vboxmouse_drv_18_SOURCES = \ + # + # vboxmouse_drv_19 + # +-DLLS += vboxmouse_drv_19 + vboxmouse_drv_19_TEMPLATE = VBOXGUESTR3XORGMOD + vboxmouse_drv_19_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC + ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local +@@ -217,7 +207,6 @@ vboxmouse_drv_19_SOURCES = \ + # + # vboxmouse_drv_110 + # +-DLLS += vboxmouse_drv_110 + vboxmouse_drv_110_TEMPLATE = VBOXGUESTR3XORGMOD + vboxmouse_drv_110_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC + ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local +@@ -234,6 +224,14 @@ vboxmouse_drv_110_SOURCES = \ + vboxmouse_15.c + + ++vboxmouse_drv_$(XSERVER_VERSION)_NAME := vboxmouse_drv ++vboxmouse_drv_$(XSERVER_VERSION)_INCS := \ ++ /usr/include/x11 \ ++ /usr/include/xorg \ ++ /usr/include/pixman-1 ++DLLS += vboxmouse_drv_$(XSERVER_VERSION) ++ ++ + # Check the undefined symbols in the X.Org modules against lists of allowed + # symbols. Not very elegant, but it will catch problems early. + ifdef VBOX_WITH_TESTCASES +diff --git a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk +--- a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk ++++ b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk +@@ -22,7 +22,6 @@ include $(KBUILD_PATH)/subheader.kmk + # vboxvideo_drv + # + if1of ($(KBUILD_TARGET), linux) +- SYSMODS += vboxvideo_drv + endif # target linux + vboxvideo_drv_TEMPLATE = VBOXGUESTR3XF86MOD + vboxvideo_drv_DEFS.linux = linux +@@ -89,7 +88,6 @@ endif # target linux + # base keywords instead of using .solaris or .linux. + # Also it is *important* to use := and not = when deriving a property. + # +-DLLS += vboxvideo_drv_70 + vboxvideo_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD + if1of ($(KBUILD_TARGET), linux) + vboxvideo_drv_70_CFLAGS += \ +@@ -112,7 +110,6 @@ vboxvideo_drv_70_SOURCES = $(vboxvideo_drv_SOURCES) + # + # vboxvideo_drv_71 + # +-DLLS += vboxvideo_drv_71 + vboxvideo_drv_71_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_71_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_71_DEFS := $(vboxvideo_drv_70_DEFS) +@@ -127,7 +124,6 @@ vboxvideo_drv_71_SOURCES = $(vboxvideo_drv_SOURCES) + # + # vboxvideo_drv_13 + # +-DLLS += vboxvideo_drv_13 + vboxvideo_drv_13_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_13_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_13_DEFS := $(vboxvideo_drv_70_DEFS) VBOXVIDEO_13 +@@ -146,7 +142,6 @@ vboxvideo_drv_13_SOURCES = \ + # + # vboxvideo_drv_14 + # +-DLLS += vboxvideo_drv_14 + vboxvideo_drv_14_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_14_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_14_DEFS := $(vboxvideo_drv_13_DEFS) +@@ -165,7 +160,6 @@ vboxvideo_drv_14_SOURCES = $(vboxvideo_drv_13_SOURCES) + # + # vboxvideo_drv_15 + # +-DLLS += vboxvideo_drv_15 + vboxvideo_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_15_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_15_DEFS := $(vboxvideo_drv_13_DEFS) NO_ANSIC PCIACCESS \ +@@ -192,7 +186,6 @@ endif + # + # vboxvideo_drv_16 + # +-DLLS += vboxvideo_drv_16 + vboxvideo_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_16_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_16_DEFS := $(vboxvideo_drv_15_DEFS) +@@ -212,7 +205,6 @@ vboxvideo_drv_16_SOURCES := $(vboxvideo_drv_15_SOURCES) + # + # vboxvideo_drv_17 + # +-DLLS += vboxvideo_drv_17 + vboxvideo_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_17_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_17_DEFS := $(vboxvideo_drv_15_DEFS) +@@ -239,7 +231,6 @@ vboxvideo_drv_17_SOURCES := $(vboxvideo_drv_15_SOURCES) + # + # vboxvideo_drv_18 + # +-DLLS += vboxvideo_drv_18 + vboxvideo_drv_18_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_18_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_18_DEFS := $(vboxvideo_drv_15_DEFS) +@@ -266,7 +257,6 @@ vboxvideo_drv_18_SOURCES := $(vboxvideo_drv_15_SOURCES) + # + # vboxvideo_drv_19 + # +-DLLS += vboxvideo_drv_19 + vboxvideo_drv_19_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_19_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_19_DEFS := $(vboxvideo_drv_15_DEFS) +@@ -293,7 +282,6 @@ vboxvideo_drv_19_SOURCES := $(vboxvideo_drv_15_SOURCES) + # + # vboxvideo_drv_110 + # +-DLLS += vboxvideo_drv_110 + vboxvideo_drv_110_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_110_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_110_DEFS := $(vboxvideo_drv_15_DEFS) +@@ -317,6 +306,23 @@ vboxvideo_drv_110_INCS = \ + vboxvideo_drv_110_SOURCES := $(vboxvideo_drv_15_SOURCES) + + ++vboxvideo_drv_$(XSERVER_VERSION)_NAME := vboxvideo_drv ++vboxvideo_drv_$(XSERVER_VERSION)_INCS := \ ++ /usr/include/xorg \ ++ /usr/include/x11 \ ++ /usr/include/pixman-1 \ ++ /usr/include/X11/dri \ ++ /usr/include/drm \ ++ /usr/include/libdrm ++vboxvideo_drv_$(XSERVER_VERSION)_INCS += $(PATH_ROOT)/src/VBox/Runtime/include ++DLLS += vboxvideo_drv_$(XSERVER_VERSION) ++ ++# required for lenny backports ++ifeq ($(XSERVER_VERSION),14) ++ vboxvideo_drv_$(XSERVER_VERSION)_INCS += $(VBOX_PATH_X11_XORG_1_4)/xorg ++endif ++ ++ + # Check the undefined symbols in the X.Org modules against lists of allowed + # symbols. Not very elegant, but it will catch problems early. + ifdef VBOX_WITH_TESTCASES diff --git a/community/virtualbox/PKGBUILD b/community/virtualbox/PKGBUILD index 6191165c1..94a9aba4f 100644 --- a/community/virtualbox/PKGBUILD +++ b/community/virtualbox/PKGBUILD @@ -1,19 +1,21 @@ -# $Id: PKGBUILD 42565 2011-03-17 13:26:20Z ibiru $ +# $Id: PKGBUILD 44881 2011-04-12 11:57:31Z ibiru $ #Maintainer: Ionut Biru <ibiru@archlinux.org> pkgbase=virtualbox pkgname=('virtualbox' 'virtualbox-guest-additions' 'virtualbox-guest-modules' 'virtualbox-sdk') pkgver=4.0.4 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL' 'custom') makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libxcursor' 'qt' 'libidl2' 'sdl_ttf' 'alsa-lib' 'libpulse' 'libxtst' -'xalan-c' 'sdl' 'libxmu' 'curl' 'python2' 'kernel26-headers>=2.6.38' 'mesa' 'libxrandr' 'libxinerama' 'libvncserver' 'jdk' 'gsoap' 'vde2') +'xalan-c' 'sdl' 'libxmu' 'curl' 'python2' 'kernel26-headers>=2.6.38' 'mesa' 'libxrandr' 'libxinerama' 'libvncserver' 'jdk' 'gsoap' 'vde2' +'xorg-server-devel' 'xf86driproto' 'libxcomposite') [[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc') source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2 http://download.virtualbox.org/virtualbox/${pkgver}/UserManual.pdf virtualbox-4-makeself-check.patch virtualbox-4-mkisofs-check.patch - 10-vboxdrv.rules 60-vboxguest.rules vboxdrv-reference.patch LocalConfig.kmk vboxdrv.sh) + 10-vboxdrv.rules 60-vboxguest.rules vboxdrv-reference.patch LocalConfig.kmk vboxdrv.sh + 18-system-xorg.patch) _kernver=2.6.38-ARCH build() { @@ -22,6 +24,7 @@ build() { patch -Np1 -i "$srcdir/virtualbox-4-makeself-check.patch" patch -Np1 -i "$srcdir/virtualbox-4-mkisofs-check.patch" patch -Np1 -i "$srcdir/vboxdrv-reference.patch" + patch -Np1 -i "$srcdir/18-system-xorg.patch" cp "$srcdir/LocalConfig.kmk" . @@ -160,9 +163,9 @@ package_virtualbox-guest-additions(){ "$pkgdir"/usr/bin/VBoxClient-all install -m755 -D "$srcdir"/VirtualBox-${pkgver}_OSE/src/VBox/Additions/x11/Installer/vboxclient.desktop \ "$pkgdir"/etc/xdg/autostart/vboxclient.desktop - install -D vboxmouse_drv_19.so \ + install -D vboxmouse_drv.so \ "$pkgdir/usr/lib/xorg/modules/input/vboxmouse.so" - install -D vboxvideo_drv_19.so \ + install -D vboxvideo_drv.so \ "$pkgdir/usr/lib/xorg/modules/drivers/vboxvideo.so" install -d "$pkgdir/usr/lib/xorg/modules/dri" install -m755 VBoxOGL*.so "$pkgdir/usr/lib" @@ -207,4 +210,5 @@ md5sums=('b4770ca14d1a8cbad9b3eb0e0028ff4b' 'ed1341881437455d9735875ddf455fbe' '94514e006e73cc2fa90259a4e0eec04b' '0f3f273cdbc54db221f737ad4f761c11' - '47da2e88de582bb2bab14580a3aa47b1') + '47da2e88de582bb2bab14580a3aa47b1' + '8a22b33c9dfaf8fb79bb2d26304e650b') diff --git a/core/crda/PKGBUILD b/core/crda/PKGBUILD index 4fbb20111..18a85717c 100644 --- a/core/crda/PKGBUILD +++ b/core/crda/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 79865 2010-05-08 15:22:52Z thomas $ +# $Id: PKGBUILD 117670 2011-04-04 15:42:36Z stephane $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=crda pkgver=1.1.1 -pkgrel=1 -pkgdesc="Central Regulatory Domain Agent" +pkgrel=3 +pkgdesc="Central Regulatory Domain Agent for wireless networks" arch=(i686 x86_64) url="http://wireless.kernel.org/en/developers/Regulatory/CRDA" license=('custom') @@ -17,17 +17,23 @@ md5sums=('5fc77af68b3e21736b8ef2f8b061c810' '014eef3f8655e9a130064ec6891317fc') build() { + msg "Compiling crda ..." + cd "${srcdir}"/${pkgname}-${pkgver} + sed 's|^#!/usr/bin/env python|#!/usr/bin/python2|' -i utils/key2pub.py + make crda regdbdump +} + +package() { # Install crda, regdbdump and udev rules - msg "Compiling and installing crda ..." - cd ${srcdir}/${pkgname}-${pkgver} - make crda regdbdump || return 1 - make DESTDIR=${pkgdir} install || return 1 + msg "Installing crda ..." + cd "${srcdir}"/${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install # This rule automatically sets the regulatory domain when cfg80211 is loaded - echo 'ACTION=="add" SUBSYSTEM=="module", DEVPATH=="/module/cfg80211", RUN+="/etc/rc.d/wireless-regdom start >/dev/null"' >> ${pkgdir}/lib/udev/rules.d/85-regulatory.rules || return 1 + echo 'ACTION=="add" SUBSYSTEM=="module", DEVPATH=="/module/cfg80211", RUN+="/etc/rc.d/wireless-regdom start >/dev/null"' >> "${pkgdir}"/lib/udev/rules.d/85-regulatory.rules msg "Installing license ..." - install -D -m644 ${srcdir}/${pkgname}-${pkgver}/LICENSE ${pkgdir}/usr/share/licenses/crda/LICENSE || return 1 + install -D -m644 "${srcdir}"/${pkgname}-${pkgver}/LICENSE "${pkgdir}"/usr/share/licenses/crda/LICENSE msg "Installing boot script ..." - install -D -m755 ${srcdir}/crda.rc ${pkgdir}/etc/rc.d/wireless-regdom || return 1 + install -D -m755 "${srcdir}"/crda.rc "${pkgdir}"/etc/rc.d/wireless-regdom } diff --git a/core/eventlog/ChangeLog b/core/eventlog/ChangeLog index f2f386dfe..d90a881d4 100644 --- a/core/eventlog/ChangeLog +++ b/core/eventlog/ChangeLog @@ -1,3 +1,8 @@ +2011-04-05 Stéphane Gaudreault <stephane@archlinux.org> + + * Rebuild of old package + * Tidy up PKGBUILD + 2010-07-10 Dan McGee <dan@archlinux.org> * Updated PKGBUILD to be in line with standard style diff --git a/core/eventlog/PKGBUILD b/core/eventlog/PKGBUILD index 36f657b40..638fe3703 100644 --- a/core/eventlog/PKGBUILD +++ b/core/eventlog/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 85218 2010-07-10 21:39:54Z dan $ +# $Id: PKGBUILD 118142 2011-04-05 15:32:10Z stephane $ # Maintainer: Eric Belanger <eric@archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=eventlog pkgver=0.2.12 -pkgrel=1 -pkgdesc="A new API to format and send structured log messages" +pkgrel=2 +pkgdesc="API to format and send structured log messages" arch=('i686' 'x86_64') url="http://www.balabit.com/support/community/products/" license=('BSD') @@ -17,13 +17,13 @@ md5sums=('3d6ebda8a161d36cb40d09328f78786b') sha1sums=('3e35a634e7de029ab9d36995a085bfcb00ed6a4d') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install - install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -D -m644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE } diff --git a/extra/audacity/PKGBUILD b/extra/audacity/PKGBUILD index b91871346..d5c42fd92 100644 --- a/extra/audacity/PKGBUILD +++ b/extra/audacity/PKGBUILD @@ -1,44 +1,34 @@ -# $Id: PKGBUILD 77505 2010-04-15 00:21:38Z dgriffiths $ -# Contributor: Eric Belanger <eric@archlinux.org> -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> -# Contributor: dorphell <dorphell@archlinux.org> -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> +# $Id: PKGBUILD 119629 2011-04-12 20:51:50Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=audacity -pkgver=1.3.12 -pkgrel=3 +pkgver=1.3.13 +pkgrel=1 pkgdesc="A program that lets you manipulate digital audio waveforms" arch=('i686' 'x86_64') url="http://audacity.sourceforge.net/" license=('GPL') -depends=('libvorbis' 'libmad' 'libid3tag' 'wxgtk' 'libsamplerate' 'lame' +depends=('libvorbis' 'libmad' 'libid3tag' 'wxgtk' 'libsamplerate' 'lame' 'hicolor-icon-theme' 'shared-mime-info' 'desktop-file-utils' 'redland' 'jack' 'soundtouch') -makedepends=('zip' 'python' 'pkgconfig') +makedepends=('zip') options=('!makeflags') -install=${pkgname}.install -source=(http://audacity.googlecode.com/files/${pkgname}-minsrc-${pkgver}-beta.tar.bz2 - audacity-ffmpeg.patch) -md5sums=('76996fec67181ca82ba191e012518b57' - '52cd58c39078d78a96e972df4c3c41f6') +install=audacity.install +source=(http://audacity.googlecode.com/files/${pkgname}-minsrc-${pkgver}-beta.tar.bz2) +md5sums=('57be7fadb8c8dd17b8462c7ac1561d03') build() { - cd ${srcdir}/${pkgname}-src-${pkgver}-beta - - patch -p0 < ${srcdir}/audacity-ffmpeg.patch || return 1 - - WX_CONFIG=/usr/bin/wx-config \ - ./configure --prefix=/usr \ - --with-portaudio=v19 --with-libsamplerate=system \ - --without-libresample --with-libmad=system \ - --with-id3tag=system --with-flac=system \ - --with-vorbis=system --with-libexpat=system \ - --with-libsndfile=system --with-soundtouch \ - --enable-unicode --without-taglib || return 1 - make || return 1 + cd "${srcdir}/${pkgname}-src-${pkgver}-beta" + WX_CONFIG=/usr/bin/wx-config ./configure --prefix=/usr \ + --with-portaudio --with-libsamplerate \ + --without-libresample --with-libmad \ + --with-id3tag --with-libflac \ + --with-vorbis --with-libexpat \ + --with-libsndfile --with-soundtouch \ + --enable-unicode --without-taglib + make } package() { - cd ${srcdir}/${pkgname}-src-${pkgver}-beta - - make DESTDIR=${pkgdir} install || return 1 + cd "${srcdir}/${pkgname}-src-${pkgver}-beta" + make DESTDIR="${pkgdir}" install } diff --git a/extra/audacity/audacity.install b/extra/audacity/audacity.install index 41f09f887..028c9f62a 100644 --- a/extra/audacity/audacity.install +++ b/extra/audacity/audacity.install @@ -1,6 +1,7 @@ post_install() { update-desktop-database -q update-mime-database usr/share/mime &> /dev/null + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor } post_upgrade() { diff --git a/extra/bitlbee/PKGBUILD b/extra/bitlbee/PKGBUILD index 6f63f350a..7da66f7f9 100644 --- a/extra/bitlbee/PKGBUILD +++ b/extra/bitlbee/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 118945 2011-04-09 14:35:19Z bisson $ +# $Id: PKGBUILD 119552 2011-04-12 06:10:02Z bisson $ # Contributor: FUBAR <mrfubar@gmail.com> # Contributor: simo <simo@archlinux.org> # Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org> @@ -7,12 +7,12 @@ pkgname=bitlbee pkgver=3.0.2 -pkgrel=2 +pkgrel=3 pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC' arch=('i686' 'x86_64') url='http://www.bitlbee.org/' license=('GPL') -depends=('gnutls' 'glib2' 'libotr') +depends=('openssl' 'glib2' 'libotr') optdepends=('xinetd: to run bitlbee through xinetd') source=("http://get.bitlbee.org/src/${pkgname}-${pkgver}.tar.gz" 'xinetd' @@ -33,7 +33,7 @@ build() { --ipcsocket=/var/run/bitlbee/bitlbee.sock \ --strip=0 \ --otr=1 \ - --ssl=gnutls + --ssl=openssl make } diff --git a/extra/bluedevil/PKGBUILD b/extra/bluedevil/PKGBUILD index eb2a7f48e..e9ecd65e2 100644 --- a/extra/bluedevil/PKGBUILD +++ b/extra/bluedevil/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 116735 2011-03-25 15:41:57Z andrea $ +# $Id: PKGBUILD 119634 2011-04-12 21:52:47Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=bluedevil -pkgver=1.0.3 +pkgver=1.0.4 pkgrel=1 pkgdesc='KDE bluetooth framework' arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ depends=('kdebase-workspace' 'libbluedevil' 'obex-data-server' 'obexd-client') makedepends=('cmake' 'automoc4') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('a2d4aa126f86dbc1f429a3aa9e95671d') +md5sums=('016e8b048bd834548a436fb0440667a9') build(){ cd ${srcdir} diff --git a/extra/cmus/PKGBUILD b/extra/cmus/PKGBUILD index b58abb66d..3a0709649 100644 --- a/extra/cmus/PKGBUILD +++ b/extra/cmus/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 111610 2011-02-27 20:41:37Z eric $ +# $Id: PKGBUILD 119600 2011-04-12 16:02:29Z eric $ # Maintainer: Aaron Griffin <aaron@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> pkgname=cmus -pkgver=2.3.4 -pkgrel=2 +pkgver=2.3.5 +pkgrel=1 pkgdesc="A very feature-rich ncurses-based music player" arch=('i686' 'x86_64') url="http://cmus.sourceforge.net/" @@ -23,8 +23,8 @@ optdepends=('alsa-lib: for ALSA output plugin support' 'libvorbis: for vorbis input plugin support' 'flac: for flac input plugin support') source=("http://downloads.sourceforge.net/$pkgname/$pkgname-v$pkgver.tar.bz2") -md5sums=('10629719fd0bff2d3c322ac24834af35') -sha1sums=('d980781c47937da6c3faf910043967e28b9450d6') +md5sums=('535a7567ee4cbfa2de8957907a649908') +sha1sums=('90892d3ba6dc466e453daa091b055c30236813e8') build() { cd "$srcdir/$pkgname-v$pkgver" diff --git a/extra/gnucash/PKGBUILD b/extra/gnucash/PKGBUILD index 21700489e..0f432f735 100644 --- a/extra/gnucash/PKGBUILD +++ b/extra/gnucash/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 114787 2011-03-16 02:24:49Z eric $ +# $Id: PKGBUILD 119590 2011-04-12 15:33:34Z eric $ # Maintainer: Aaron Griffin <aaron@archlinux.org> # Contributor: Mark Schneider <queueRAM@gmail.com> pkgname=gnucash -pkgver=2.4.4 +pkgver=2.4.5 pkgrel=1 pkgdesc="A personal and small-business financial-accounting application" arch=('i686' 'x86_64') url="http://www.gnucash.org" license=("GPL") depends=('gtkhtml' 'slib' 'goffice' 'guile' 'libofx' - 'libgnomeui' 'hicolor-icon-theme' 'libdbi' 'aqbanking' + 'libgnomeui' 'hicolor-icon-theme' 'libdbi-drivers' 'aqbanking' 'desktop-file-utils') makedepends=('intltool') optdepends=('evince: for print preview' @@ -20,8 +20,8 @@ optdepends=('evince: for print preview' options=('!libtool' '!makeflags') install=gnucash.install source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('6ae973bf925cde0721c7c465536bc096') -sha1sums=('016fccdfe5134783c95dcd5add5190270ade59f2') +md5sums=('94168fe959743fc342812ac3a01814a1') +sha1sums=('4f40b039ee8e9bcc15d49a8ed52bd7ef94bc8126') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/json-glib/PKGBUILD b/extra/json-glib/PKGBUILD index 5077ab4af..444c35cee 100644 --- a/extra/json-glib/PKGBUILD +++ b/extra/json-glib/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 105758 2011-01-11 14:11:29Z ibiru $ +# $Id: PKGBUILD 119567 2011-04-12 13:36:07Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=json-glib -pkgver=0.12.2 +pkgver=0.12.4 pkgrel=1 pkgdesc="JSON library built on GLib" arch=('i686' 'x86_64') @@ -10,13 +10,17 @@ url="http://live.gnome.org/JsonGlib" license=('GPL') depends=('glib2>=2.26.0') makedepends=('gobject-introspection') -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.12/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('89fa9b870dfe2d8b7b00210be76cdbb2d46a8d2cc77ca7cbe5d081bdf8cad780') options=('!libtool') +source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.12/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('462cd611016ae189d5e3f258dc7741e6a2e8267404b4e3806aaf346d50f1df7e') build(){ cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr make +} + +package(){ + cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install } diff --git a/extra/libtiff/PKGBUILD b/extra/libtiff/PKGBUILD index ed80a2bae..1624b2a52 100644 --- a/extra/libtiff/PKGBUILD +++ b/extra/libtiff/PKGBUILD @@ -1,9 +1,8 @@ -# $Id: PKGBUILD 83314 2010-06-20 21:43:27Z eric $ -# Maintainer: Eric Belanger <eric@archlinux.org> -# Contributor: dorphell <dorphell@archlinux.org> +# $Id: PKGBUILD 119577 2011-04-12 14:21:49Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=libtiff -pkgver=3.9.4 +pkgver=3.9.5 pkgrel=1 pkgdesc="Library for manipulation of TIFF images" arch=('i686' 'x86_64') @@ -13,20 +12,18 @@ depends=('libjpeg' 'zlib') makedepends=('libgl' 'freeglut' 'libxmu' 'libxi') optdepends=('freeglut: for using tiffgt') options=('!libtool') -source=(ftp://ftp.remotesensing.org/pub/libtiff/tiff-${pkgver}.tar.gz \ - libtiff-CVE-2009-2285.patch) -md5sums=('2006c1bdd12644dbf02956955175afd6' 'ff61077408727a82281f77a94f555e2a') -sha1sums=('a4e32d55afbbcabd0391a9c89995e8e8a19961de' 'eadce8c8bd72ea9c74f35300bf299131813b0c8b') +source=(ftp://ftp.remotesensing.org/pub/libtiff/tiff-${pkgver}.tar.gz) +md5sums=('8fc7ce3b4e1d0cc8a319336967815084') +sha1sums=('f40aab20fb2f609b5cbc1171c40b66a1445e3773') build() { cd "${srcdir}/tiff-${pkgver}" - patch -p1 < ../libtiff-CVE-2009-2285.patch || return 1 - ./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man || return 1 - make || return 1 + ./configure --prefix=/usr + make } package() { cd "${srcdir}/tiff-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 - install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" || return 1 + make DESTDIR="${pkgdir}" install + install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/mod_perl/PKGBUILD b/extra/mod_perl/PKGBUILD index 9e54317c0..b78666e9a 100644 --- a/extra/mod_perl/PKGBUILD +++ b/extra/mod_perl/PKGBUILD @@ -1,28 +1,27 @@ -# $Id: PKGBUILD 108488 2011-01-31 14:48:50Z angvp $ +# $Id: PKGBUILD 119582 2011-04-12 15:02:19Z angvp $ # Maintainer: Firmicus <francois.archlinux.org> # Contributor: Tom K <tomk@runbox.com> pkgname=mod_perl -_realname=mod_perl -pkgver=2.0.4 -pkgrel=11 +pkgver=2.0.5 +pkgrel=1 pkgdesc="Apache module that embeds the Perl interpreter within the server" url="http://search.cpan.org/dist/${_realname}/" depends=('perl=5.12.3' 'apache' 'db' 'apr-util') license=('APACHE') arch=('i686' 'x86_64') options=(!emptydirs) -source=(http://search.cpan.org/CPAN/authors/id/G/GO/GOZER/${_realname}-${pkgver}.tar.gz) -md5sums=('1a05625ae6843085f985f5da8214502a') +source=(http://search.cpan.org/CPAN/authors/id/P/PH/PHRED/${pkgname}-${pkgver}.tar.gz) +md5sums=('03d01d135a122bd8cebd0cd5b185d674') build() { - cd ${srcdir}/${_realname}-${pkgver} + cd ${srcdir}/${pkgname}-${pkgver} # install module in vendor directories. perl Makefile.PL INSTALLDIRS=vendor MP_APXS=/usr/sbin/apxs make } package() { - cd ${srcdir}/${_realname}-${pkgver} + cd ${srcdir}/${pkgname}-${pkgver} make install DESTDIR=${pkgdir} } diff --git a/extra/monodevelop/PKGBUILD b/extra/monodevelop/PKGBUILD index 423792e15..0566a975e 100644 --- a/extra/monodevelop/PKGBUILD +++ b/extra/monodevelop/PKGBUILD @@ -4,22 +4,25 @@ pkgname=monodevelop pkgver=2.4.2 -pkgrel=1 +pkgrel=2 pkgdesc="An IDE primarily designed for C# and other .NET languages" arch=('i686' 'x86_64') url="http://www.monodevelop.org" license=('GPL') -depends=('mono>=2.8.2' 'mono-addins>=0.5' 'gnome-sharp' 'gecko-sharp-2.0>=0.10' 'gnome-desktop-sharp') -options=(!makeflags force) +depends=('mono>=2.10.1' 'mono-addins>=0.5' 'gnome-sharp' 'gecko-sharp-2.0>=0.10') +options=(!makeflags) install=monodevelop.install -source=(http://ftp.novell.com/pub/mono/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('05d20deada26a115418cb1b4526b8d15') +source=(http://ftp.novell.com/pub/mono/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2 + monodevelop_gnome3.patch) +md5sums=('05d20deada26a115418cb1b4526b8d15' + 'fd011f41af212fe87fb9997ebf074188') build() { export MONO_SHARED_DIR=$srcdir/src/.wabi mkdir -p $MONO_SHARED_DIR cd $srcdir/$pkgname-$pkgver + patch -p1 < ${srcdir}/monodevelop_gnome3.patch || return 1 ./configure --prefix=/usr --disable-update-mimedb --disable-update-desktopdb make || return 1 } diff --git a/extra/monodevelop/monodevelop_gnome3.patch b/extra/monodevelop/monodevelop_gnome3.patch new file mode 100644 index 000000000..4ea101f6a --- /dev/null +++ b/extra/monodevelop/monodevelop_gnome3.patch @@ -0,0 +1,101 @@ +diff --git a/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Object.cs b/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Object.cs +index 4d8954c..e1a1937 100644 +--- a/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Object.cs ++++ b/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Object.cs +@@ -1,5 +1,6 @@ + using System; + using System.Collections; ++using System.Collections.Generic; + + namespace Stetic.Wrapper { + public abstract class Object : Stetic.ObjectWrapper { +@@ -11,17 +12,32 @@ namespace Stetic.Wrapper { + ((GLib.Object)Wrapped).RemoveNotification (NotifyHandler); + base.Dispose (); + } +- ++ ++ IEnumerable<string> GladePropertyNames { ++ get { ++ foreach (ItemGroup group in ClassDescriptor.ItemGroups) { ++ foreach (ItemDescriptor item in group) { ++ TypedPropertyDescriptor prop = item as TypedPropertyDescriptor; ++ if (prop != null && !string.IsNullOrEmpty (prop.GladeName)) { ++ yield return prop.GladeName; ++ } ++ } ++ } ++ } ++ } ++ + internal protected override void OnDesignerAttach (IDesignArea designer) + { + base.OnDesignerAttach (designer); +- ((GLib.Object)Wrapped).AddNotification (NotifyHandler); ++ foreach (string property in GladePropertyNames) ++ ((GLib.Object)Wrapped).AddNotification (property, NotifyHandler); + } + + internal protected override void OnDesignerDetach (IDesignArea designer) + { + base.OnDesignerDetach (designer); +- ((GLib.Object)Wrapped).RemoveNotification (NotifyHandler); ++ foreach (string property in GladePropertyNames) ++ ((GLib.Object)Wrapped).RemoveNotification (property, NotifyHandler); + } + + public static Object Lookup (GLib.Object obj) + +diff --git a/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandManager.cs b/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandManager.cs +index 89f04b5..75d7b17 100644 +--- a/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandManager.cs ++++ b/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandManager.cs +@@ -1540,22 +1540,39 @@ namespace MonoDevelop.Components.Commands + internal class ToolbarTracker + { + Gtk.IconSize lastSize; +- ++ + public void Track (Gtk.Toolbar toolbar) + { + lastSize = toolbar.IconSize; +- toolbar.AddNotification (OnToolbarPropChanged); ++ toolbar.AddNotification ("icon-size", IconSizeChanged); ++ toolbar.OrientationChanged += HandleToolbarOrientationChanged; ++ toolbar.StyleChanged += HandleToolbarStyleChanged; ++ + toolbar.Destroyed += delegate { +- toolbar.RemoveNotification (OnToolbarPropChanged); ++ toolbar.StyleChanged -= HandleToolbarStyleChanged; ++ toolbar.OrientationChanged -= HandleToolbarOrientationChanged; ++ toolbar.RemoveNotification ("icon-size", IconSizeChanged); + }; + } +- +- void OnToolbarPropChanged (object ob, GLib.NotifyArgs args) ++ ++ void HandleToolbarStyleChanged (object o, Gtk.StyleChangedArgs args) + { +- Gtk.Toolbar t = (Gtk.Toolbar) ob; +- if (lastSize != t.IconSize || args.Property == "orientation" || args.Property == "toolbar-style") ++ Gtk.Toolbar t = (Gtk.Toolbar) o; ++ if (lastSize != t.IconSize) + UpdateCustomItems (t); +- lastSize = t.IconSize; ++ } ++ ++ void HandleToolbarOrientationChanged (object o, Gtk.OrientationChangedArgs args) ++ { ++ Gtk.Toolbar t = (Gtk.Toolbar) o; ++ if (lastSize != t.IconSize) ++ UpdateCustomItems (t); ++ } ++ ++ void IconSizeChanged (object o, GLib.NotifyArgs args) ++ { ++ this.lastSize = ((Gtk.Toolbar) o).IconSize; ++ UpdateCustomItems ((Gtk.Toolbar) o); + } + + void UpdateCustomItems (Gtk.Toolbar t) + diff --git a/extra/nasm/PKGBUILD b/extra/nasm/PKGBUILD index fd0720e05..49b19633f 100644 --- a/extra/nasm/PKGBUILD +++ b/extra/nasm/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 102775 2010-12-11 05:11:43Z eric $ +# $Id: PKGBUILD 119611 2011-04-12 16:49:38Z eric $ # Maintainer: Aaron Griffin <aaron@archlinux.org> pkgbase=nasm pkgname=('nasm' 'nasm-doc') -pkgver=2.09.04 +pkgver=2.09.08 pkgrel=1 arch=('i686' 'x86_64') url="http://www.nasm.us" license=('BSD') makedepends=('ghostscript') source=(http://www.nasm.us/pub/nasm/releasebuilds/${pkgver}/${pkgbase}-${pkgver}.tar.bz2) -md5sums=('c11f083a501adae843d0bc3e7c106c73') -sha1sums=('87fb3f1d277f57cfd86408faa28685df0c887f59') +md5sums=('6abfa388a74ee47e163fdb30ecfd40f9') +sha1sums=('37ce7d945a41276eab255b061c88c2ad2f7979f6') build() { cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/extra/v86d/PKGBUILD b/extra/v86d/PKGBUILD index e1c3e78d2..033966009 100644 --- a/extra/v86d/PKGBUILD +++ b/extra/v86d/PKGBUILD @@ -1,38 +1,38 @@ -# $Id: PKGBUILD 102014 2010-12-03 22:27:43Z pierre $ +# $Id: PKGBUILD 119572 2011-04-12 13:37:13Z eric $ # Maintainer: Thomas Baechler <thomas@archlinux.org> -pkgname="v86d" -pkgver=0.1.9 -pkgrel=11 +pkgname=v86d +pkgver=0.1.10 +pkgrel=1 pkgdesc="userspace helper for uvesafb that runs x86 code in an emulated environment" +arch=('i686' 'x86_64') url="http://dev.gentoo.org/~spock/projects/uvesafb/" license=('GPL2') -arch=("i686" "x86_64") depends=('glibc') conflicts=('mkinitcpio<0.5.99') -backup=(etc/modprobe.d/uvesafb.conf) +backup=('etc/modprobe.d/uvesafb.conf') +options=('!makeflags') source=(http://dev.gentoo.org/~spock/projects/uvesafb/archive/v86d-$pkgver.tar.bz2 v86d v86d_hook modprobe.uvesafb) -md5sums=('ebbbc8e7013c9544b6ba6981add43831' +md5sums=('51c792ba7b874ad8c43f0d3da4cfabe0' '33f3131e7bf041ed6a67e92bff272f4c' '813958b8f6c75a7063e4858f31509694' '2d7cc8dc6a41916a13869212d0191147') -options=(!makeflags) build() { - cd $srcdir/v86d-$pkgver + cd "$srcdir/v86d-$pkgver" ./configure --with-x86emu # we only need /usr/include/video/uvesafb.h make KDIR=/usr } package() { - cd $srcdir/v86d-$pkgver - make DESTDIR=$pkgdir install + cd "$srcdir/v86d-$pkgver" + make DESTDIR="$pkgdir" install - install -D -m644 $srcdir/v86d $pkgdir/lib/initcpio/install/v86d - install -D -m644 $srcdir/v86d_hook $pkgdir/lib/initcpio/hooks/v86d - install -D -m644 $srcdir/modprobe.uvesafb $pkgdir/etc/modprobe.d/uvesafb.conf + install -D -m644 "$srcdir/v86d" "$pkgdir/lib/initcpio/install/v86d" + install -D -m644 "$srcdir/v86d_hook" "$pkgdir/lib/initcpio/hooks/v86d" + install -D -m644 "$srcdir/modprobe.uvesafb" "$pkgdir/etc/modprobe.d/uvesafb.conf" } diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD index 40ab855bc..6536aa6d9 100644 --- a/extra/vlc/PKGBUILD +++ b/extra/vlc/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 117111 2011-03-28 19:51:51Z ibiru $ +# $Id: PKGBUILD 119562 2011-04-12 10:29:49Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: Martin Sandsmark <martin.sandsmark@kde.org> pkgbase=vlc pkgname=('vlc' 'vlc-plugin') -pkgver=1.1.8 -pkgrel=2 +pkgver=1.1.9 +pkgrel=1 arch=('i686' 'x86_64') url="http://www.videolan.org/vlc/" license=('GPL') @@ -21,7 +21,7 @@ makedepends=('a52dec' 'fluidsynth' 'libmtp' 'libdvbpsi' 'lirc-utils' 'libraw1394' 'libdc1394' 'libavc1394' 'libva' 'libpulse') options=('!libtool') source=("http://download.videolan.org/pub/videolan/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.bz2") -md5sums=('c0065ec11b6fd12167cd440cbe0ef0d9') +md5sums=('06adb1848e6b87fbe1ced77ec0f91e4c') build() { cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/extra/xvidcore/PKGBUILD b/extra/xvidcore/PKGBUILD index 8b8438536..c4ab9c387 100644 --- a/extra/xvidcore/PKGBUILD +++ b/extra/xvidcore/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 111793 2011-03-01 00:12:59Z eric $ +# $Id: PKGBUILD 119595 2011-04-12 15:34:48Z eric $ # Maintainer: tobias <tobias@archlinux.org> # Contributor: Sarah Hay <sarah@archlinux.org> pkgname=xvidcore -pkgver=1.3.0 +pkgver=1.3.1 pkgrel=1 pkgdesc="XviD is an open source MPEG-4 video codec" arch=('i686' 'x86_64') @@ -12,8 +12,8 @@ url="http://www.xvid.org/" depends=('glibc') makedepends=('nasm') source=(http://downloads.xvid.org/downloads/${pkgname}-${pkgver}.tar.bz2) -md5sums=('22621243c4a588dcee599e77736309c2') -sha1sums=('3220e3feee2c92ae73169009a23c9ef929867bc7') +md5sums=('5b1c7032809bef6fa11eb3f4fbcf78e4') +sha1sums=('15acd3bbd4ddd39ffec7bc14f7cc2c9fe08e01c3') build() { cd "${srcdir}/${pkgname}/build/generic" diff --git a/testing/gedit/PKGBUILD b/testing/gedit/PKGBUILD index ea82388ee..5c07b6f2a 100644 --- a/testing/gedit/PKGBUILD +++ b/testing/gedit/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 117796 2011-04-04 17:57:21Z heftig $ +# $Id: PKGBUILD 119639 2011-04-12 22:52:16Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gedit -pkgver=3.0.0 +pkgver=3.0.1 pkgrel=1 pkgdesc="A text editor for GNOME" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ options=('!libtool' '!emptydirs') url="http://www.gnome.org" install=gedit.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('a3a14d2f239f43f043743bc526f89c84bfb1ce55096b7629f905947948959f5e') +sha256sums=('5a362f05325f4d47e31e5e9d3689a37d4a597e218965be9a39a193c847beaa87') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/testing/kdeplasma-applets-networkmanagement/PKGBUILD b/testing/kdeplasma-applets-networkmanagement/PKGBUILD index abfa541da..debe03a2f 100644 --- a/testing/kdeplasma-applets-networkmanagement/PKGBUILD +++ b/testing/kdeplasma-applets-networkmanagement/PKGBUILD @@ -3,8 +3,8 @@ # Contributor: Jakub Schmidtke <sjakub-at-gmail.com> pkgname=kdeplasma-applets-networkmanagement -pkgver=git20110407 -_commit=a2d35d4ec55fe6a5db209974a928482c662ac830 +pkgver=git20110412 +_commit=cbce07ca5b353cd2aadca260db856f595210afc9 pkgrel=1 pkgdesc="KDE control panel and widget network connections" arch=('i686' 'x86_64') @@ -14,12 +14,16 @@ depends=('kdebase-workspace' 'networkmanager') makedepends=('cmake' 'python2' 'automoc4' 'mobile-broadband-provider-info') optdepends=('mobile-broadband-provider-info: allow to add new mobile connection') install=${pkgname}.install -#source=("${pkgname}-${pkgver}.tar.gz"::"http://quickgit.kde.org/?p=networkmanagement.git&a=snapshot&h=${_commit}") -source=('ftp://ftp.archlinux.org/other/kde/networkmanagement-nm09.tar.bz2') -md5sums=('a853338f79bc75837e343c3820d1bb39') +source=("${pkgname}-${pkgver}.tar.gz"::"http://quickgit.kde.org/?p=networkmanagement.git&a=snapshot&h=${_commit}" + 'networkmanager09.patch') +md5sums=('501bbca6cf410c8b9df7af97da6a321d' + 'abb1c19a36653d85594b16ef60daca89') build() { - cd ${srcdir} + cd "${srcdir}/networkmanagement" + patch -Np1 -i "${srcdir}/networkmanager09.patch" + + cd "${srcdir}" mkdir build cd build cmake ../networkmanagement \ diff --git a/testing/kdeplasma-applets-networkmanagement/networkmanager09.patch b/testing/kdeplasma-applets-networkmanagement/networkmanager09.patch new file mode 100644 index 000000000..d209fc7d8 --- /dev/null +++ b/testing/kdeplasma-applets-networkmanagement/networkmanager09.patch @@ -0,0 +1,49 @@ +From 76001a795ed8f88d1aee317d71b7ae76384549d5 Mon Sep 17 00:00:00 2001 +From: Andrea Scarpino <andrea@archlinux.org> +Date: Tue, 12 Apr 2011 11:22:06 +0200 +Subject: [PATCH] build with Network Manager 0.9 + +--- + backends/NetworkManager/nmdbussettingsservice.cpp | 3 +++ + backends/NetworkManager/settings/gsmdbus.cpp | 4 ++-- + 2 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/backends/NetworkManager/nmdbussettingsservice.cpp b/backends/NetworkManager/nmdbussettingsservice.cpp +index 65e654e..035e7b0 100644 +--- a/backends/NetworkManager/nmdbussettingsservice.cpp ++++ b/backends/NetworkManager/nmdbussettingsservice.cpp +@@ -57,6 +57,9 @@ public: + QHash<QUuid, QDBusObjectPath> uuidToPath; + }; + ++#define NM_DBUS_SERVICE_USER_SETTINGS "org.freedesktop.NetworkManagerUserSettings" ++#define NM_DBUS_SERVICE_SYSTEM_SETTINGS "org.freedesktop.NetworkManagerSystemSettings" ++ + const QString NMDBusSettingsService::SERVICE_USER_SETTINGS = QLatin1String(NM_DBUS_SERVICE_USER_SETTINGS); + const QString NMDBusSettingsService::SERVICE_SYSTEM_SETTINGS = QLatin1String(NM_DBUS_SERVICE_SYSTEM_SETTINGS); + +diff --git a/backends/NetworkManager/settings/gsmdbus.cpp b/backends/NetworkManager/settings/gsmdbus.cpp +index 9912df6..eedf1ea 100644 +--- a/backends/NetworkManager/settings/gsmdbus.cpp ++++ b/backends/NetworkManager/settings/gsmdbus.cpp +@@ -35,7 +35,7 @@ void GsmDbus::fromMap(const QVariantMap & map) + if (map.contains(QLatin1String(NM_SETTING_GSM_NETWORK_TYPE))) { + setting->setNetworktype(map.value(QLatin1String(NM_SETTING_GSM_NETWORK_TYPE)).value<int>()); + } else { +- setting->setNetworktype(NM_GSM_NETWORK_ANY); ++ setting->setNetworktype(NM_SETTING_GSM_NETWORK_TYPE_ANY); + } + if (map.contains("band")) { + setting->setBand(map.value("band").value<int>()); +@@ -62,7 +62,7 @@ QVariantMap GsmDbus::toMap() + map.insert("apn", setting->apn()); + if (!setting->networkid().isEmpty()) + map.insert(QLatin1String(NM_SETTING_GSM_NETWORK_ID), setting->networkid()); +- if (setting->networktype() != NM_GSM_NETWORK_ANY) { ++ if (setting->networktype() != NM_SETTING_GSM_NETWORK_TYPE_ANY) { + map.insert(QLatin1String(NM_SETTING_GSM_NETWORK_TYPE), setting->networktype()); + } + +-- +1.7.4.4 + diff --git a/testing/kismet/PKGBUILD b/testing/kismet/PKGBUILD new file mode 100644 index 000000000..3333a8e22 --- /dev/null +++ b/testing/kismet/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 119587 2011-04-12 15:18:27Z angvp $ +# Contributer: Jason Chu <jason@archlinux.org> +# Maintainer: Juergen Hoetzel <jason@archlinux.org> + +pkgname=kismet +pkgver=2011_03_R2 +_realver="${pkgver//_/-}" +pkgrel=1 +pkgdesc="802.11b sniffing software" +arch=('i686' 'x86_64') +license=('GPL') +depends=('gmp' 'imagemagick' 'libpcap>=1.0.0' 'ncurses' 'dbus' 'libjpeg>=7') +optdepends=(perl-libwww) +url="http://www.kismetwireless.net/" +backup=('etc/kismet.conf' 'etc/kismet_drone.conf') +options=('!makeflags') +source=(http://www.kismetwireless.net/code/kismet-${pkgver//_/-}.tar.gz) +md5sums=('8bf077e8111e6dc8c12cadefdf40aadd') + +build() { + cd "$srcdir/kismet-$_realver" + + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var + + make dep + make + sed -i 's/prism2/wlanng/g' conf/kismet.conf + make DESTDIR="$pkgdir" install + + chown root:root "$pkgdir"/usr/share/man/man{1,5}/* + + install -D -m 644 "$srcdir/kismet-$_realver/README" "$pkgdir/usr/share/kismet/README" + + # Fix the *.conf unexpanded ${prefix} problems + sed -i 's%\${prefix}%/usr%' "$pkgdir"/etc/*.conf +} diff --git a/testing/kismet/kismet-2008-05-R1-infinite-loop.diff b/testing/kismet/kismet-2008-05-R1-infinite-loop.diff new file mode 100644 index 000000000..f8417943e --- /dev/null +++ b/testing/kismet/kismet-2008-05-R1-infinite-loop.diff @@ -0,0 +1,20 @@ +--- gpsmap.cc ++++ gpsmap.cc +@@ -874,7 +874,7 @@ + + // Break up the path to the gpsxml file and form a path based on that + unsigned int lastslash = 0; +- for (unsigned int x = origxmlfile.find('/'); x != string::npos; ++ for (string::size_type x = origxmlfile.find('/'); x != string::npos; + lastslash = x, x = origxmlfile.find('/', lastslash+1)) { + // We don't actually need to do anything... + } +@@ -882,7 +882,7 @@ + comp = origxmlfile.substr(0, lastslash); + + lastslash = 0; +- for (unsigned int x = orignetfile.find('/'); x != string::npos; ++ for (string::size_type x = orignetfile.find('/'); x != string::npos; + lastslash = x, x = orignetfile.find('/', lastslash+1)) { + // We don't actually need to do anything... + } diff --git a/testing/kismet/kismet-build.patch b/testing/kismet/kismet-build.patch new file mode 100644 index 000000000..9935ca4fa --- /dev/null +++ b/testing/kismet/kismet-build.patch @@ -0,0 +1,11 @@ +--- macaddr.h.orig 2009-07-08 02:29:38.000000000 -0400 ++++ macaddr.h 2009-07-08 02:37:54.000000000 -0400 +@@ -73,7 +73,7 @@ + longmac |= (uint64_t) bs_in[5] << ((MAC_LEN - 5 - 1) * 8); + + // If it has a mask component, get that +- char *in_mask = strchr(in, '/'); ++ const char *in_mask = strchr(in, '/'); + if (in_mask != NULL) { + longmask = 0; + diff --git a/testing/mesa/PKGBUILD b/testing/mesa/PKGBUILD index 5b4bd68c4..6ffa54f19 100644 --- a/testing/mesa/PKGBUILD +++ b/testing/mesa/PKGBUILD @@ -1,28 +1,28 @@ -# $Id: PKGBUILD 119075 2011-04-10 20:11:41Z ibiru $ +# $Id: PKGBUILD 119610 2011-04-12 16:23:12Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase=mesa pkgname=('mesa' 'libgl' 'libgles' 'libegl' 'ati-dri' 'intel-dri' 'unichrome-dri' 'mach64-dri' 'mga-dri' 'r128-dri' 'savage-dri' 'sis-dri' 'tdfx-dri' 'nouveau-dri') -#_git=true -_git=false +_git=true +#_git=false if [ "${_git}" = "true" ]; then - pkgver=7.10.0.git20110215 + pkgver=7.10.99.git20110412 else pkgver=7.10.2 fi -pkgrel=2 +pkgrel=1 arch=('i686' 'x86_64') -makedepends=('glproto>=1.4.12' 'pkgconfig' 'libdrm>=2.4.23' 'libxxf86vm>=1.1.0' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.3.5' 'libxt>=1.0.8' +makedepends=('glproto>=1.4.12' 'pkgconfig' 'libdrm>=2.4.25' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.4.3' 'libxt>=1.1.1' 'gcc-libs>=4.5' 'dri2proto=2.3' 'python2' 'libxml2' 'imake') url="http://mesa3d.sourceforge.net" license=('custom') source=(LICENSE gnome-shell-shader-fix.patch nouveau-fix-header.patch) if [ "${_git}" = "true" ]; then - # mesa git shot from 7.10 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?h=7.10&id=cc1636b6db85604510f97f8a37d7fd0ecf453866 - source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-cc1636b6db85604510f97f8a37d7fd0ecf453866.tar.bz2') + # mesa git shot from 7.11 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f05751aa2af1a8ec83c2d110385aab1b7e735238 + source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-f05751aa2af1a8ec83c2d110385aab1b7e735238.tar.bz2') else source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2" ) @@ -30,7 +30,7 @@ fi md5sums=('5c65a0fe315dd347e09b1f2826a1df5a' '3ec78f340f9387abd7a37b195e764cbf' '67c87b77cc2236b52a3b47dad3fbb5d4' - 'f5de82852f1243f42cc004039e10b771') + '56d8862d1155f7e8054f9aa7f93ebebc') build() { if [ "${_git}" = "true" ]; then @@ -40,10 +40,12 @@ if [ "${_git}" = "true" ]; then cd "${srcdir}/Mesa-${pkgver}" fi +if [ "${_git}" != "true" ]; then #backport from master to fix gnome-shell shader #https://bugs.freedesktop.org/show_bug.cgi?id=35714 patch -Np1 -i "${srcdir}/gnome-shell-shader-fix.patch" patch -Np1 -i "${srcdir}/nouveau-fix-header.patch" +fi if [ "${_git}" = "true" ]; then ./autogen.sh --prefix=/usr \ @@ -83,7 +85,7 @@ fi } package_libgl() { - depends=('libdrm>=2.4.22' 'libxxf86vm>=1.1.0' 'libxdamage>=1.1.3' 'expat>=2.0.1') + depends=('libdrm>=2.4.25' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1') pkgdesc="Mesa 3-D graphics library and DRI software rasterizer" if [ "${_git}" = "true" ]; then @@ -145,7 +147,6 @@ if [ "${_git}" = "true" ]; then cd "${srcdir}/Mesa-${pkgver}" fi install -m755 -d "${pkgdir}/usr/lib" - install -m755 -d "${pkgdir}/usr/lib/egl" install -m755 -d "${pkgdir}/usr/lib/pkgconfig" install -m755 -d "${pkgdir}/usr/include" install -m755 -d "${pkgdir}/usr/include/" @@ -155,7 +156,10 @@ fi install -m755 -d "${pkgdir}/usr/share/doc" install -m755 -d "${pkgdir}/usr/share/doc/libegl" bin/minstall lib/libEGL.so* "${pkgdir}/usr/lib/" +if [ "${_git}" != "true" ]; then + install -m755 -d "${pkgdir}/usr/lib/egl" bin/minstall lib/egl/* "${pkgdir}/usr/lib/egl/" +fi bin/minstall src/egl/main/egl.pc "${pkgdir}/usr/lib/pkgconfig/" bin/minstall include/EGL/* "${pkgdir}/usr/include/EGL/" bin/minstall include/KHR/khrplatform.h "${pkgdir}/usr/include/KHR/" @@ -165,7 +169,7 @@ fi install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libegl/" } package_mesa() { - depends=('libgl' 'libx11>=1.3.5' 'libxt>=1.0.8' 'gcc-libs>=4.5' 'dri2proto=2.3' 'libdrm>=2.4.22' 'glproto>=1.4.12') + depends=('libgl' 'libx11>=1.4.3' 'libxt>=1.1.1' 'gcc-libs>=4.5' 'dri2proto=2.3' 'libdrm>=2.4.25' 'glproto>=1.4.12') optdepends=('opengl-man-pages: for the OpenGL API man pages') pkgdesc="Mesa 3-D graphics libraries and include files" diff --git a/testing/sqlite3/PKGBUILD b/testing/sqlite3/PKGBUILD new file mode 100644 index 000000000..3a3002598 --- /dev/null +++ b/testing/sqlite3/PKGBUILD @@ -0,0 +1,72 @@ +# $Id: PKGBUILD 119626 2011-04-12 20:36:36Z andyrtr $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> +# Contributor: Tom Newsom <Jeepster@gmx.co.uk> + +pkgbase="sqlite3" +pkgname=('sqlite3' 'sqlite3-tcl' 'sqlite3-doc') +_amalgamationver=3070600 +_amalgamationver2=${_amalgamationver/00/} +pkgver=${_amalgamationver2//0/.} +pkgrel=1 +pkgdesc="A C library that implements an SQL database engine" +arch=('i686' 'x86_64') +license=('custom') +url="http://www.sqlite.org/" +makedepends=('tcl' 'readline>=6.0.00') +source=( # tarball containing the amalgamation for SQLite 3.7.5 together with a configure script and makefile for building it; includes now also the Tcl Extension Architecture (TEA) + http://www.sqlite.org/sqlite-autoconf-$_amalgamationver.tar.gz + http://www.sqlite.org/sqlite-doc-${_amalgamationver}.zip + license.txt) +options=('!libtool' '!emptydirs') +md5sums=('8e1764574dbddb6be675c79bcfcc304d' + '1c9b9da6f98f1da2d8958254662c393c' + 'c1cdbc5544034d9012e421e75a5e4890') + +build() { + export CFLAGS="$CFLAGS -DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE" + + # build sqlite + cd "$srcdir"/sqlite-autoconf-$_amalgamationver + ./configure --prefix=/usr \ + --disable-static + make + + # build the tcl extension + cd "$srcdir"/sqlite-autoconf-$_amalgamationver/tea + ./configure --prefix=/usr \ + --with-system-sqlite + make + +} + +package_sqlite3() { + + pkgdesc="A C library that implements an SQL database engine" + depends=('readline>=6.0.00') + conflicts=('sqlite') + replaces=('sqlite') + + cd ${srcdir}/sqlite-autoconf-$_amalgamationver + make DESTDIR=${pkgdir} install + + # license + install -D -m644 ${srcdir}/license.txt ${pkgdir}/usr/share/licenses/${pkgname}/license.txt +} + +package_sqlite3-tcl() { + + pkgdesc="sqlite3 Tcl Extension Architecture (TEA)" + depends=('sqlite3>=3.7.5') + + cd ${srcdir}/sqlite-autoconf-$_amalgamationver/tea + make DESTDIR=${pkgdir} install +} + +package_sqlite3-doc() { + pkgdesc="most of the static HTML files that comprise this website, including all of the SQL Syntax and the C/C++ interface specs and other miscellaneous documentation" + #arch=('any') - not yet supported + + cd ${srcdir}/sqlite-doc-${_amalgamationver} + mkdir -p ${pkgdir}/usr/share/doc/${pkgbase} + cp -R * ${pkgdir}/usr/share/doc/${pkgbase}/ +} diff --git a/testing/sqlite3/license.txt b/testing/sqlite3/license.txt new file mode 100644 index 000000000..118c5d5e6 --- /dev/null +++ b/testing/sqlite3/license.txt @@ -0,0 +1,33 @@ +SQLite Copyright +SQLite is in the +Public Domain + + +All of the deliverable code in SQLite has been dedicated to the public domain by the authors. All code authors, and representatives of the companies they work for, have signed affidavits dedicating their contributions to the public domain and originals of those signed affidavits are stored in a firesafe at the main offices of Hwaci. Anyone is free to copy, modify, publish, use, compile, sell, or distribute the original SQLite code, either in source code form or as a compiled binary, for any purpose, commercial or non-commercial, and by any means. + +The previous paragraph applies to the deliverable code in SQLite - those parts of the SQLite library that you actually bundle and ship with a larger application. Portions of the documentation and some code used as part of the build process might fall under other licenses. The details here are unclear. We do not worry about the licensing of the documentation and build code so much because none of these things are part of the core deliverable SQLite library. + +All of the deliverable code in SQLite has been written from scratch. No code has been taken from other projects or from the open internet. Every line of code can be traced back to its original author, and all of those authors have public domain dedications on file. So the SQLite code base is clean and is uncontaminated with licensed code from other projects. +Obtaining An Explicit License To Use SQLite + +Even though SQLite is in the public domain and does not require a license, some users want to obtain a license anyway. Some reasons for obtaining a license include: +You are using SQLite in a jurisdiction that does not recognize the public domain. +You are using SQLite in a jurisdiction that does not recognize the right of an author to dedicate their work to the public domain. +You want to hold a tangible legal document as evidence that you have the legal right to use and distribute SQLite. +Your legal department tells you that you have to purchase a license. + +If you feel like you really have to purchase a license for SQLite, Hwaci, the company that employs the architect and principal developers of SQLite, will sell you one. +Contributed Code + +In order to keep SQLite completely free and unencumbered by copyright, all new contributors to the SQLite code base are asked to dedicate their contributions to the public domain. If you want to send a patch or enhancement for possible inclusion in the SQLite source tree, please accompany the patch with the following statement: +The author or authors of this code dedicate any and all copyright interest in this code to the public domain. We make this dedication for the benefit of the public at large and to the detriment of our heirs and successors. We intend this dedication to be an overt act of relinquishment in perpetuity of all present and future rights to this code under copyright law. + +We are not able to accept patches or changes to SQLite that are not accompanied by a statement such as the above. In addition, if you make changes or enhancements as an employee, then a simple statement such as the above is insufficient. You must also send by surface mail a copyright release signed by a company officer. A signed original of the copyright release should be mailed to: +Hwaci +6200 Maple Cove Lane +Charlotte, NC 28269 +USA + +A template copyright release is available in PDF or HTML. You can use this release to make future changes. + +see http://www.sqlite.org/copyright.html
\ No newline at end of file |