diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-08-03 13:36:36 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-08-03 13:36:36 -0300 |
| commit | 8c1cd392b43a7018099ce64f9359b76c2de14640 (patch) | |
| tree | b3c0d54454025b6bc478768a07b9cf7bdcca2289 /community | |
| parent | 5a01c45ea1ee67df43e376e2e4aa1833edd2ff30 (diff) | |
| parent | 991d38faccf4e1fb27f31f236ad58ee840103734 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/apvlv/PKGBUILD
community/i3-wm/PKGBUILD
community/jack2/PKGBUILD
community/perl-list-moreutils/PKGBUILD
community/qc-usb-messenger/PKGBUILD
community/sword/PKGBUILD
community/virtualbox/PKGBUILD
community/vuze/PKGBUILD
extra/archboot/PKGBUILD
extra/ardour/PKGBUILD
extra/boost/PKGBUILD
extra/digikam/PKGBUILD
extra/jack/PKGBUILD
extra/kdebase-konsole/PKGBUILD
extra/kdebase-runtime/PKGBUILD
extra/kdebindings-kimono/PKGBUILD
extra/kdebindings-korundum/PKGBUILD
extra/kdebindings-kross/PKGBUILD
extra/kdebindings-perlkde/PKGBUILD
extra/kdebindings-perlqt/PKGBUILD
extra/kdebindings-python/PKGBUILD
extra/kdebindings-qtruby/PKGBUILD
extra/kdebindings-qyoto/PKGBUILD
extra/kdebindings-smokegen/PKGBUILD
extra/kdebindings-smokekde/PKGBUILD
extra/kdebindings-smokeqt/PKGBUILD
extra/kdebindings/PKGBUILD
extra/kdeedu-blinken/PKGBUILD
extra/kdeedu-blinken/kdeedu-blinken.install
extra/kdeedu-cantor/PKGBUILD
extra/kdeedu-cantor/kdeedu-cantor.install
extra/kdeedu-kalgebra/PKGBUILD
extra/kdeedu-kalgebra/kdeedu-kalgebra.install
extra/kdeedu-kalzium/PKGBUILD
extra/kdeedu-kalzium/kdeedu-kalzium.install
extra/kdeedu-kanagram/PKGBUILD
extra/kdeedu-kanagram/kdeedu-kanagram.install
extra/kdeedu-kbruch/PKGBUILD
extra/kdeedu-kbruch/kdeedu-kbruch.install
extra/kdeedu-kgeography/PKGBUILD
extra/kdeedu-kgeography/kdeedu-kgeography.install
extra/kdeedu-khangman/PKGBUILD
extra/kdeedu-khangman/kdeedu-khangman.install
extra/kdeedu-kig/PKGBUILD
extra/kdeedu-kig/kdeedu-kig.install
extra/kdeedu-kiten/PKGBUILD
extra/kdeedu-kiten/kdeedu-kiten.install
extra/kdeedu-klettres/PKGBUILD
extra/kdeedu-klettres/kdeedu-klettres.install
extra/kdeedu-kmplot/PKGBUILD
extra/kdeedu-kmplot/kdeedu-kmplot.install
extra/kdeedu-kstars/PKGBUILD
extra/kdeedu-kstars/kdeedu-kstars.install
extra/kdeedu-ktouch/PKGBUILD
extra/kdeedu-ktouch/kdeedu-ktouch.install
extra/kdeedu-kturtle/PKGBUILD
extra/kdeedu-kturtle/kdeedu-kturtle.install
extra/kdeedu-kwordquiz/PKGBUILD
extra/kdeedu-kwordquiz/kdeedu-kwordquiz.install
extra/kdeedu-marble/PKGBUILD
extra/kdeedu-marble/gpsd-2.96.patch
extra/kdeedu-marble/kdeedu-marble.install
extra/kdeedu-parley/PKGBUILD
extra/kdeedu-parley/kdeedu-parley.install
extra/kdeedu-rocs/PKGBUILD
extra/kdeedu-step/PKGBUILD
extra/kdeedu-step/kdeedu-step.install
extra/kdegraphics-gwenview/PKGBUILD
extra/kdegraphics-gwenview/kdegraphics-gwenview.install
extra/kdegraphics-kamera/PKGBUILD
extra/kdegraphics-kcolorchooser/PKGBUILD
extra/kdegraphics-kcolorchooser/kdegraphics-kcolorchooser.install
extra/kdegraphics-kgamma/PKGBUILD
extra/kdegraphics-kolourpaint/PKGBUILD
extra/kdegraphics-kolourpaint/kdegraphics-kolourpaint.install
extra/kdegraphics-kruler/PKGBUILD
extra/kdegraphics-kruler/kdegraphics-kruler.install
extra/kdegraphics-ksaneplugin/PKGBUILD
extra/kdegraphics-ksnapshot/PKGBUILD
extra/kdegraphics-ksnapshot/kdegraphics-ksnapshot.install
extra/kdegraphics-okular/PKGBUILD
extra/kdegraphics-okular/kdegraphics-okular.install
extra/kdegraphics-strigi-analyzer/PKGBUILD
extra/kdegraphics-svgpart/PKGBUILD
extra/kdegraphics-thumbnailers/PKGBUILD
extra/kdegraphics/PKGBUILD
extra/kdelibs/PKGBUILD
extra/kdemultimedia/PKGBUILD
extra/kdepim-runtime/PKGBUILD
extra/kdeplasma-addons/PKGBUILD
extra/kdesdk-kate/PKGBUILD
extra/kdesdk-kate/kdebase-kwrite.install
extra/kdesdk-kate/kdesdk-kate.install
extra/kdesdk-kate/pkgbuild-syntax-highlight.patch
extra/kdeutils/PKGBUILD
extra/kipi-plugins/PKGBUILD
extra/koffice/PKGBUILD
extra/konq-plugins/PKGBUILD
extra/libkdcraw/PKGBUILD
extra/libkdcraw/libkdcraw.install
extra/libkdeedu/PKGBUILD
extra/libkdeedu/libkdeedu.install
extra/libkexiv2/PKGBUILD
extra/libkipi/PKGBUILD
extra/libkipi/libkipi.install
extra/libksane/PKGBUILD
extra/libksane/libksane.install
extra/liblrdf/PKGBUILD
extra/maxima/PKGBUILD
extra/mysql/PKGBUILD
extra/partitionmanager/PKGBUILD
extra/pygobject/PKGBUILD
extra/samba/PKGBUILD
extra/sbcl/PKGBUILD
extra/texlive-bin/PKGBUILD
kde-unstable/kdebase-workspace/PKGBUILD
multilib-testing/lib32-mesa/PKGBUILD
multilib/lib32-freetype2/PKGBUILD
multilib/lib32-jack/PKGBUILD
multilib/lib32-libsndfile/PKGBUILD
testing/mesa/PKGBUILD
~fauno/notmuch/PKGBUILD
Diffstat (limited to 'community')
132 files changed, 1156 insertions, 1028 deletions
diff --git a/community/alure/PKGBUILD b/community/alure/PKGBUILD index 12bc6606a..a7aac2f8b 100644 --- a/community/alure/PKGBUILD +++ b/community/alure/PKGBUILD @@ -2,12 +2,12 @@ # Contributor: Markus Martin <markus@archwyrm.net> pkgname=alure -pkgver=1.1 -pkgrel=3 +pkgver=1.2 +pkgrel=1 pkgdesc='Utility library to help manage common tasks with OpenAL applications.' arch=('i686' 'x86_64' 'mips64el') url='http://kcat.strangesoft.net/alure.html' -license=('LGPL') +license=('MIT') depends=('openal') makedepends=('cmake' 'libsndfile' 'libvorbis' 'flac' 'mpg123' 'dumb' 'fluidsynth') optdepends=('libsndfile: for uncompressed audio support' @@ -17,7 +17,7 @@ optdepends=('libsndfile: for uncompressed audio support' 'dumb: for IT, XM, S3M and MOD support' 'fluidsynth: for SoundFont 2 support') source=("http://kcat.strangesoft.net/alure-releases/${pkgname}-${pkgver}.tar.bz2") -md5sums=('a2f6934d3783c8478c460965a13e4e12') +md5sums=('3088aba074ad02d95ea51e705053b9f5') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -28,5 +28,8 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + install -Dm0644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } diff --git a/community/apvlv/PKGBUILD b/community/apvlv/PKGBUILD index 1cdc7680c..3e6844dd2 100644 --- a/community/apvlv/PKGBUILD +++ b/community/apvlv/PKGBUILD @@ -1,27 +1,25 @@ -# $Id: PKGBUILD 41378 2011-03-05 14:39:13Z lcarlier $ +# $Id: PKGBUILD 52879 2011-07-29 15:22:56Z shusmann $ # Maintainer: Brad Fanella <bradfanella@archlinux.us> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> # Contributor: tocer.deng <tocer.deng@gmail.com> pkgname=apvlv -pkgver=0.1.1 +pkgver=0.1.2 pkgrel=1 pkgdesc="A PDF Viewer which behaves like Vim" arch=('i686' 'x86_64' 'mips64el') -url="http://code.google.com/p/apvlv/" +url="http://naihe2010.github.com/apvlv/" license=('GPL') -depends=('poppler-glib' 'libdjvu') -makedepends=('cmake') -source=(http://apvlv.googlecode.com/files/$pkgname-${pkgver}-Source.tar.gz - apvlv-poppler015.patch) -md5sums=('221b25fd34ebf398047424459d8e5131' - '809aea91e13032663d6533892757891a') +depends=('poppler-glib' 'djvulibre') +source=(https://github.com/downloads/naihe2010/$pkgname/$pkgname-${pkgver}-Source.tar.gz apvlv-poppler015.patch) +md5sums=('381d83aa9c253fac5e0be165fca39222' + '308b17a563ed470ea47d408f324ab745') + +makedepends=('cmake') build() { cd $srcdir/$pkgname-$pkgver-Source - - patch -Np0 -i $srcdir/apvlv-poppler015.patch - + patch -Np1 -i $srcdir/apvlv-poppler015.patch mkdir -p build cd build @@ -30,7 +28,6 @@ build() { -DAPVLV_WITH_UMD=no .. make } - package() { cd $srcdir/$pkgname-$pkgver-Source/build diff --git a/community/apvlv/apvlv-poppler015.patch b/community/apvlv/apvlv-poppler015.patch index 96cb099a6..0a261b1db 100644 --- a/community/apvlv/apvlv-poppler015.patch +++ b/community/apvlv/apvlv-poppler015.patch @@ -1,12 +1,12 @@ -diff -aur src/ApvlvFile.cpp.orig src/ApvlvFile.cpp ---- src/ApvlvFile.cpp.orig 2010-09-14 07:28:44.000000000 +0100 -+++ src/ApvlvFile.cpp 2010-10-29 22:29:21.128949529 +0100 -@@ -275,7 +275,7 @@ - { - PopplerRectangle rect = { x1, y1, x2, y2 }; - PopplerPage *page = poppler_document_get_page (mDoc, pn); -- *out = poppler_page_get_text (page, POPPLER_SELECTION_WORD, &rect); -+ *out = poppler_page_get_selected_text (page, POPPLER_SELECTION_WORD, &rect); - if (*out != NULL) - { - return true; +diff -Naur apvlv-0.1.2-Source.orig//src/ApvlvFile.cpp apvlv-0.1.2-Source.new//src/ApvlvFile.cpp +--- apvlv-0.1.2-Source.orig//src/ApvlvFile.cpp 2011-07-29 17:19:13.000000000 +0200 ++++ apvlv-0.1.2-Source.new//src/ApvlvFile.cpp 2011-07-29 17:22:22.000000000 +0200 +@@ -304,7 +304,7 @@ + { + PopplerRectangle rect = { x1, y1, x2, y2 }; + PopplerPage *page = poppler_document_get_page (mDoc, pn); +- *out = poppler_page_get_text (page, POPPLER_SELECTION_WORD, &rect); ++ *out = poppler_page_get_selected_text (page, POPPLER_SELECTION_WORD, &rect); + if (*out != NULL) + { + return true; diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD index a6a9e26e7..5b904acd8 100644 --- a/community/calibre/PKGBUILD +++ b/community/calibre/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 52347 2011-07-23 19:30:29Z giovanni $ +# $Id: PKGBUILD 52910 2011-07-29 19:53:49Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Petrov Roman <nwhisper@gmail.com> # Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com> pkgname=calibre -pkgver=0.8.11 +pkgver=0.8.12 pkgrel=1 pkgdesc="Ebook management application" arch=('i686' 'x86_64') url="http://calibre-ebook.com/" license=('GPL3') -depends=('python-dateutil' 'python2-cssutils' 'python2-cherrypy' +depends=('python2-dateutil' 'python2-cssutils' 'python2-cherrypy' 'python-mechanize' 'podofo' 'libwmf' 'python-beautifulsoup' 'imagemagick' 'poppler-qt' 'chmlib' 'python-lxml' 'libusb' 'python-imaging' 'desktop-file-utils' 'shared-mime-info' @@ -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=('984e29b0b1e7d3f6efe587b902a70a32' +md5sums=('03060d381cc3090fc42d5a646f926afe' '253ce4fe5d01f8ff76b63cd3825755ea') build() { diff --git a/community/cclive/PKGBUILD b/community/cclive/PKGBUILD index a27958fb2..9e0b345b7 100644 --- a/community/cclive/PKGBUILD +++ b/community/cclive/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 52380 2011-07-24 03:47:58Z dreisner $ +# $Id: PKGBUILD 52534 2011-07-26 04:19:55Z svenstaro $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: joyfulgirl@archlinux.us # Contributor: nathan owe ndowens04 at gmail dot com pkgname=cclive pkgver=0.7.4.1 -pkgrel=1 +pkgrel=2 pkgdesc='Commandline downloader for popular video websites.' arch=('i686' 'x86_64' 'mips64el') url='http://cclive.sourceforge.net/' diff --git a/community/cgit/PKGBUILD b/community/cgit/PKGBUILD index e69522fbe..6d0e9535f 100644 --- a/community/cgit/PKGBUILD +++ b/community/cgit/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 50113 2011-06-24 20:01:46Z spupykin $ +# $Id: PKGBUILD 52856 2011-07-29 11:59:24Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Current Maintainer: Patrick Palka <patrick@parcs.ath.cx> # Previous Maintainer: Loui Chang <louipc.ist at gmail com> @@ -6,7 +6,7 @@ # Development: http://closure.ath.cx/aur-dev pkgname=cgit -pkgver=0.9.0.1 +pkgver=0.9.0.2 pkgrel=1 pkgdesc="A web interface for git written in plain C" arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +16,7 @@ depends=('openssl') makedepends=('git' 'zlib' 'curl' 'asciidoc') install=cgit.install source=("http://hjemli.net/git/cgit/snapshot/$pkgname-$pkgver.tar.bz2") -md5sums=('dddae5bcfc1eeb469fc2b95531a75c1c') +md5sums=('5b92b07e0107ff24a783adfb8c0cd1f2') build() { cd "$pkgname-$pkgver" diff --git a/community/clanlib/PKGBUILD b/community/clanlib/PKGBUILD index 090fdea53..ecf47ffe7 100644 --- a/community/clanlib/PKGBUILD +++ b/community/clanlib/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 49101 2011-06-11 03:15:22Z svenstaro $ +# $Id: PKGBUILD 52518 2011-07-26 00:31:17Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> pkgname=clanlib -pkgver=2.2.9 +pkgver=2.2.10 pkgrel=1 pkgdesc="A multi-platform game development library." arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ depends=('alsa-lib' 'libjpeg' 'libmikmod' 'libpng' 'libvorbis' 'libxi' 'libxmu' makedepends=('doxygen' 'graphviz') options=('!libtool') source=(http://clanlib.org/download/releases-2.0/ClanLib-${pkgver}.tgz) -md5sums=('321886420efa0263e6f6273057b5d6df') +md5sums=('61b7200ba8b895fc480850f4721dbc14') build() { cd ${srcdir}/ClanLib-${pkgver} diff --git a/community/darktable/PKGBUILD b/community/darktable/PKGBUILD index 6b587a5ae..2bbbb43d2 100644 --- a/community/darktable/PKGBUILD +++ b/community/darktable/PKGBUILD @@ -1,23 +1,24 @@ -# $Id: PKGBUILD 50957 2011-07-03 16:56:44Z spupykin $ +# $Id: PKGBUILD 52709 2011-07-27 22:06:23Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Christian Himpel <chressie at gmail dot com> # Contributor: Johannes Hanika <hanatos at gmail dot com> pkgname=darktable -pkgver=0.9 +pkgver=0.9.1 +_pkgver=0.9 pkgrel=1 pkgdesc="Utility to organize and develop raw images" arch=('i686' 'x86_64' 'mips64el') url=http://darktable.sf.net/ license=('GPL3') depends=('exiv2>=0.18' 'gconf>=2.26' 'intltool>=0.40' 'lcms2' 'lensfun>=0.2.3' 'libglade' - 'curl' 'libgnome-keyring' 'libgphoto2' 'libusb-compat' 'openexr') + 'curl' 'libgnome-keyring' 'libgphoto2' 'libusb-compat' 'openexr' 'sqlite3') makedepends=('intltool>=0.40' 'cmake' 'sqlite3') optdepends=( 'librsvg') install=darktable.install options=(!libtool) -source=(http://downloads.sourceforge.net/project/darktable/darktable/$pkgver/darktable-$pkgver.tar.gz) -md5sums=('02397e09464a9084403270607133b5b5') +source=(http://downloads.sourceforge.net/project/darktable/darktable/${_pkgver}/darktable-$pkgver.tar.gz) +md5sums=('7f2167ad002386b377eae8b347c26ed7') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/dillo/PKGBUILD b/community/dillo/PKGBUILD index 5fc8f6609..1421c25ee 100644 --- a/community/dillo/PKGBUILD +++ b/community/dillo/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 34653 2010-12-11 03:21:47Z tdziedzic $ +# $Id: PKGBUILD 52646 2011-07-26 17:04:09Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: dorphell <dorphell@archlinux.org> pkgname=dillo -pkgver=2.2 -pkgrel=3 +pkgver=2.2.1 +pkgrel=1 pkgdesc="A small, fast graphical web browser built on FLTK" arch=(i686 x86_64 'mips64el') url="http://www.dillo.org" @@ -14,14 +14,12 @@ depends=('fltk2' 'libjpeg' 'perl' 'openssl' 'libpng' 'gcc-libs' 'libxcursor' backup=(etc/dillo/{dillorc,dpidrc}) source=(http://www.dillo.org/download/$pkgname-$pkgver.tar.bz2 libpng14.patch) -md5sums=('f8bcd62093f178bed81e46cc54e73f42' +md5sums=('8875d0188b9281fa2dd683220dcf58a8' '5336bd3a3b4698c5250ce59e4f2ff91a') build() { cd "$srcdir/$pkgname-$pkgver" - - patch -Np1 -i "$srcdir/libpng14.patch" - +# patch -Np1 -i "$srcdir/libpng14.patch" ./configure --prefix=/usr --sysconfdir=/etc --enable-cookies --enable-dlgui \ --enable-ssl make @@ -29,6 +27,5 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install } diff --git a/community/dvtm/PKGBUILD b/community/dvtm/PKGBUILD new file mode 100644 index 000000000..b5444c7f4 --- /dev/null +++ b/community/dvtm/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 52669 2011-07-27 12:48:55Z lfleischer $ +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> +# Contributor: Giorgio Lando <patroclo7@gmail.com> +# Contributor: bender02 at gmx dot com + +pkgname=dvtm +pkgver=0.6 +pkgrel=1 +pkgdesc='Dynamic virtual terminal manager.' +arch=('i686' 'x86_64') +url='http://www.brain-dump.org/projects/dvtm/' +license=('MIT') +depends=('ncurses') +source=("http://www.brain-dump.org/projects/${pkgname}/${pkgname}-${pkgver}.tar.gz" + 'config.h') +md5sums=('db77a3744868dd91a5ae5ad98b7df709' + '5759191a39281e62a64941d3f28cf010') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + cp "${srcdir}/config.h" . + sed -i 's/CFLAGS =/CFLAGS +=/' config.mk + + make clean + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make PREFIX=/usr DESTDIR="${pkgdir}" install + install -Dm0644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/community/dvtm/config.h b/community/dvtm/config.h new file mode 100644 index 000000000..39e121ee9 --- /dev/null +++ b/community/dvtm/config.h @@ -0,0 +1,148 @@ +/* curses attributes for the currently focused window */ +/* valid curses attributes are listed below they can be ORed + * + * A_NORMAL Normal display (no highlight) + * A_STANDOUT Best highlighting mode of the terminal. + * A_UNDERLINE Underlining + * A_REVERSE Reverse video + * A_BLINK Blinking + * A_DIM Half bright + * A_BOLD Extra bright or bold + * A_PROTECT Protected mode + * A_INVIS Invisible or blank mode + * + */ +#define BLUE (COLORS==256 ? 68 : COLOR_BLUE) + +#define SELECTED_ATTR A_NORMAL +#define SELECTED_FG BLUE +#define SELECTED_BG -1 +/* curses attributes for normal (not selected) windows */ +#define NORMAL_ATTR A_NORMAL +#define NORMAL_FG -1 +#define NORMAL_BG -1 +/* status bar (command line option -s) position */ +#define BARPOS BarTop /* BarBot, BarOff */ +/* curses attributes for the status bar */ +#define BAR_ATTR A_NORMAL +#define BAR_FG BLUE +#define BAR_BG -1 +/* determines whether the statusbar text should be right or left aligned */ +#define BAR_ALIGN ALIGN_RIGHT +/* separator between window title and window number */ +#define SEPARATOR " | " +/* printf format string for the window title, first %s + * is replaced by the title, second %s is replaced by + * the SEPARATOR, %d stands for the window number */ +#define TITLE "[%s%s#%d]" +/* master width factor [0.1 .. 0.9] */ +#define MWFACT 0.5 +/* scroll back buffer size in lines */ +#define SCROLL_BUF_SIZE 500 + +#include "tile.c" +#include "grid.c" +#include "bstack.c" +#include "fullscreen.c" + +/* by default the first layout entry is used */ +Layout layouts[] = { + { "[]=", tile }, + { "+++", grid }, + { "TTT", bstack }, + { "[ ]", fullscreen }, +}; + +#define MOD CTRL('g') + +/* you can at most specifiy MAX_ARGS (2) number of arguments */ +Key keys[] = { + { MOD, 'c', { create, { NULL } } }, + { MOD, 'x', { killclient, { NULL } } }, + { MOD, 'j', { focusnext, { NULL } } }, + { MOD, 'u', { focusnextnm, { NULL } } }, + { MOD, 'i', { focusprevnm, { NULL } } }, + { MOD, 'k', { focusprev, { NULL } } }, + { MOD, 't', { setlayout, { "[]=" } } }, + { MOD, 'g', { setlayout, { "+++" } } }, + { MOD, 'b', { setlayout, { "TTT" } } }, + { MOD, 'm', { setlayout, { "[ ]" } } }, + { MOD, ' ', { setlayout, { NULL } } }, + { MOD, 'h', { setmwfact, { "-0.05" } } }, + { MOD, 'l', { setmwfact, { "+0.05" } } }, + { MOD, '.', { toggleminimize, { NULL } } }, +#ifdef CONFIG_STATUSBAR + { MOD, 's', { togglebar, { NULL } } }, +#endif +#ifdef CONFIG_MOUSE + { MOD, 'M', { mouse_toggle, { NULL } } }, +#endif + { MOD, '\n', { zoom , { NULL } } }, + { MOD, '1', { focusn, { "1" } } }, + { MOD, '2', { focusn, { "2" } } }, + { MOD, '3', { focusn, { "3" } } }, + { MOD, '4', { focusn, { "4" } } }, + { MOD, '5', { focusn, { "5" } } }, + { MOD, '6', { focusn, { "6" } } }, + { MOD, '7', { focusn, { "7" } } }, + { MOD, '8', { focusn, { "8" } } }, + { MOD, '9', { focusn, { "9" } } }, + { MOD, 'q', { quit, { NULL } } }, + { MOD, 'G', { escapekey, { NULL } } }, + { MOD, 'a', { togglerunall, { NULL } } }, + { MOD, 'r', { redraw, { NULL } } }, + { MOD, 'X', { lock, { NULL } } }, + { MOD, 'B', { togglebell, { NULL } } }, + { MOD, KEY_PPAGE, { scrollback, { "-1" } } }, + { MOD, KEY_NPAGE, { scrollback, { "1" } } }, + { MOD, '?', { create, { "man dvtm", "dvtm help" } } }, +}; + +/* possible values for the mouse buttons are listed below: + * + * BUTTON1_PRESSED mouse button 1 down + * BUTTON1_RELEASED mouse button 1 up + * BUTTON1_CLICKED mouse button 1 clicked + * BUTTON1_DOUBLE_CLICKED mouse button 1 double clicked + * BUTTON1_TRIPLE_CLICKED mouse button 1 triple clicked + * BUTTON2_PRESSED mouse button 2 down + * BUTTON2_RELEASED mouse button 2 up + * BUTTON2_CLICKED mouse button 2 clicked + * BUTTON2_DOUBLE_CLICKED mouse button 2 double clicked + * BUTTON2_TRIPLE_CLICKED mouse button 2 triple clicked + * BUTTON3_PRESSED mouse button 3 down + * BUTTON3_RELEASED mouse button 3 up + * BUTTON3_CLICKED mouse button 3 clicked + * BUTTON3_DOUBLE_CLICKED mouse button 3 double clicked + * BUTTON3_TRIPLE_CLICKED mouse button 3 triple clicked + * BUTTON4_PRESSED mouse button 4 down + * BUTTON4_RELEASED mouse button 4 up + * BUTTON4_CLICKED mouse button 4 clicked + * BUTTON4_DOUBLE_CLICKED mouse button 4 double clicked + * BUTTON4_TRIPLE_CLICKED mouse button 4 triple clicked + * BUTTON_SHIFT shift was down during button state change + * BUTTON_CTRL control was down during button state change + * BUTTON_ALT alt was down during button state change + * ALL_MOUSE_EVENTS report all button state changes + * REPORT_MOUSE_POSITION report mouse movement + */ + +#ifdef CONFIG_MOUSE +Button buttons[] = { + { BUTTON1_CLICKED, { mouse_focus, { NULL } } }, + { BUTTON1_DOUBLE_CLICKED, { mouse_fullscreen, { "[ ]" } } }, + { BUTTON2_CLICKED, { mouse_zoom, { NULL } } }, + { BUTTON3_CLICKED, { mouse_minimize, { NULL } } }, +}; +#endif /* CONFIG_MOUSE */ + +#ifdef CONFIG_CMDFIFO +Cmd commands[] = { + { "create", { create, { NULL } } }, +}; +#endif /* CONFIG_CMDFIFO */ + +/* gets executed when dvtm is started */ +Action actions[] = { + { create, { NULL } }, +}; diff --git a/community/e-modules-extra-svn/PKGBUILD b/community/e-modules-extra-svn/PKGBUILD index ba17822e7..053e05f83 100755 --- a/community/e-modules-extra-svn/PKGBUILD +++ b/community/e-modules-extra-svn/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=e-modules-extra-svn -pkgver=60246 +pkgver=61885 pkgrel=1 pkgdesc="Extra gadgets for e17" arch=('i686' 'x86_64' 'mips64el') diff --git a/community/e-svn/PKGBUILD b/community/e-svn/PKGBUILD index 297bba5c7..40717fef5 100755 --- a/community/e-svn/PKGBUILD +++ b/community/e-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 49239 2011-06-13 09:40:13Z rvanharen $ +# $Id: PKGBUILD 53113 2011-07-30 17:03:37Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=e-svn -pkgver=60263 +pkgver=61875 pkgrel=1 pkgdesc="Enlightenment window manager DR17 (aka e17)" arch=('i686' 'x86_64' 'mips64el') diff --git a/community/e_dbus-svn/PKGBUILD b/community/e_dbus-svn/PKGBUILD index 0d65b1d55..e64c6c73e 100755 --- a/community/e_dbus-svn/PKGBUILD +++ b/community/e_dbus-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 49234 2011-06-13 09:39:28Z rvanharen $ +# $Id: PKGBUILD 53108 2011-07-30 17:02:51Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=e_dbus-svn -pkgver=60246 +pkgver=61732 pkgrel=1 pkgdesc="dbus abstraction layer for e17" arch=('i686' 'x86_64' 'mips64el') diff --git a/community/ecore-svn/PKGBUILD b/community/ecore-svn/PKGBUILD index 593bfb480..2bfaee762 100755 --- a/community/ecore-svn/PKGBUILD +++ b/community/ecore-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 49213 2011-06-13 09:36:25Z rvanharen $ +# $Id: PKGBUILD 53062 2011-07-30 16:00:01Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=ecore-svn -pkgver=60253 +pkgver=61897 pkgrel=1 pkgdesc="Ecore is an abstraction layer for e17" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ groups=('e17-libs-svn' 'e17-svn') url="http://www.enlightenment.org" license=('BSD') depends=('libxp' 'curl' 'libxss' 'evas-svn' 'libxtst' 'libxcomposite' - 'libxrandr' 'libxinerama' 'libxcursor') + 'libxrandr' 'libxinerama' 'libxcursor' 'eina-svn') makedepends=('subversion') conflicts=('ecore') provides=('ecore') diff --git a/community/edje-svn/PKGBUILD b/community/edje-svn/PKGBUILD index 426c76b4d..b71c6c3c5 100755 --- a/community/edje-svn/PKGBUILD +++ b/community/edje-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 49224 2011-06-13 09:37:58Z rvanharen $ +# $Id: PKGBUILD 53098 2011-07-30 17:01:13Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=edje-svn -pkgver=60246 +pkgver=61905 pkgrel=1 pkgdesc="A graphical design and layout library based on Evas" arch=('i686' 'x86_64' 'mips64el') diff --git a/community/eet-svn/PKGBUILD b/community/eet-svn/PKGBUILD index efbb767e3..bb5d0ee8a 100755 --- a/community/eet-svn/PKGBUILD +++ b/community/eet-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 49203 2011-06-13 09:34:45Z rvanharen $ +# $Id: PKGBUILD 53078 2011-07-30 16:57:26Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=eet-svn -pkgver=60246 +pkgver=61920 pkgrel=1 pkgdesc="A data storage and compression library" arch=('i686' 'x86_64' 'mips64el') diff --git a/community/eeze-svn/PKGBUILD b/community/eeze-svn/PKGBUILD index 7774956f6..bb0c423e5 100644 --- a/community/eeze-svn/PKGBUILD +++ b/community/eeze-svn/PKGBUILD @@ -4,7 +4,7 @@ # Contributor: bluebugs pkgname=eeze-svn -pkgver=60034 +pkgver=61778 pkgrel=1 pkgdesc="A data storage and compression library" arch=('i686' 'x86_64' 'mips64el') diff --git a/community/efreet-svn/PKGBUILD b/community/efreet-svn/PKGBUILD index 67394cb62..ad58a3814 100755 --- a/community/efreet-svn/PKGBUILD +++ b/community/efreet-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 49229 2011-06-13 09:38:46Z rvanharen $ +# $Id: PKGBUILD 53103 2011-07-30 17:02:04Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=efreet-svn -pkgver=60246 +pkgver=60978 pkgrel=1 pkgdesc="freedesktop.org specifications for e17" arch=('i686' 'x86_64' 'mips64el') diff --git a/community/eina-svn/PKGBUILD b/community/eina-svn/PKGBUILD index bf7847b0e..9e2536da5 100755 --- a/community/eina-svn/PKGBUILD +++ b/community/eina-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 49198 2011-06-13 09:33:59Z rvanharen $ +# $Id: PKGBUILD 53073 2011-07-30 16:56:37Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=eina-svn -pkgver=60246 +pkgver=61900 pkgrel=1 pkgdesc="E17 file chunk reading/writing library" arch=('i686' 'x86_64' 'mips64el') diff --git a/community/elementary-svn/PKGBUILD b/community/elementary-svn/PKGBUILD index 8d3956fc0..c4a15fb26 100644 --- a/community/elementary-svn/PKGBUILD +++ b/community/elementary-svn/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=elementary-svn -pkgver=60261 +pkgver=61919 pkgrel=1 pkgdesc="Enlightenment's basic widget set" arch=('i686' 'x86_64' 'mips64el') diff --git a/community/elinks/PKGBUILD b/community/elinks/PKGBUILD index 864053c5d..a5c1b667c 100644 --- a/community/elinks/PKGBUILD +++ b/community/elinks/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 51048 2011-07-04 15:29:28Z spupykin $ +# $Id: PKGBUILD 52641 2011-07-26 16:47:26Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: damir <damir@archlinux.org> @@ -6,23 +6,23 @@ pkgname=elinks pkgver=0.13 -_commit="03c698e926d4421ba43d905b6d9fd7388b97352f" -pkgrel=6 +_commit="eb4e5d7e0ddae63f28ec90d155846a2456e4a413" +pkgrel=7 pkgdesc="An advanced and well-established feature-rich text mode web browser." arch=("i686" "x86_64" 'mips64el') url="http://elinks.or.cz" license=('GPL') depends=('bzip2' 'expat>=2.0' 'gpm>=1.20.4' 'openssl' 'lua>=5.1.1' 'libidn' 'js' - 'gc' 'tre' 'smbclient') + 'gc' 'tre') source=("http://arch.p5n.pp.ru/~sergej/dl/elinks-$pkgver-${_commit}.tar.gz") -md5sums=('85916038633d0eb4ed98c3f82ac0b405') +md5sums=('71227b25ad05b719e4a549a26d958379') build() { cd "$srcdir/elinks" [ -x configure ] || sh autogen.sh ./configure --prefix=/usr --mandir=/usr/share/man \ --sysconfdir=/etc \ - --enable-smb --without-x --enable-cgi \ + --disable-smb --without-x --enable-cgi \ --enable-leds --enable-256-colors --enable-html-highlight \ --with-zlib make diff --git a/community/emesene/PKGBUILD b/community/emesene/PKGBUILD index a3250ded2..f6a188c92 100755 --- a/community/emesene/PKGBUILD +++ b/community/emesene/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 49565 2011-06-18 07:30:46Z andrea $ +# $Id: PKGBUILD 53195 2011-07-31 21:48:19Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Claudio Riva <firetux83@gmail.com> pkgname=emesene -pkgver=2.11.5 -pkgrel=2 +pkgver=2.11.7 +pkgrel=1 pkgdesc="A pygtk MSN Messenger client" url="http://www.emesene.org/" license=('custom:PSF' 'GPL' 'LGPL2.1') @@ -21,13 +21,12 @@ optdepends=('gnome-python-extras: spell-check plugin' 'pywebkitgtk: for alternative conversation window' 'xmpppy: for gtalk and facebook chat support' 'pyqt: alternative qt4 interface (emesene -e main:qt4_main') -source=("ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.gz" +source=("ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.bz2" 'emesene.run') install=emesene.install options=('!libtool') -sha1sums=('54e5fe81e99ddf5909b50c1c4f938480ed43f691' - 'fee7a7731b32f6fe0b5ade1abc06115bcef92c41') - +sha1sums=('ba18b6a40003c1e0407dc1395a237db84ce4efa1' + '2bd13ada86aa0af6307a41047f0d7caf2995660d') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/community/emesene/emesene.run b/community/emesene/emesene.run index eca282589..8fb6efc62 100644 --- a/community/emesene/emesene.run +++ b/community/emesene/emesene.run @@ -1,2 +1,2 @@ #!/bin/bash -python2 /usr/share/emesene/emesene.py "$@" +python2 /usr/share/emesene/emesene "$@" diff --git a/community/emprint-svn/PKGBUILD b/community/emprint-svn/PKGBUILD index b5c0aaee9..f2023c285 100755 --- a/community/emprint-svn/PKGBUILD +++ b/community/emprint-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 49244 2011-06-13 09:42:08Z rvanharen $ +# $Id: PKGBUILD 53118 2011-07-30 17:05:35Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=emprint-svn -pkgver=60246 +pkgver=61738 pkgrel=1 pkgdesc="screenshot module for e17" arch=('i686' 'x86_64' 'mips64el') diff --git a/community/encfs/PKGBUILD b/community/encfs/PKGBUILD index b996779ba..ca88d1188 100644 --- a/community/encfs/PKGBUILD +++ b/community/encfs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 47658 2011-05-24 17:28:48Z jelle $ +# $Id: PKGBUILD 52537 2011-07-26 04:21:21Z svenstaro $ # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> # Contributor: Sven Kauber, <celeon@gmail.com> @@ -6,7 +6,7 @@ pkgname=encfs pkgver=1.7.4 -pkgrel=4 +pkgrel=5 pkgdesc='Encrypted filesystem in user-space' arch=('i686' 'x86_64' 'mips64el') url='http://www.arg0.net/encfs' diff --git a/community/evas-svn/PKGBUILD b/community/evas-svn/PKGBUILD index ef60417cc..35eaa4092 100755 --- a/community/evas-svn/PKGBUILD +++ b/community/evas-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 49208 2011-06-13 09:35:30Z rvanharen $ +# $Id: PKGBUILD 53083 2011-07-30 16:58:13Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=evas-svn -pkgver=60260 +pkgver=61914 pkgrel=1 pkgdesc="A hardware-accelerated canvas API for X-Windows" arch=('i686' 'x86_64' 'mips64el') diff --git a/community/fatrat/PKGBUILD b/community/fatrat/PKGBUILD index e3d246e34..5eeeb3155 100644 --- a/community/fatrat/PKGBUILD +++ b/community/fatrat/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 47629 2011-05-24 14:03:19Z tdziedzic $ +# $Id: PKGBUILD 52540 2011-07-26 04:27:53Z svenstaro $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgname=fatrat pkgver=1.1.3 -pkgrel=4 +pkgrel=5 pkgdesc="QT4 based download manager with support for HTTP, FTP, SFTP, BitTorrent, rapidshare and more" arch=('i686' 'x86_64' 'mips64el') url="http://fatrat.dolezel.info/" diff --git a/community/flashrom/PKGBUILD b/community/flashrom/PKGBUILD index c6f62062c..10eb5391f 100644 --- a/community/flashrom/PKGBUILD +++ b/community/flashrom/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 38872 2011-02-02 16:42:39Z giovanni $ +# $Id: PKGBUILD 52890 2011-07-29 17:53:33Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Cilyan Olowen <gaknar@gmail.com> # Contributor: fill <mailbox@fillo.ru> # Contributor: Anton Shestakov <engored*ya.ru> pkgname=flashrom -pkgver=0.9.3 +pkgver=0.9.4 pkgrel=1 pkgdesc="Utility for reading, writing, erasing and verifying flash ROM chips" url="http://www.coreboot.org/Flashrom" @@ -13,15 +13,17 @@ arch=('i686' 'x86_64' 'mips64el') license=('GPL') depends=('libftdi') makedepends=('zlib' 'pciutils') -source=("http://qa.coreboot.org/releases/${pkgname}-${pkgver}.tar.bz2") -md5sums=('eccdec2764223f5d2839bf577380eaa9') +source=("http://download.flashrom.org/releases/${pkgname}-${pkgver}.tar.bz2") +md5sums=('d739a91aece12cc1e622038bb199541c') build() { cd "${srcdir}/${pkgname}-${pkgver}" - make || return 1 + + make } package() { cd "${srcdir}/${pkgname}-${pkgver}" - make PREFIX="${pkgdir}/usr" install || return 1 + + make PREFIX="${pkgdir}/usr" install } diff --git a/community/fotoxx/PKGBUILD b/community/fotoxx/PKGBUILD index e0737fc43..aa6f6b634 100644 --- a/community/fotoxx/PKGBUILD +++ b/community/fotoxx/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Stefan Husmann <stefan-husmann@t-online.de> pkgname=fotoxx -pkgver=11.07 +pkgver=11.08 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=('cf7ce6011108da211b0169df6686ae95') +md5sums=('928368cfa250f6aab60c9a92aa27fefa') install=fotoxx.install build() { @@ -18,6 +18,7 @@ build() { CFLAGS+="-c `pkg-config --cflags gtk+-2.0`" \ LFLAGS+="`pkg-config --libs gtk+-2.0 gthread-2.0`" sed -i 's+^# ++' data/desktop + sed -i 's+@PREFIX@+/usr+' data/desktop } package() { diff --git a/community/freecol/PKGBUILD b/community/freecol/PKGBUILD index 764de7893..551d82524 100644 --- a/community/freecol/PKGBUILD +++ b/community/freecol/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 49898 2011-06-22 11:19:02Z svenstaro $ +# $Id: PKGBUILD 52513 2011-07-25 23:52:16Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: TDY <tdy@gmx.com> # Contributor: Nelson Menon <nelsonmenon@gmail.com insanatorium.wordpress.com> pkgname=freecol -pkgver=0.10.0 +pkgver=0.10.1 pkgrel=1 pkgdesc="A turn-based strategy game based on Colonization" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ license=('GPL') depends=('java-runtime') source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.zip fc.desktop fc.sh) -md5sums=('281c27b6222fa586823db7cad4a8ea3a' +md5sums=('1511c1fbd71e36c0f998e32a1279718a' '55594d770904af3e3e3852d375085357' 'ae473cd1d86f8f764250ee00b6fda90b') diff --git a/community/gitg/PKGBUILD b/community/gitg/PKGBUILD index 85e407649..19c3e0fcd 100644 --- a/community/gitg/PKGBUILD +++ b/community/gitg/PKGBUILD @@ -6,8 +6,8 @@ # Contributor: DonVla <donvla@users.sourceforge.net> pkgname=gitg -pkgver=0.2.2 -pkgrel=2 +pkgver=0.2.4 +pkgrel=1 pkgdesc='A GIT repository viewer based on GTK+' arch=('i686' 'x86_64' 'mips64el') url='http://trac.novowork.com/gitg/' @@ -16,7 +16,7 @@ depends=('dconf' 'gtksourceview3' 'git' 'desktop-file-utils' 'gsettings-desktop- makedepends=('intltool') install="${pkgname}.install" source=("ftp://ftp.gnome.org/pub/GNOME/sources/gitg/0.2/${pkgname}-${pkgver}.tar.bz2") -sha256sums=('cfa1b1d2bdd1211c09e00dca42130ea98e98fde576d85e18eabfde1802d0d04a') +sha256sums=('96705b0edf6525a131a34d015544da67add9ed992babbd45fc768cdd032b65d0') build() { cd ${pkgname}-${pkgver} diff --git a/community/glob2/PKGBUILD b/community/glob2/PKGBUILD index 053da0ecd..b6b9aba01 100644 --- a/community/glob2/PKGBUILD +++ b/community/glob2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 47655 2011-05-24 16:52:31Z schuay $ +# $Id: PKGBUILD 52543 2011-07-26 04:33:02Z svenstaro $ # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> # Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com> pkgname=glob2 pkgver=0.9.4.4 -pkgrel=8 +pkgrel=9 pkgdesc="RTS game which minimizes micro-management by automatically assigning tasks to units" arch=('i686' 'x86_64' 'mips64el') url="http://www.globulation2.org/" diff --git a/community/glom/PKGBUILD b/community/glom/PKGBUILD index 4dbef2056..8bd58d4a5 100644 --- a/community/glom/PKGBUILD +++ b/community/glom/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 47669 2011-05-24 17:51:15Z schuay $ +# $Id: PKGBUILD 52545 2011-07-26 04:39:23Z svenstaro $ # Maintainer: Roman Kyrylych <Roman.Kyrylych@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> pkgname=glom pkgver=1.16.1 -pkgrel=6 +pkgrel=7 pkgdesc="An easy-to-use database designer and user interface" arch=('i686' 'x86_64' 'mips64el') url="http://www.glom.org/" diff --git a/community/gnash/PKGBUILD b/community/gnash/PKGBUILD index f962211b1..dbb756e2c 100644 --- a/community/gnash/PKGBUILD +++ b/community/gnash/PKGBUILD @@ -4,7 +4,7 @@ pkgbase=gnash pkgname=(gnash-common gnash-gtk) pkgver=0.8.9 -pkgrel=3 +pkgrel=4 arch=(i686 x86_64) url="http://www.gnu.org/software/gnash/" license=(GPL3) diff --git a/community/gnote/PKGBUILD b/community/gnote/PKGBUILD index d89fd19b6..6bf0b4acf 100644 --- a/community/gnote/PKGBUILD +++ b/community/gnote/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 45878 2011-04-30 20:15:23Z ibiru $ +# $Id: PKGBUILD 53049 2011-07-30 13:32:24Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: uastasi <uastasi@archlinux.us> pkgname=gnote -pkgver=0.7.4 +pkgver=0.7.5 pkgrel=1 pkgdesc="Experimental port of Tomboy to C++ " arch=('i686' 'x86_64' 'mips64el') @@ -12,8 +12,8 @@ depends=('gtkmm' 'gconf' 'gtkspell' 'libxslt') makedepends=('intltool' 'gnome-doc-utils' 'boost') options=('!libtool') install=gnote.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.7/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('19bf64397278b85703979fd4943692f6c44579e597bad27acf04a64d6813e6f2') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.7/${pkgname}-${pkgver}.tar.xz) +sha256sums=('ccb8a4922f167d9727fbc69f559b722004fb6bad3af329dad1fe5e2a3d3d18b8') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -32,5 +32,5 @@ package() { make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/gconf/schemas" gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnote ${pkgdir}/etc/gconf/schemas/*.schemas - rm -rf ${pkgdir}/etc/gconf/ + rm -rf ${pkgdir}/etc/ } diff --git a/community/gpicview/PKGBUILD b/community/gpicview/PKGBUILD index 9688ffac5..080e5ba07 100644 --- a/community/gpicview/PKGBUILD +++ b/community/gpicview/PKGBUILD @@ -1,7 +1,9 @@ -# Maintainer: Geoffroy Carrier <geoffroy.carrier@koon.fr> +# $Id: PKGBUILD 52590 2011-07-26 09:08:13Z angvp $ +# Maintainer: Angel Velasquez <angvp@archlinux.org> +# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> pkgname=gpicview -pkgver=0.2.1 -pkgrel=3 +pkgver=0.2.2 +pkgrel=1 pkgdesc="Picture viewer of the LXDE Desktop" arch=('i686' 'x86_64' 'mips64el') license=('GPL2') @@ -11,11 +13,15 @@ depends=('gtk2') makedepends=('pkgconfig' 'intltool') optdepends=('librsvg: For SVG support') source=(http://downloads.sourceforge.net/sourceforge/lxde/${pkgname}-${pkgver}.tar.gz) -md5sums=('a2de255bf9bdc40746c0dc89b3454a10') +md5sums=('943da9f4a23541accd5acdd4fb69966f') build() { cd "$srcdir/$pkgname-$pkgver" - ./configure --sysconfdir=/etc --prefix=/usr || return 1 - make || return 1 - make DESTDIR="$pkgdir" install || return 1 + ./configure --sysconfdir=/etc --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } diff --git a/community/gpsdrive/PKGBUILD b/community/gpsdrive/PKGBUILD index b8b6efcc2..23ec7eec9 100644 --- a/community/gpsdrive/PKGBUILD +++ b/community/gpsdrive/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 47650 2011-05-24 16:23:35Z jelle $ +# $Id: PKGBUILD 52604 2011-07-26 10:16:12Z jelle $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Maintainer: damir <damir@archlinux.org> pkgname=gpsdrive pkgver=2.11 -pkgrel=8 +pkgrel=9 pkgdesc="A car (bike, ship, plane) navigation system" arch=("i686" "x86_64" 'mips64el') url="http://www.gpsdrive.de/" diff --git a/community/grsync/PKGBUILD b/community/grsync/PKGBUILD index c5fb86f3f..b57328678 100644 --- a/community/grsync/PKGBUILD +++ b/community/grsync/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 16852 2010-05-11 12:30:04Z spupykin $ +# $Id: PKGBUILD 52933 2011-07-30 07:01:49Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: William Rea <sillywilly@gmail.com> pkgname=grsync -pkgver=1.1.1 +pkgver=1.2.0 pkgrel=1 pkgdesc="GTK GUI for rsync" arch=('i686' 'x86_64' 'mips64el') @@ -13,11 +13,11 @@ depends=('gtk2' 'rsync') makedepends=('gettext' 'intltool') install=grsync.install source=(http://www.opbyte.it/release/grsync-$pkgver.tar.gz) -md5sums=('81d3b6a1827fa1b06d87491f9bb1c8b9') +md5sums=('6364df4a3a7c9ebc25799762e77dc351') build() { cd $startdir/src/grsync-$pkgver [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr - make || return 1 + make make DESTDIR=$startdir/pkg install } diff --git a/community/hubbub/PKGBUILD b/community/hubbub/PKGBUILD index 221a86292..58b5947ee 100644 --- a/community/hubbub/PKGBUILD +++ b/community/hubbub/PKGBUILD @@ -1,29 +1,28 @@ -# $Id: PKGBUILD 22547 2010-07-22 13:02:46Z lcarlier $ +# $Id: PKGBUILD 52652 2011-07-26 19:12:51Z ebelanger $ # Contributor: Paulo Matias <matiasΘarchlinux-br·org> # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=hubbub -pkgver=0.0.2 +pkgver=0.1.0 pkgrel=1 pkgdesc="HTML5 compliant parsing library" arch=('i686' 'x86_64' 'mips64el') url="http://www.netsurf-browser.org/projects/hubbub" license=('MIT') -depends=('libparserutils') +depends=('glibc' 'libparserutils') source=("http://www.netsurf-browser.org/projects/releases/${pkgname}-${pkgver}-src.tar.gz") -md5sums=('dbdc6bb13a71ce72384d7ee5891a0382') +md5sums=('9d7bb287bd5f993902c577ce3503f6d5') build() { - cd ${srcdir}/${pkgname}-${pkgver} - -# sed -i 's/const uint8_t \*cptr;/const uint8_t \*cptr = 0;/; -# s/size_t len;/size_t len = 0;/' src/tokeniser/tokeniser.c - make PREFIX=/usr + cd "${srcdir}/${pkgname}-${pkgver}-src" + sed -i 's/-Werror//' Makefile + make PREFIX=/usr COMPONENT_TYPE="lib-shared" + make PREFIX=/usr COMPONENT_TYPE="lib-static" } package() { - cd ${srcdir}/${pkgname}-${pkgver} - - make install PREFIX=/usr DESTDIR=${pkgdir} - install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING + cd "${srcdir}/${pkgname}-${pkgver}-src" + make install PREFIX=/usr DESTDIR="${pkgdir}" COMPONENT_TYPE="lib-shared" + make install PREFIX=/usr DESTDIR="${pkgdir}" COMPONENT_TYPE="lib-static" + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } diff --git a/community/i3-wm/PKGBUILD b/community/i3-wm/PKGBUILD index 3cbc9aa19..5782b26c5 100644 --- a/community/i3-wm/PKGBUILD +++ b/community/i3-wm/PKGBUILD @@ -1,48 +1,53 @@ -# $Id: PKGBUILD 46517 2011-05-08 15:05:08Z ttopper $ +# $Id: PKGBUILD 53231 2011-08-01 21:41:41Z ttopper $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> pkgname=i3-wm _pkgsourcename=i3 -pkgver=3.e_bf3 -_pkgver=3.e-bf3 +pkgver=4.0.1 pkgrel=1 pkgdesc="An improved dynamic tiling window manager" arch=('i686' 'x86_64' 'mips64el') -url="http://i3.zekjur.net/" +url="http://i3wm.org/" license=('BSD') -replaces=("i3") +replaces=("i3" "i3bar") groups=("i3") -depends=('libx11' 'xcb-util' 'libev' 'yajl') +depends=('libxcursor' 'xcb-util' 'libev' 'yajl') makedepends=('bison' 'flex') optdepends=('rxvt-unicode: The terminal emulator used in the default config.' - 'dmenu: As menu.') + 'dmenu: As menu.' + 'perl: To migrate your configuration to v4 format.') options=('docs' '!strip') -source=(http://i3.zekjur.net/downloads/${_pkgsourcename}-${_pkgver}.tar.bz2) -md5sums=('07a66e04bc754d0c16b033ed9df80c65') +source=(http://i3wm.org/downloads/${_pkgsourcename}-${pkgver}.tar.bz2) +md5sums=('87c5961589068269da611b79064c628e') build() { - cd "$srcdir/$_pkgsourcename-$_pkgver" - + cd "$srcdir/$_pkgsourcename-$pkgver" + make } package() { - cd "$srcdir/$_pkgsourcename-$_pkgver" + cd "$srcdir/$_pkgsourcename-$pkgver" make DESTDIR="$pkgdir/" install install -Dm644 man/i3.1 \ ${pkgdir}/usr/share/man/man1/i3.1 - install -Dm644 man/i3-msg.1 \ - ${pkgdir}/usr/share/man/man1/i3-msg.1 + install -Dm644 i3bar/doc/i3bar.1 \ + ${pkgdir}/usr/share/man/man1/i3bar.1 + install -Dm644 man/i3-config-wizard.1 \ + ${pkgdir}/usr/share/man/man1/i3-config-wizard.1 install -Dm644 man/i3-input.1 \ ${pkgdir}/usr/share/man/man1/i3-input.1 + install -Dm644 man/i3-msg.1 \ + ${pkgdir}/usr/share/man/man1/i3-msg.1 + install -Dm644 man/i3-migrate-config-to-v4.1 \ + ${pkgdir}/usr/share/man/man1/i3-migrate-config-to-v4.1 + install -Dm644 man/i3-nagbar.1 \ + ${pkgdir}/usr/share/man/man1/i3-nagbar.1 install -Dm644 LICENSE \ ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - #i3-wsbar will be provided by another package - rm ${pkgdir}/usr/bin/i3-wsbar - make clean } diff --git a/community/jack2/PKGBUILD b/community/jack2/PKGBUILD index 8addba7db..45e9753e2 100644 --- a/community/jack2/PKGBUILD +++ b/community/jack2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 43953 2011-04-01 08:09:21Z schiv $ +# $Id: PKGBUILD 52694 2011-07-27 17:23:48Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Daniele Paolella <danielepaolella@email.it> # Contributor: Philipp Überbacher <hollunder at gmx dot at> @@ -8,25 +8,28 @@ pkgbase=jack2 pkgname=('jack2' 'jack2-dbus') _tarname=jack pkgver=1.9.7 -pkgrel=1 -pkgdesc="The next-generation JACK with SMP support" +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://jackaudio.org/" license=('GPL') -depends=('libsamplerate') -makedepends=('python2' 'doxygen' 'libffado' 'celt-0.7' 'dbus-core') -optdepends=('libffado: FireWire support' - 'celt-0.7: NetJACK2 driver' - 'python2: jack_control') -provides=('jack=0.118.0' 'jack-audio-connection-kit=0.118.0' 'jackdbus' - 'jack-audio-connection-kit-mp' 'jackmp' 'jackdmp') -conflicts=('jack') -source=(http://www.grame.fr/~letz/$_tarname-$pkgver.tar.bz2) +makedepends=('python2' 'doxygen' 'libffado' 'celt' + 'libsamplerate' 'dbus-core') +[ "$CARCH" = "mips64el" ] && \ +makedepends=('python2' 'doxygen' 'celt' + 'libsamplerate' 'dbus-core') +source=("http://www.grame.fr/~letz/$_tarname-$pkgver.tar.bz2") md5sums=('9759670feecbd43eeccf1c0f743ec199') _pyfix() { - sed -i 's:bin/env python:bin/env python2:' \ - "$pkgdir/usr/bin/jack_control" + sed -i 's:bin/env python:bin/env python2:' "$pkgdir/usr/bin/jack_control" +} + +_wafconf() { + if [ "$CARCH" = "mips64el" ]; then + python2 waf configure --prefix=/usr --alsa --doxygen $@ + else + python2 waf configure --prefix=/usr --alsa --firewire --doxygen $@ + fi } build() { @@ -41,51 +44,55 @@ build() { # mixed dbus/classic build cd $_tarname-$pkgver msg2 "Running Mixed D-Bus/Classic build" - - python2 waf configure --prefix=/usr \ - --alsa \ - --dbus \ - --classic \ - --firewire \ - --doxygen - + _wafconf --classic --dbus python2 waf build $MAKEFLAGS # dbus-ONLY build cd ../$_tarname-dbus-$pkgver msg2 "Running D-Bus-only build" - - python2 waf configure --prefix=/usr \ - --alsa \ - --dbus \ - --firewire \ - --doxygen - + _wafconf --dbus python2 waf build $MAKEFLAGS } package_jack2() { + pkgdesc="The next-generation JACK with SMP support" + depends=('libsamplerate') optdepends=('libffado: FireWire support' - 'celt-0.7: NetJACK2 driver' + 'celt: NetJACK2 driver' 'dbus-core: jackdbus' 'python2: jack_control') +[ "$CARCH" = "mips64el" ] && \ + optdepends=('celt: NetJACK2 driver' + 'dbus-core: jackdbus' + 'python2: jack_control') + conflicts=('jack') + provides=('jack' 'jack-audio-connection-kit' 'jackdbus' + 'jack-audio-connection-kit-mp' 'jackmp' 'jackdmp') cd "$srcdir/$_tarname-$pkgver" - python2 waf install --destdir="$pkgdir/" + python2 waf install --destdir="$pkgdir" # fix for major python transition _pyfix } package_jack2-dbus() { - pkgdesc+=" (for D-Bus interaction only)" - depends+=('dbus-core') - conflicts+=('jack2') + pkgdesc="The next-generation JACK with SMP support (for D-BUS interaction only)" + depends=('libsamplerate' 'dbus-core') + optdepends=('libffado: FireWire support' + 'celt: NetJACK2 driver' + 'python2: jack_control') +[ "$CARCH" = "mips64el" ] && \ + optdepends=('celt: NetJACK2 driver' + 'python2: jack_control') + conflicts=('jack' 'jack2') + provides=('jack' 'jack2' 'jack-audio-connection-kit' 'jackdbus' + 'jack-audio-connection-kit-mp' 'jackmp' 'jackdmp') cd "$srcdir/$_tarname-dbus-$pkgver" - python2 waf install --destdir="$pkgdir/" + python2 waf install --destdir="$pkgdir" _pyfix } diff --git a/community/java-oracle/PKGBUILD b/community/java-oracle/PKGBUILD new file mode 100644 index 000000000..61cce1d2a --- /dev/null +++ b/community/java-oracle/PKGBUILD @@ -0,0 +1,146 @@ +# Maintainer: Thomas Dziedzic < gostrc at gmail > +# Contributor: kfgz <kfgz at interia dot pl> +# Contributor: Army <gmail.com: uli[dot]armbruster> +# Contributor: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org> +# Contributor: Jason Chu <jason@archlinux.org> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> +# Contributor: Guillaume ALAUX <Guillaume at alaux dot net> +# Contributor: Charles Ghislain <charlyghislain at gmail dot com> + +pkgbase=java-oracle +pkgname=('jre' 'jdk') +pkgver=7 +pkgrel=2 +arch=('i686' 'x86_64') + [ "${CARCH}" = 'i686' ] && _arch='i586' + [ "${CARCH}" = 'x86_64' ] && _arch='x64' +url='http://jdk7.java.net/' +license=('custom') +source=("http://download.oracle.com/otn-pub/java/jdk/7/jdk-7-linux-${_arch}.tar.gz" + 'java-control-panel.desktop' + 'java-monitoring-and-management-console.desktop' + 'java-policy-settings.desktop' + 'java-visualvm.desktop' + 'java-web-start.desktop' + 'jre.profile' + 'jre.profile.csh' + 'jdk.profile' + 'jdk.profile.csh' + 'derby-network-server' + 'derby-network-server.conf' + 'javaws-launcher') +[ "${CARCH}" = 'i686' ] && md5sums=('f97244a104f03731e5ff69f0dd5a9927') +[ "${CARCH}" = 'x86_64' ] && md5sums=('b3c1ef5faea7b180469c129a49762b64') +md5sums+=('e4d814c0f310d77ed6990c731bccd0fb' + '4bc2b0be93f76ed07b471e3c89eb5a8a' + '8e3cec7ab641ec449cabd068be583f5c' + '9ba148ebabce8ed3351b813a9a66b6e5' + '619ec32235dcfe454234ef4316f8a7cc' + '7cd3dc10e7a37468cad4053a067dcd01' + 'cc90df2df6fe80fab885a80036d420a1' + 'b83ab5742651b4234b7d2e20785c6693' + '6f4cbf332816d2c4e9578ecd1d0dce7f' + 'a279e195e249000646895d93e199860d' + '4bdff6982c66d24a879c424aaac3d04d' + '45c15a6b4767288f2f745598455ea2bf') + +package_jre() { + pkgdesc="Oracle's Java Runtime Environment" + depends=('libxtst') + provides=('java-runtime=7') + conflicts=('java-runtime') + install='jre.install' + + # main files + mkdir -p ${pkgdir}/opt/java + cp -r jdk1.7.0/jre ${pkgdir}/opt/java + + # profiles + install -D ${srcdir}/jre.profile \ + ${pkgdir}/etc/profile.d/jre.sh + install -D ${srcdir}/jre.profile.csh \ + ${pkgdir}/etc/profile.d/jre.csh + + # java browser plugin + mkdir -p ${pkgdir}/usr/lib/mozilla/plugins + if [ "$CARCH" = "i686" ]; then + ln -s /opt/java/jre/lib/i386/libnpjp2.so \ + ${pkgdir}/usr/lib/mozilla/plugins + else + ln -s /opt/java/jre/lib/amd64/libnpjp2.so \ + ${pkgdir}/usr/lib/mozilla/plugins + fi + + # licenses + install -d ${pkgdir}/usr/share/licenses/jre + install -m644 ${pkgdir}/opt/java/jre/COPYRIGHT \ + ${pkgdir}/usr/share/licenses/jre + install -m644 ${pkgdir}/opt/java/jre/LICENSE \ + ${pkgdir}/usr/share/licenses/jre + install -m644 ${pkgdir}/opt/java/jre/THIRDPARTYLICENSEREADME.txt \ + ${pkgdir}/usr/share/licenses/jre + + # Fix system prefs folder FS#18872 + install -d ${pkgdir}/etc/.java/.systemPrefs + + # Clicking a .jnlp file does not launch that file but launch javaws -viewer instead FS#22509 + install ${srcdir}/javaws-launcher \ + ${pkgdir}/opt/java/jre/bin +} + +package_jdk() { + pkgdesc="Oracle's Java Development Kit" + depends=('jre') + provides=('java-environment=7') + conflicts=('java-environment') + install='jdk.install' + + #copy icon + install -D -m644 ${srcdir}/jdk1.7.0/jre/lib/desktop/icons/hicolor/48x48/apps/sun-java.png \ + ${pkgdir}/usr/share/pixmaps/java.png + + # main files + install -d ${pkgdir}/opt + mv jdk1.7.0 ${pkgdir}/opt/java + + # cleanup jre folder + rm -rf ${pkgdir}/opt/java/jre + # can not package src.zip due to international use restrictions for certain countries + rm ${pkgdir}/opt/java/src.zip + # remove windows specific batch files + find ${pkgdir}/opt/java -name '*\.bat' -delete + + # profiles + install -D ${srcdir}/jdk.profile \ + ${pkgdir}/etc/profile.d/jdk.sh + install -D ${srcdir}/jdk.profile.csh \ + ${pkgdir}/etc/profile.d/jdk.csh + + # licenses + install -d ${pkgdir}/usr/share/licenses/jdk + install -m644 ${pkgdir}/opt/java/COPYRIGHT \ + ${pkgdir}/usr/share/licenses/jdk + install -m644 ${pkgdir}/opt/java/LICENSE \ + ${pkgdir}/usr/share/licenses/jdk + install -m644 ${pkgdir}/opt/java/THIRDPARTYLICENSEREADME.txt \ + ${pkgdir}/usr/share/licenses/jdk + + # desktop entries + install -Dm644 ${srcdir}/java-control-panel.desktop \ + ${pkgdir}/usr/share/applications/java-control-panel.desktop + install -Dm644 ${srcdir}/java-monitoring-and-management-console.desktop \ + ${pkgdir}/usr/share/applications/java-monitoring-and-management-console.desktop + install -Dm644 ${srcdir}/java-policy-settings.desktop \ + ${pkgdir}/usr/share/applications/java-policy-settings.desktop + install -Dm644 ${srcdir}/java-visualvm.desktop \ + ${pkgdir}/usr/share/applications/java-visualvm.desktop + install -Dm644 ${srcdir}/java-web-start.desktop \ + ${pkgdir}/usr/share/applications/java-web-start.desktop + + # javadb (apache derby) daemon files FS#21186 + install -D ${srcdir}/derby-network-server \ + ${pkgdir}/etc/rc.d/derby-network-server + install -D -m644 ${srcdir}/derby-network-server.conf \ + ${pkgdir}/etc/conf.d/derby-network-server +} + diff --git a/community/java-oracle/derby-network-server b/community/java-oracle/derby-network-server new file mode 100644 index 000000000..f2b36ea56 --- /dev/null +++ b/community/java-oracle/derby-network-server @@ -0,0 +1,64 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/profile.d/jdk.sh +. $DERBY_HOME/bin/derby_common.sh + +DAEMON_NAME="derby-network-server" +DAEMON_CONF="/etc/conf.d/$DAEMON_NAME" +DAEMON_PID="/var/run/$DAEMON_NAME.pid" + +[ -f $DAEMON_CONF ] && . $DAEMON_CONF + +DERBY_START_CMD="$JAVACMD $DERBY_OPTS -classpath \"$LOCALCLASSPATH\" org.apache.derby.drda.NetworkServerControl start" +DERBY_STOP_CMD="$JAVACMD $DERBY_OPTS -classpath \"$LOCALCLASSPATH\" org.apache.derby.drda.NetworkServerControl shutdown" + +case "$1" in + start) + stat_busy "Starting Derby Network Server" + + if ck_daemon $DAEMON_NAME; then + $DERBY_START_CMD > /dev/null & + + PID=`ps ax | grep -v grep | grep derby | grep org.apache.derby.drda.NetworkServerControl | awk '{print $1}'` + + if [ -z "$PID" ]; then + stat_fail + else + echo $PID > $DAEMON_PID + add_daemon $DAEMON_NAME + sleep 2 + stat_done + fi + else + stat_fail + fi + ;; + stop) + stat_busy "Stopping Derby Network Server" + + if ck_daemon $DAEMON_NAME; then + stat_fail + else + $DERBY_STOP_CMD > /dev/null & + + if [ $? -gt 0 ]; then + stat_fail + else + rm -f $DAEMON_PID + rm_daemon $DAEMON_NAME + stat_done + fi + fi + ;; + restart) + $0 stop + sleep 5 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 + diff --git a/community/java-oracle/derby-network-server.conf b/community/java-oracle/derby-network-server.conf new file mode 100644 index 000000000..ef7478254 --- /dev/null +++ b/community/java-oracle/derby-network-server.conf @@ -0,0 +1,2 @@ +DERBY_OPTS="-Dderby.stream.error.file=/var/log/derby.log" + diff --git a/community/java-oracle/java-control-panel.desktop b/community/java-oracle/java-control-panel.desktop new file mode 100644 index 000000000..476e04a82 --- /dev/null +++ b/community/java-oracle/java-control-panel.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Exec=/opt/java/bin/jcontrol +GenericName[cs]=Nastavení prostředí Java +GenericName=Java Environment Settings +Icon=java +Name[cs]=Nastavení Javy +Name=Java Control Panel +Path= +StartupNotify=true +Terminal=false +Type=Application +Categories=Settings;Java; diff --git a/community/java-oracle/java-monitoring-and-management-console.desktop b/community/java-oracle/java-monitoring-and-management-console.desktop new file mode 100644 index 000000000..c0e1e59f6 --- /dev/null +++ b/community/java-oracle/java-monitoring-and-management-console.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Exec=/opt/java/bin/jconsole +Icon=java +Name[cs]=Konzole monitorování a správy prostředí Java +Name=Java Monitoring and Management Console +StartupNotify=true +Terminal=false +Type=Application +Categories=Development;Java; diff --git a/community/java-oracle/java-policy-settings.desktop b/community/java-oracle/java-policy-settings.desktop new file mode 100644 index 000000000..1009301b1 --- /dev/null +++ b/community/java-oracle/java-policy-settings.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Exec=/opt/java/bin/policytool +Icon=java +Name[cs]=Nastavení politiky Java aplikací +Name=Java Policy Settings +Path= +StartupNotify=true +Terminal=false +Type=Application +Categories=Settings;Java; diff --git a/community/java-oracle/java-visualvm.desktop b/community/java-oracle/java-visualvm.desktop new file mode 100644 index 000000000..8aa9527c8 --- /dev/null +++ b/community/java-oracle/java-visualvm.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Exec=/opt/java/bin/jvisualvm +GenericName[cs]=Nástroj pro monitorování a sledování výkonu Java aplikací +GenericName=Java Monitoring and Performance Monitoring Tool +Icon=java +Name=Java VisualVM +Path= +StartupNotify=true +Terminal=false +Type=Application +Categories=Development;Java; diff --git a/community/java-oracle/java-web-start.desktop b/community/java-oracle/java-web-start.desktop new file mode 100644 index 000000000..a8a25f9e2 --- /dev/null +++ b/community/java-oracle/java-web-start.desktop @@ -0,0 +1,13 @@ +[Desktop Entry] +Exec=/opt/java/jre/bin/javaws-launcher %f +GenericName[cs]=Spravovat a spouštět aplikace Java Web Start +GenericName=Manage and run Java Web Start Applications +Icon=java +MimeType=application/x-java-jnlp-file; +Name[cs]=Java Web Start +Name=Java Web Start +Path= +StartupNotify=true +Terminal=false +Type=Application +Categories=Network;Java; diff --git a/community/java-oracle/javaws-launcher b/community/java-oracle/javaws-launcher new file mode 100644 index 000000000..2831dfcbb --- /dev/null +++ b/community/java-oracle/javaws-launcher @@ -0,0 +1,7 @@ +#!/bin/sh + +if [ -z "$@" ]; then + exec javaws -viewer +else + exec javaws "$@" +fi diff --git a/community/java-oracle/jdk.install b/community/java-oracle/jdk.install new file mode 100644 index 000000000..abe08b6a0 --- /dev/null +++ b/community/java-oracle/jdk.install @@ -0,0 +1,7 @@ +post_install() { + echo "The jdk package is licensed software." + echo "You MUST read and agree to the license stored in" + echo "/opt/java/LICENSE before using it." + + echo 'Please relogin to include jdk in your PATH' +} diff --git a/community/java-oracle/jdk.profile b/community/java-oracle/jdk.profile new file mode 100644 index 000000000..f9d5deb68 --- /dev/null +++ b/community/java-oracle/jdk.profile @@ -0,0 +1,4 @@ +export J2SDKDIR=/opt/java +export PATH=$PATH:/opt/java/bin:/opt/java/db/bin +export JAVA_HOME=/opt/java +export DERBY_HOME=/opt/java/db diff --git a/community/java-oracle/jdk.profile.csh b/community/java-oracle/jdk.profile.csh new file mode 100644 index 000000000..3626e7287 --- /dev/null +++ b/community/java-oracle/jdk.profile.csh @@ -0,0 +1,4 @@ +setenv J2SDKDIR /opt/java +setenv PATH ${PATH}:/opt/java/bin:/opt/java/db/bin +setenv JAVA_HOME /opt/java +setenv DERBY_HOME /opt/java/db diff --git a/community/java-oracle/jre.install b/community/java-oracle/jre.install new file mode 100644 index 000000000..111da3c2a --- /dev/null +++ b/community/java-oracle/jre.install @@ -0,0 +1,20 @@ +post_install() { + echo "The jre package is licensed software." + echo "You MUST read and agree to the license stored in" + echo "/opt/java/jre/LICENSE before using it." + if [ -f /etc/mailcap ] ; then + sed -e '/application\/x-java-jnlp-file/d' -i /etc/mailcap + fi + echo 'application/x-java-jnlp-file;/opt/java/jre/bin/javaws %s' >>/etc/mailcap + + echo 'Please relogin to include jre in your PATH.' +} + +post_remove() { + mailcap=$(grep -v 'application/x-java-jnlp-file' /etc/mailcap) + if [ "$mailcap" != "" ] ; then + sed -e '/application\/x-java-jnlp-file/d' -i /etc/mailcap + else + rm /etc/mailcap + fi +} diff --git a/community/java-oracle/jre.profile b/community/java-oracle/jre.profile new file mode 100644 index 000000000..ded0efe81 --- /dev/null +++ b/community/java-oracle/jre.profile @@ -0,0 +1,2 @@ +export PATH=$PATH:/opt/java/jre/bin +export JAVA_HOME=${JAVA_HOME:-/opt/java/jre} diff --git a/community/java-oracle/jre.profile.csh b/community/java-oracle/jre.profile.csh new file mode 100644 index 000000000..a4e72ddf4 --- /dev/null +++ b/community/java-oracle/jre.profile.csh @@ -0,0 +1,4 @@ +setenv PATH ${PATH}:/opt/java/jre/bin +if (! "$?JAVA_HOME" ) then + setenv JAVA_HOME /opt/java/jre +endif diff --git a/community/klavaro/PKGBUILD b/community/klavaro/PKGBUILD index 45465d331..3996eca85 100644 --- a/community/klavaro/PKGBUILD +++ b/community/klavaro/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 43686 2011-03-29 05:52:51Z stativ $ +# $Id: PKGBUILD 52812 2011-07-28 17:27:25Z stativ $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgname=klavaro -pkgver=1.9.0 +pkgver=1.9.3 pkgrel=1 pkgdesc="Free touch typing tutor program" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ depends=('curl' 'gtkdatabox' 'hicolor-icon-theme') makedepends=('intltool') install=$pkgname.install source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2) -md5sums=('e6ad9c7b3d9b3060f32441b04aa9c632') +md5sums=('34c4609951177cf53dd9af98daeca36a') build() { cd "$srcdir"/$pkgname-$pkgver diff --git a/community/kphotoalbum/PKGBUILD b/community/kphotoalbum/PKGBUILD index 1be9cf94c..fedd5044f 100644 --- a/community/kphotoalbum/PKGBUILD +++ b/community/kphotoalbum/PKGBUILD @@ -7,13 +7,13 @@ pkgname=kphotoalbum pkgver=4.1.1 -pkgrel=8 +pkgrel=9.1 pkgdesc="KDE Photo Album, picture collection manager" url="http://www.kphotoalbum.org/" arch=('i686' 'x86_64' 'mips64el') license=('GPL') -depends=('kdebase-runtime' 'kdegraphics-libs') -makedepends=('cmake' 'automoc4' 'kdeedu-marble' 'kipi-plugins>=1.8.0' 'kdemultimedia-mplayerthumbs' 'docbook-xsl') +depends=('kdebase-runtime' 'libkipi' 'libkexiv2' 'libkdcraw') +makedepends=('cmake' 'automoc4' 'kdeedu-marble' 'kdemultimedia-mplayerthumbs' 'docbook-xsl') optdepends=('kdeedu-marble: integration with Marble' 'kipi-plugins: add extra functionality' 'kdemultimedia-mplayerthumbs: video thumbnails') diff --git a/community/libcss/PKGBUILD b/community/libcss/PKGBUILD index 1eabfba4d..ba01933d5 100644 --- a/community/libcss/PKGBUILD +++ b/community/libcss/PKGBUILD @@ -3,7 +3,7 @@ pkgname=libcss pkgver=0.1.0 -pkgrel=1 +pkgrel=2 pkgdesc="A CSS parser and selection engine." arch=('i686' 'x86_64' 'mips64el') url="http://www.netsurf-browser.org/projects/libcss/" @@ -14,12 +14,17 @@ md5sums=('47b9bba60fffe16ecebeba578c89fd40') build() { cd ${srcdir}/${pkgname}-${pkgver}-src + export CFLAGS="-Wno-error=unused-but-set-variable" - make + + make PREFIX=/usr COMPONENT_TYPE="lib-shared" + make PREFIX=/usr COMPONENT_TYPE="lib-static" } package() { cd ${srcdir}/${pkgname}-${pkgver}-src - make PREFIX=/usr DESTDIR=${pkgdir} install + + make install PREFIX=/usr DESTDIR="${pkgdir}" COMPONENT_TYPE="lib-shared" + make install PREFIX=/usr DESTDIR="${pkgdir}" COMPONENT_TYPE="lib-static" install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING } diff --git a/community/libparserutils/PKGBUILD b/community/libparserutils/PKGBUILD index 980aa3626..d5afff5e9 100644 --- a/community/libparserutils/PKGBUILD +++ b/community/libparserutils/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 46354 2011-05-06 03:07:02Z bfanella $ +# $Id: PKGBUILD 52548 2011-07-26 04:43:08Z bfanella $ # Maintainer: Brad Fanella <bradfanella@archlinux.us> # Contributor: Paulo Matias <matiasΘarchlinux-br·org> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=libparserutils pkgver=0.1.0 -pkgrel=1 +pkgrel=2 pkgdesc="Library for building efficient parsers" arch=('i686' 'x86_64' 'mips64el') url="http://www.netsurf-browser.org/projects/libparserutils" @@ -14,15 +14,18 @@ source=("http://www.netsurf-browser.org/projects/releases/${pkgname}-${pkgver}-s md5sums=('eb415317925a0fb12a4ff8f849d2fe92') build() { - cd ${srcdir}/${pkgname}-${pkgver}-src + cd "${srcdir}"/${pkgname}-${pkgver}-src sed 's/-Wall/ /' -i Makefile - make PREFIX=/usr + make PREFIX=/usr COMPONENT_TYPE="lib-shared" + make PREFIX=/usr COMPONENT_TYPE="lib-static" } package() { - cd ${srcdir}/${pkgname}-${pkgver}-src + cd "${srcdir}"/${pkgname}-${pkgver}-src + + make install PREFIX=/usr DESTDIR="${pkgdir}" COMPONENT_TYPE="lib-shared" + make install PREFIX=/usr DESTDIR="${pkgdir}" COMPONENT_TYPE="lib-static" + install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/COPYING - make install PREFIX=/usr DESTDIR=${pkgdir} - install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING } diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD index 41e3df4d8..96e5b4f2e 100644 --- a/community/libvirt/PKGBUILD +++ b/community/libvirt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 52410 2011-07-24 18:09:00Z giovanni $ +# $Id: PKGBUILD 52905 2011-07-29 19:20:46Z giovanni $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jonathan Wiersma <archaur at jonw dot org> pkgname=libvirt pkgver=0.9.3 -pkgrel=2 +pkgrel=3 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)" arch=('i686' 'x86_64' 'mips64el') url="http://libvirt.org/" diff --git a/community/libwapcaplet/PKGBUILD b/community/libwapcaplet/PKGBUILD index 6bff3fe6d..a1ce96856 100644 --- a/community/libwapcaplet/PKGBUILD +++ b/community/libwapcaplet/PKGBUILD @@ -3,7 +3,7 @@ pkgname=libwapcaplet pkgver=0.1.0 -pkgrel=1 +pkgrel=2 pkgdesc="A string internment library with rapid string comparison." arch=('i686' 'x86_64' 'mips64el') url="http://www.netsurf-browser.org/projects/libwapcaplet/" @@ -12,14 +12,16 @@ source=(http://www.netsurf-browser.org/projects/releases/${pkgname}-${pkgver}-sr md5sums=('c21975b81bcdafa60ad6b97b95925efe') build() { - cd ${srcdir}/${pkgname}-${pkgver}-src + cd "${srcdir}"/${pkgname}-${pkgver}-src - make + make PREFIX=/usr COMPONENT_TYPE="lib-shared" + make PREFIX=/usr COMPONENT_TYPE="lib-static" } package() { - cd ${srcdir}/${pkgname}-${pkgver}-src + cd "${srcdir}"/${pkgname}-${pkgver}-src - make PREFIX=/usr DESTDIR=${pkgdir} install + make install PREFIX=/usr DESTDIR="${pkgdir}" COMPONENT_TYPE="lib-shared" + make install PREFIX=/usr DESTDIR="${pkgdir}" COMPONENT_TYPE="lib-static" install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING } diff --git a/community/lightspark/PKGBUILD b/community/lightspark/PKGBUILD index 4e4d7cbc6..e7bd4e2ad 100644 --- a/community/lightspark/PKGBUILD +++ b/community/lightspark/PKGBUILD @@ -2,19 +2,19 @@ # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=lightspark -pkgver=0.4.8.1 -pkgrel=2 +pkgver=0.5.0 +pkgrel=1 pkgdesc='An alternative Flash Player for Linux.' arch=('i686' 'x86_64' 'mips64el') url='http://lightspark.sourceforge.net' license=('LGPL3') conflicts=('lightspark-git') depends=('mesa' 'ftgl' 'sdl' 'gtk2' 'curl' 'zlib' 'ffmpeg' 'glew' 'pcre' 'libpulse' 'libffi' 'boost-libs' 'glibmm' 'gtkglext' 'desktop-file-utils' 'libxml++' 'libxml2') -makedepends=('cmake' 'nasm' 'xulrunner' 'llvm' 'glproto' 'boost' 'pkgconfig' 'fontconfig') +makedepends=('cmake' 'nasm' 'xulrunner' 'llvm' 'glproto' 'boost' 'fontconfig') optdepends=('gnash-gtk: fallback support') install="lightspark.install" source=("http://launchpad.net/lightspark/trunk/lightspark-${pkgver:0:5}/+download/lightspark-${pkgver}.tar.gz") -md5sums=('296b859ea2b5c126e899e609014f2786') +md5sums=('7d42c8e92c3c3b318076393a7e9508fb') build() { rm -rf build diff --git a/community/lilypond/PKGBUILD b/community/lilypond/PKGBUILD index 56849ac0b..d66a9f285 100644 --- a/community/lilypond/PKGBUILD +++ b/community/lilypond/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 51540 2011-07-11 09:57:46Z spupykin $ +# $Id: PKGBUILD 53180 2011-07-31 18:44:33Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Geoffroy Carrier <geoffroy@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> # Contributor: Robert Emil Berge <filoktetes@linuxophic.org> pkgname=lilypond -pkgver=2.14.1 -pkgrel=2 +pkgver=2.14.2 +pkgrel=1 pkgdesc="An automated music engraving system" arch=('i686' 'x86_64' 'mips64el') url="http://lilypond.org" @@ -18,7 +18,7 @@ options=('emptydirs') source=(http://download.linuxaudio.org/lilypond/sources/v2.14/$pkgname-$pkgver.tar.gz http://arch.p5n.pp.ru/~sergej/dl/lilypond-fonts.tar.bz2 texlive-workaround.patch) -md5sums=('262cc7f92c907a7b479b55b3b37a9302' +md5sums=('4053a19e03181021893981280feb9aaa' '2a0e18e5de17d740ada3861bf4d787ea' 'ff32863f3eed67ac744e50bc4fc67a87') diff --git a/community/luakit/PKGBUILD b/community/luakit/PKGBUILD index 886d1c97b..c2e105479 100644 --- a/community/luakit/PKGBUILD +++ b/community/luakit/PKGBUILD @@ -3,7 +3,7 @@ pkgname=luakit pkgver=2011.07.22 -pkgrel=1 +pkgrel=2 pkgdesc='luakit is a highly configurable, micro-browser framework based on the WebKit web content engine and the GTK+ toolkit."Stable" release' arch=('i686' 'x86_64') url='http://www.luakit.org/projects/luakit' @@ -13,8 +13,8 @@ makedepends=('git' 'help2man') options=(!makeflags) conflicts=('luakit-git' 'luakit-develop-git') install='luakit.install' -source=("${pkgver}.tar.gz::https://github.com/mason-larobina/luakit/tarball/${pkgver}") -md5sums=('f682275aa7ebc54beed187481dc4a1bc') +source=("${pkgver}.tar.gz::https://github.com/mason-larobina/luakit/tarball/${pkgver}-r1") +md5sums=('4937deb6bc81416e2deb037f4a5763e4') build() { cd mason-larobina-luakit-* diff --git a/community/luxrender/PKGBUILD b/community/luxrender/PKGBUILD index 736b9a80c..078026fd5 100644 --- a/community/luxrender/PKGBUILD +++ b/community/luxrender/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 50748 2011-06-30 10:59:10Z icelaya $ +# $Id: PKGBUILD 52563 2011-07-26 05:00:59Z svenstaro $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> # Initial contributor: flixie <69one@gmx.net> # Contributor: Imanol Celaya <ornitorrincos@archlinux-es.org> @@ -7,7 +7,7 @@ pkgver=0.8 _pkgver=45d3e13eb94c _luxblend=9cb3fcee0be8 _blender=2.58 -pkgrel=6 +pkgrel=7 pkgdesc="Rendering system for physically correct, unbiased image synthesis" arch=('i686' 'x86_64' 'mips64el') url="http://www.luxrender.net/" diff --git a/community/lxappearance/PKGBUILD b/community/lxappearance/PKGBUILD index a423621e0..ae5234e74 100644 --- a/community/lxappearance/PKGBUILD +++ b/community/lxappearance/PKGBUILD @@ -1,23 +1,27 @@ -#$Id: PKGBUILD 29697 2010-10-18 15:11:39Z angvp $ -# Maintainer: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> +#$Id: PKGBUILD 52925 2011-07-29 21:34:54Z angvp $ +# Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> pkgname=lxappearance -pkgver=0.5.0 +pkgver=0.5.1 pkgrel=1 pkgdesc="GTK+ theme switcher of the LXDE Desktop (manages icons and fonts)" arch=('i686' 'x86_64' 'mips64el') license=('GPL2') url="http://lxde.org/" groups=('lxde') -depends=('gtk2' 'intltool') +depends=('gtk3' 'intltool') makedepends=('pkgconfig') source=(http://downloads.sourceforge.net/sourceforge/lxde/${pkgname}-${pkgver}.tar.gz) -md5sums=('7eabab6f4a358dbc6a84e260a0e7f6c2') build() { cd "$srcdir/$pkgname-$pkgver" - ./configure --sysconfdir=/etc --prefix=/usr + ./configure --sysconfdir=/etc --prefix=/usr --enable-gtk3 make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } +md5sums=('34d157a7fe97ef0b93db8fab3f251e07') diff --git a/community/lxdm/PKGBUILD b/community/lxdm/PKGBUILD index 1663cf998..2dac261bd 100644 --- a/community/lxdm/PKGBUILD +++ b/community/lxdm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 49034 2011-06-09 21:26:14Z andrea $ +# $Id: PKGBUILD 52900 2011-07-29 19:07:23Z angvp $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: kiefer <jorgelmadrid@gmail.com> pkgname=lxdm -pkgver=0.3.0 +pkgver=0.4.1 pkgrel=1 pkgdesc="Lightweight Display Manager (part of LXDE)" arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +16,7 @@ install=${pkgname}.install backup=('etc/lxdm/lxdm.conf') # 'etc/lxdm/xinitrc') source=("http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz" Xsession.patch lxdm.patch lxdm-pam.patch lxdm-daemon) -md5sums=('1d0688e088edab7c3c563263eb2f9654' +md5sums=('8da1cfc2be6dc9217c85a7cf51e1e821' '9bdf95adb74d81d4b6b6176fb1142090' 'baed9055e8825a5511712bc095197519' 'b20fe3c8487a039050986d60e45233a9' @@ -45,5 +45,6 @@ package() { # touch ${pkgdir}/var/lib/lxdm/lxdm.conf # fix the greeter location - sed -i -e "s/libexec/lib\/lxdm/" ${pkgdir}/etc/lxdm/lxdm.conf + # on 0.4.1 this sed have to changed since they changed the default path + sed -i -e "s/local\/libexec/lib\/lxdm/" ${pkgdir}/etc/lxdm/lxdm.conf } diff --git a/community/lxlauncher/PKGBUILD b/community/lxlauncher/PKGBUILD index 45ff79d1f..c8bac639a 100644 --- a/community/lxlauncher/PKGBUILD +++ b/community/lxlauncher/PKGBUILD @@ -1,9 +1,9 @@ -#$Id: PKGBUILD 12709 2010-03-12 12:03:21Z angvp $ +#$Id: PKGBUILD 52832 2011-07-28 23:39:16Z angvp $ # Maintainer: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> # Maintainer: Geoffroy Carrier <geoffroy.carrier@koon.fr> pkgname=lxlauncher -pkgver=0.2.1 -pkgrel=3 +pkgver=0.2.2 +pkgrel=1 pkgdesc="Launcher for Asus EeePC (part of LXDE)" arch=('i686' 'x86_64' 'mips64el') license=('GPL2') @@ -11,27 +11,17 @@ url="http://lxde.org/" groups=('lxde') depends=('gtk2' 'startup-notification' 'gnome-menus' 'menu-cache' 'intltool') makedepends=('pkgconfig') -source=(http://downloads.sourceforge.net/sourceforge/lxde/${pkgname}-${pkgver}.tar.gz - lxlauncher-0.2.1-fix-SUSE-lint-warnings.patch - lxlauncher-0.2.1-fix-for-the-new-behavior-of-libmenu-cache-0.3-series.patch - lxlauncher-0.2.1-dsofix.patch - intltool.patch) -md5sums=('5dbe6076eb1a411278e1fc2bccf2d75d' - '3a4355047d4cfb149ef6a0fa6001b990' - 'ab568453c9bac6848ca6c8cdcf61b371' - 'fa7fd2a1691c6bad86a5278770b38db1' - 'bd04ebee868915da9d64ec9becc1212d') +source=(http://downloads.sourceforge.net/sourceforge/lxde/${pkgname}-${pkgver}.tar.gz) +md5sums=('16df627447838b170a72cc3a9ee21497') build() { cd "$srcdir/$pkgname-$pkgver" - # Adding patches thanks to CWickert and AndyRTR - patch -Np1 -i $srcdir/lxlauncher-0.2.1-fix-SUSE-lint-warnings.patch || return 1 - patch -Np1 -i $srcdir/lxlauncher-0.2.1-fix-for-the-new-behavior-of-libmenu-cache-0.3-series.patch || return 1 - patch -Np1 -i $srcdir/lxlauncher-0.2.1-dsofix.patch || return 1 - #patch -Np1 -i $srcdir/01_fix_infinite_loop.dpatch || return 1 - patch -Np1 -i $srcdir/intltool.patch || return 1 - autoreconf || return 1 - ./configure --sysconfdir=/etc --prefix=/usr || return 1 - make || return 1 - make DESTDIR="$pkgdir" install || return 1 + autoreconf + ./configure --sysconfdir=/etc --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } diff --git a/community/lxmenu-data/PKGBUILD b/community/lxmenu-data/PKGBUILD index 3efe37218..6087648d9 100644 --- a/community/lxmenu-data/PKGBUILD +++ b/community/lxmenu-data/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 49034 2011-06-09 21:26:14Z andrea $ +# $Id: PKGBUILD 52895 2011-07-29 18:44:33Z angvp $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Maintainer: Juergen Hoetzel <juergen@archlinux.org> pkgname=lxmenu-data -pkgver=0.1.1 +pkgver=0.1.2 pkgrel=1 pkgdesc="freedesktop.org desktop menus for LXDE" arch=('i686' 'x86_64') @@ -11,7 +11,8 @@ license=('GPL2') url="http://lxde.org/" groups=('lxde') source=("http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz") -md5sums=('cee3181dd22088f3db0e99ffbedc986d') +makedepends=('intltool') +md5sums=('2184ab3746d572477f1bea7e98e230a8') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/lxpanel/Fix-build-issue-with-symbol-alarm-showing-up-on-F14-.patch b/community/lxpanel/Fix-build-issue-with-symbol-alarm-showing-up-on-F14-.patch deleted file mode 100644 index e3da3d897..000000000 --- a/community/lxpanel/Fix-build-issue-with-symbol-alarm-showing-up-on-F14-.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 4a974f2686d2fafdcda4a180b0483a7b17fd2d71 Mon Sep 17 00:00:00 2001 -From: Marty Jack <martyj@linux.local> -Date: Thu, 22 Jul 2010 19:46:13 -0400 -Subject: [PATCH 3/3] Fix build issue with symbol "alarm" showing up on F14 (Bug3033293) - ---- - src/plugins/batt/batt.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/plugins/batt/batt.c b/src/plugins/batt/batt.c -index 288231f..05c0deb 100644 ---- a/src/plugins/batt/batt.c -+++ b/src/plugins/batt/batt.c -@@ -95,7 +95,7 @@ typedef struct { - typedef struct { - char *command; - sem_t *lock; --} alarm; -+} Alarm; - - static void destructor(Plugin *p); - static void update_display(lx_battery *lx_b, gboolean repaint); -@@ -103,7 +103,7 @@ static void update_display(lx_battery *lx_b, gboolean repaint); - /* alarmProcess takes the address of a dynamically allocated alarm struct (which - it must free). It ensures that alarm commands do not run concurrently. */ - static void * alarmProcess(void *arg) { -- alarm *a = (alarm *) arg; -+ Alarm *a = (Alarm *) arg; - - sem_wait(a->lock); - system(a->command); -@@ -157,7 +157,7 @@ void update_display(lx_battery *lx_b, gboolean repaint) { - /* Run the alarm command if it isn't already running */ - if (alarmCanRun) { - -- alarm *a = (alarm *) malloc(sizeof(alarm)); -+ Alarm *a = (Alarm *) malloc(sizeof(Alarm)); - a->command = lx_b->alarmCommand; - a->lock = &(lx_b->alarmProcessLock); - --- -1.7.1.1 - diff --git a/community/lxpanel/PKGBUILD b/community/lxpanel/PKGBUILD index 21fbb05ab..2d4d83d47 100644 --- a/community/lxpanel/PKGBUILD +++ b/community/lxpanel/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 49034 2011-06-09 21:26:14Z andrea $ +# $Id: PKGBUILD 53158 2011-07-31 08:25:21Z angvp $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Maintainer: Juergen Hoetzel <juergen@archlinux.org> pkgname=lxpanel -pkgver=0.5.6 +pkgver=0.5.8 pkgrel=1 pkgdesc="Panel of the LXDE Desktop" arch=('i686' 'x86_64' 'mips64el') @@ -11,15 +11,12 @@ license=('GPL2') url="http://lxde.org/" groups=('lxde') depends=('gtk2' 'alsa-lib' 'menu-cache' 'lxmenu-data') -source=(http://downloads.sourceforge.net/lxde/${pkgname}-${pkgver}.tar.gz - Fix-build-issue-with-symbol-alarm-showing-up-on-F14-.patch) +source=(http://downloads.sourceforge.net/lxde/${pkgname}-${pkgver}.tar.gz) optdepends=(pcmanfm) -md5sums=('3c6b5498b5f4109c3913b10a66809fe6' - 'afe03191cbeccfc702f9a04bffd62dbf') +md5sums=('129fae75d1cd3983fd94542c573a70a1') build() { cd "$srcdir/$pkgname-$pkgver" - patch -p1 -i $srcdir/Fix-build-issue-with-symbol-alarm-showing-up-on-F14-.patch ./configure --sysconfdir=/etc --prefix=/usr make } diff --git a/community/lxrandr/PKGBUILD b/community/lxrandr/PKGBUILD index 22a23bbe5..c427394b5 100644 --- a/community/lxrandr/PKGBUILD +++ b/community/lxrandr/PKGBUILD @@ -1,6 +1,9 @@ +# $Id: PKGBUILD 52615 2011-07-26 12:18:23Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Geoffroy Carrier <geoffroy.carrier@koon.fr> + pkgname=lxrandr -pkgver=0.1.1 +pkgver=0.1.2 pkgrel=1 pkgdesc="Monitor configuration tool (part of LXDE)" arch=('i686' 'x86_64' 'mips64el') @@ -8,13 +11,13 @@ license=('GPL2') url="http://lxde.org/" groups=('lxde') depends=('gtk2' 'xorg-server-utils') -makedepends=('pkgconfig') +makedepends=('pkgconfig' 'intltool') source=(http://downloads.sourceforge.net/sourceforge/lxde/${pkgname}-${pkgver}.tar.gz) -md5sums=('ab2c7f6be7e4fe6d1a26e324d836453e') +md5sums=('8a7391581541bba58839ac11dbf5b575') build() { cd "$srcdir/$pkgname-$pkgver" - [ $NOEXTRACT -eq 1 ] || ./configure --sysconfdir=/etc --prefix=/usr || return 1 - make || return 1 - make DESTDIR="$pkgdir" install || return 1 + [ -f Makefile ] || ./configure --sysconfdir=/etc --prefix=/usr + make + make DESTDIR="$pkgdir" install } diff --git a/community/lxtask/PKGBUILD b/community/lxtask/PKGBUILD index 204e2fec3..36b6bb4c4 100644 --- a/community/lxtask/PKGBUILD +++ b/community/lxtask/PKGBUILD @@ -1,14 +1,15 @@ +# $Id: PKGBUILD 52423 2011-07-24 22:29:09Z angvp $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> pkgname=lxtask pkgver=0.1.4 -pkgrel=1 +pkgrel=2 pkgdesc="Task manager of the LXDE Desktop" arch=('i686' 'x86_64' 'mips64el') license=('GPL2') url="http://lxde.org/" groups=('lxde') -depends=('gtk2') +depends=('gtk3') makedepends=('pkgconfig' 'intltool') source=(http://downloads.sourceforge.net/sourceforge/lxde/${pkgname}-${pkgver}.tar.gz) md5sums=('c4ab47d03d41a88696d64d3f1e78cf7f') @@ -16,7 +17,7 @@ md5sums=('c4ab47d03d41a88696d64d3f1e78cf7f') build() { cd "$srcdir/$pkgname-$pkgver" autoreconf - ./configure --sysconfdir=/etc --prefix=/usr + ./configure --sysconfdir=/etc --prefix=/usr --enable-gtk3 make } package() { diff --git a/community/lxterminal/PKGBUILD b/community/lxterminal/PKGBUILD index 09f3c3e68..8c76a79ca 100644 --- a/community/lxterminal/PKGBUILD +++ b/community/lxterminal/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 25770 2010-09-11 01:42:59Z angvp $ -# Maintainer: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> +# $Id: PKGBUILD 52827 2011-07-28 23:21:06Z angvp $ +# # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> pkgname=lxterminal -pkgver=0.1.9 +pkgver=0.1.11 pkgrel=1 pkgdesc="VTE-based terminal emulator (part of LXDE)" arch=('i686' 'x86_64' 'mips64el') @@ -12,12 +12,16 @@ groups=('lxde') depends=('fontconfig' 'libx11' 'glib2' 'vte' 'gtk2') makedepends=('pkgconfig' 'intltool') source=(http://downloads.sourceforge.net/sourceforge/lxde/${pkgname}-${pkgver}.tar.gz) +md5sums=('fd9140b45c0f28d021253c4aeb8c4aea') build() { cd "$srcdir/$pkgname-$pkgver" - ./configure --sysconfdir=/etc --prefix=/usr || return 1 - make || return 1 - make DESTDIR="$pkgdir" install || return 1 + ./configure --sysconfdir=/etc --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } -md5sums=('cb10cc667611dce3c141294712049c43') diff --git a/community/mapnik/PKGBUILD b/community/mapnik/PKGBUILD index 0de6cc82b..1ac199155 100644 --- a/community/mapnik/PKGBUILD +++ b/community/mapnik/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 48662 2011-06-03 19:43:21Z stephane $ +# $Id: PKGBUILD 52462 2011-07-25 20:12:25Z jelle $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: David Dent <thewinch@gmail.com> # Contributor: orbisvicis <orbisvicis@gmail.com> pkgname=mapnik pkgver=0.7.1 -pkgrel=10 +pkgrel=11 pkgdesc="Free Toolkit for developing mapping applications. Above all Mapnik is about rendering beautiful maps." arch=('i686' 'x86_64' 'mips64el') url="http://mapnik.org/" diff --git a/community/mc/PKGBUILD b/community/mc/PKGBUILD index 1fcb65631..e0ef8b0d8 100644 --- a/community/mc/PKGBUILD +++ b/community/mc/PKGBUILD @@ -1,8 +1,9 @@ -# $Id: PKGBUILD 46971 2011-05-13 20:45:35Z andrea $ -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> +# $Id: PKGBUILD 52675 2011-07-27 13:42:43Z schuay $ +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> +# Maintainer: schuay <jakob.gruber@gmail.com> pkgname=mc -pkgver=4.7.5.2 +pkgver=4.7.5.3 pkgrel=1 pkgdesc="Midnight Commander is a text based filemanager/shell that emulates Norton Commander" arch=('i686' 'x86_64') @@ -10,14 +11,27 @@ url="http://www.ibiblio.org/mc/" license=('GPL') depends=('e2fsprogs' 'glib2' 'pcre' 'gpm' 'slang') makedepends=('libxt' 'libx11') -optdepends=('p7zip: support for 7zip archives') +optdepends=('p7zip: support for 7zip archives' + 'mtools: a+ extfs' + 'cdparanoia: audio extfs' + 'gawk: hp48+ extfs' + 'cdrkit: iso9660 extfs' + 'perl: needed by several extfs scripts' + 'python-boto: s3+ extfs' + 'python2-pytz: s3+ extfs' + 'p7zip: u7z extfs' + 'unace: uace extfs' + 'unarj: uarj extfs' + 'cabextract: ucab extfs' + 'unrar: urar extfs' + 'zip: uzip extfs') provides=('mcedit-pkgbuild-syntax') conflicts=('mc-utf8') replaces=('mc-utf8') options=('!emptydirs' '!makeflags') source=("http://www.midnight-commander.org/downloads/${pkgname}-${pkgver}.tar.bz2") -md5sums=('bdae966244496cd4f6d282d80c9cf3c6') -sha1sums=('08ffcc9fd19c7d8906a454c27b7074ca35bce14a') +md5sums=('6a67e139e0032d8a871455a80d490941') +sha1sums=('1f24ee96048e370419bf017f49b76ea3341bc545') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/mongodb/PKGBUILD b/community/mongodb/PKGBUILD index c6d22e9f2..7d06ea77e 100644 --- a/community/mongodb/PKGBUILD +++ b/community/mongodb/PKGBUILD @@ -4,7 +4,7 @@ pkgname=mongodb pkgver=1.8.2 -pkgrel=5 +pkgrel=6 pkgdesc='A high-performance, open source, schema-free document-oriented database.' arch=('i686' 'x86_64' 'mips64el') url='http://www.mongodb.org' diff --git a/community/mongodb/mongodb.install b/community/mongodb/mongodb.install index 8808eea0d..3922c12ef 100755 --- a/community/mongodb/mongodb.install +++ b/community/mongodb/mongodb.install @@ -16,12 +16,15 @@ post_upgrade() { chown -R mongodb:daemon /var/lib/mongodb chown -R mongodb:daemon /var/log/mongodb - # have to fix my fudge up in 1.8.2-2 and 1.8.2-3 - # added july 5th, 2011 - usermod -s /bin/bash mongodb >& /dev/null - echo 'The dbpath has changed from /var/state/mongodb to /var/lib/mongodb' - echo 'Make sure you move your data files to the new dbpath before you start/restart mongodb' - echo 'The logpath has changed from /var/log/mongod to /var/log/mongodb/mongod.log' + if [ "$(vercmp $2 1.8.2-3)" -lt 0 ] + then + # have to fix my fudge up in 1.8.2-2 and 1.8.2-3 + # added july 5th, 2011 + usermod -s /bin/bash mongodb >& /dev/null + echo 'The dbpath has changed from /var/state/mongodb to /var/lib/mongodb' + echo 'Make sure you move your data files to the new dbpath before you start/restart mongodb' + echo 'The logpath has changed from /var/log/mongod to /var/log/mongodb/mongod.log' + fi } pre_remove() { diff --git a/community/mpdscribble/PKGBUILD b/community/mpdscribble/PKGBUILD index 9ddf68717..182670fbd 100644 --- a/community/mpdscribble/PKGBUILD +++ b/community/mpdscribble/PKGBUILD @@ -3,21 +3,21 @@ # Contributor: Luiz Ribeiro <luizribeiro@gmail.com> pkgname=mpdscribble -pkgver=0.21 -pkgrel=4 +pkgver=0.22 +pkgrel=2 pkgdesc='An mpd client which submits track info to last.fm' url='http://mpd.wikia.com/wiki/Client:Mpdscribble' arch=('i686' 'x86_64' 'mips64el') license=('GPL') depends=('libsoup' 'glib2' 'libmpdclient') -install="${pkgname}.install" +install='mpdscribble.install' source=("http://downloads.sourceforge.net/musicpd/mpdscribble-${pkgver}.tar.bz2" 'mpdscribble') -md5sums=('3dc96f9179b8d7efd02cbbceb345e529' +md5sums=('652ee927b797e9a4cef45494e77047db' 'f54c937c7b3ab8e4d39e4b903c2993fc') build() { - cd ${pkgname}-${pkgver} + cd mpdscribble-${pkgver} ./configure \ --prefix=/usr \ @@ -28,7 +28,7 @@ build() { } package() { - cd ${pkgname}-${pkgver} + cd mpdscribble-${pkgver} make DESTDIR=${pkgdir} install @@ -36,8 +36,8 @@ package() { ${pkgdir}/etc/rc.d/mpdscribble # default config is really an example - install -m644 ${pkgdir}/etc/mpdscribble.conf \ - ${pkgdir}/etc/mpdscribble.conf.example + install -D -m644 ${pkgdir}/etc/mpdscribble.conf \ + ${pkgdir}/usr/share/mpdscribble/mpdscribble.conf.example rm -f ${pkgdir}/etc/mpdscribble.conf install -d ${pkgdir}/var/cache/mpdscribble diff --git a/community/mpdscribble/mpdscribble.install b/community/mpdscribble/mpdscribble.install index 3447b50d6..e7038d5d8 100644 --- a/community/mpdscribble/mpdscribble.install +++ b/community/mpdscribble/mpdscribble.install @@ -1,13 +1,18 @@ post_install() { - echo 'An example config is provided in /etc/mpdscribble.conf.example' + echo 'An example config is provided in /usr/share/mpdscribble/mpdscribble.conf.example' echo echo 'For system-wide config copy this file to /etc/mpdscribble.conf' echo 'For per-user config copy this file to ~/.mpdscribble/mpdscribble.conf' } +## arg 1: the new package version +## arg 2: the old package version pre_upgrade() { # removed /etc/mpdscribble.conf on FEB 19 2011 - if [ -f /etc/mpdscribble.conf ]; then + # only display warning for people with mpdscribble older then 0.21 + if (( "$(vercmp 0.21-1 $2)" > 0 )) && [[ -f /etc/mpdscribble.conf ]] + then + echo "$1 is new $2 is old" cp /etc/mpdscribble.conf /etc/mpdscribble.conf.oldbackup echo 'The package does not provide /etc/mpdscribble.conf anymore.' echo 'Copied /etc/mpdscribble.conf to /etc/mpdscribble.conf.oldbackup' diff --git a/community/musescore/PKGBUILD b/community/musescore/PKGBUILD index af8e3c7de..f95a54c2b 100644 --- a/community/musescore/PKGBUILD +++ b/community/musescore/PKGBUILD @@ -3,19 +3,19 @@ # Maintainer: Stefan Husmann <stefan-husmann@t-online.de pkgname=musescore -pkgver=1.0 +pkgver=1.1 pkgrel=1 pkgdesc="A music score editor written in Qt4" arch=('i686' 'x86_64' 'mips64el') url="http://www.musescore.org/en/" license=('GPL') -depends=('qt>=4.5.0' 'openssl' 'libsndfile' 'qtscriptgenerator') -makedepends=('cmake' 'doxygen') -optdepends=('portaudio' 'jack-audio-connection-kit') -conflicts=('musescore-svn' 'mscore') -source=(http://downloads.sourceforge.net/project/mscore/mscore/MuseScore-${pkgver}/MuseScore-${pkgver}.tar.bz2 'paths.patch') -md5sums=('475c7c5abdaa80318b207884475de9ac' +depends=('qt>=4.5.0' 'libsndfile') +makedepends=('cmake' 'doxygen' 'qtscriptgenerator') +optdepends=('portaudio' 'jack') +source=(http://sourceforge.net/projects/mscore/files/mscore/MuseScore-1.1/mscore-1.1.tar.bz2 'paths.patch') +md5sums=('68b43af92093a16f7f074c0eb560a867' 'e5011154d217f633f21b4bb70e589510') +install=musescore.install build() { cd $srcdir/mscore-${pkgver} @@ -24,14 +24,13 @@ build() { patch -p1 < $srcdir/paths.patch sed -i 's+${Mscore_INSTALL_NAME}man+doc/mscore+' \ "$srcdir"/mscore-$pkgver/mscore/manual/CMakeLists.txt - make PREFIX=/usr release + sed -i 's+BUILD_SCRIPTGEN TRUE+BUILD_SCRIPTGEN FALSE+' \ + "$srcdir"/mscore-$pkgver/mscore/CMakeLists.txt + sed -i 's+static_cast<const+static_cast<+' \ + $srcdir/mscore-$pkgver/mscore/mscore/exportxml.cpp + make PREFIX=/usr release } package() { cd $srcdir/mscore-${pkgver} make DESTDIR="$pkgdir" install - # avoid file conflict with "qtscriptgenerator" - for _i in gui network core uitools xml - do - rm $pkgdir/usr/lib/qt/plugins/script/libqtscript_${_i}.so - done } diff --git a/community/musescore/musescore.install b/community/musescore/musescore.install new file mode 100644 index 000000000..6d2e3727f --- /dev/null +++ b/community/musescore/musescore.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + update-desktop-database -q +} + +post_remove() { + update-desktop-database -q +} diff --git a/community/nestopia/PKGBUILD b/community/nestopia/PKGBUILD index 92635b069..743bf5a4e 100644 --- a/community/nestopia/PKGBUILD +++ b/community/nestopia/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 35191 2010-12-17 15:10:28Z spupykin $ +# $Id: PKGBUILD 53185 2011-07-31 19:02:49Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Tiago Pierezan Camargo <tcamargo@gmail.com> # Contributor: robb_force <robb_force@holybuffalo.net> pkgname=nestopia pkgver=1.40h -pkgrel=3 +pkgrel=4 pkgdesc='An NES emulator featuring cycle exact emulation, a ridiculous number of mappers, and lots of custom sound chips.' url='http://rbelmont.mameworld.info/?page_id=200' license=('GPL') @@ -26,10 +26,8 @@ md5sums=('526c99a06d2b257135e7047b0ed95ae0' build() { cd ${srcdir} - # remove a bogus error message on exit patch -p0 < nestopia_bogus_error_on_save_settings.patch - make -j1 # Install the nestopia script that copies required files to ~/.nestopia @@ -39,9 +37,8 @@ build() { cd ${pkgdir}/usr/bin ln -s ${pkgname} ${pkgname}.sh - cd ${srcdir} - # Install the required files and executable in /usr/share + cd ${srcdir} install -Dm755 nst ${pkgdir}/usr/bin/${pkgname}-bin install -dm775 ${pkgdir}/usr/share/${pkgname}/ install -m644 nstcontrols ${pkgdir}/usr/share/${pkgname}/ diff --git a/community/netsurf/PKGBUILD b/community/netsurf/PKGBUILD index b40371270..b7536eb8b 100644 --- a/community/netsurf/PKGBUILD +++ b/community/netsurf/PKGBUILD @@ -1,30 +1,26 @@ +# $Id: PKGBUILD 52915 2011-07-29 20:04:25Z ebelanger $ # Contributor: Paulo Matias <matiasΘarchlinux-br·org> # Contributor: Georgij Kondratjev <smpuj@bk.ru> # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=netsurf -pkgver=2.6 +pkgver=2.7 pkgrel=1 pkgdesc="Lightweight, fast web browser" arch=('i686' 'x86_64' 'mips64el') url="http://www.netsurf-browser.org/" license=('GPL') -depends=('libmng' 'librsvg' 'curl' 'libglade' 'lcms' 'libjpeg>=7' - 'libwapcaplet' 'libcss') -makedepends=('re2c' 'libnsbmp' 'libnsgif' 'hubbub') +depends=('libmng' 'librsvg' 'curl' 'libglade' 'libcss' 'libnsgif' 'libnsbmp' 'hubbub') +makedepends=('lcms') source=("http://www.netsurf-browser.org/downloads/releases/${pkgname}-${pkgver}-src.tar.gz") -md5sums=('8653789d2ede6dbbfe79882afc7538fc') +md5sums=('52939f2e2319269d7d758ec665f6cb8e') build() { - cd ${srcdir}/${pkgname} - - sed -i 's#GtkNotebookPage#GtkWidget#' gtk/gtk_tabs.c - sed -i 's#GTK_WIDGET_SET_FLAGS(GTK_WIDGET(g->layout), GTK_CAN_FOCUS);#gtk_widget_set_can_focus(GTK_WIDGET(g->layout), true);#' \ - gtk/gtk_window.c + cd "${srcdir}/${pkgname}" + make PREFIX=/usr TARGET=gtk } package() { - cd ${srcdir}/${pkgname} - - make install DESTDIR=${pkgdir} PREFIX=/usr NETSURF_USE_HARU_PDF=NO + cd "${srcdir}/${pkgname}" + make install PREFIX=/usr DESTDIR="${pkgdir}" } diff --git a/community/ogre/PKGBUILD b/community/ogre/PKGBUILD index 39fa1917e..b4ba27669 100644 --- a/community/ogre/PKGBUILD +++ b/community/ogre/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 47685 2011-05-24 19:41:50Z svenstaro $ +# $Id: PKGBUILD 52770 2011-07-28 04:02:26Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> pkgbase=ogre pkgname=('ogre' 'ogre-docs') pkgver=1.7.3 -pkgrel=2 +pkgrel=4 pkgdesc="A scene-oriented, flexible 3D engine written in C++" arch=('i686' 'x86_64' 'mips64el') url='http://www.ogre3d.org' diff --git a/community/performous/PKGBUILD b/community/performous/PKGBUILD index 01aab85d1..7a48e767d 100644 --- a/community/performous/PKGBUILD +++ b/community/performous/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 47952 2011-05-26 11:21:56Z lcarlier $ +# $Id: PKGBUILD 52468 2011-07-25 20:19:33Z lcarlier $ # Maintainer : Laurent Carlier <lordheavym@gmail.com> # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> pkgname=performous pkgver=0.6.1 -pkgrel=6 +pkgrel=7 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' arch=('i686' 'x86_64') url="http://performous.org/" license=('GPL') -depends=('boost-libs>=1.46' 'sdl' 'jack' 'imagemagick' 'ffmpeg' 'glew' 'libxml++' 'portaudio' 'portmidi' \ +depends=('boost-libs>=1.47' 'sdl' 'jack' 'imagemagick' 'ffmpeg' 'glew' 'libxml++' 'portaudio' 'portmidi' \ 'opencv' 'librsvg' 'libjpeg' 'libpng' 'cairo') -makedepends=('cmake' 'pkgconfig' 'help2man' 'boost>=1.46') +makedepends=('cmake' 'pkgconfig' 'help2man' 'boost>=1.47') optdepends=('performous-freesongs: free songs for performous') source=(http://sourceforge.net/projects/$pkgname/files/$pkgname/$pkgver/Performous-$pkgver-Source.tar.bz2) md5sums=('451a759de77984b5a699e91107fe52e2') diff --git a/community/perl-list-moreutils/PKGBUILD b/community/perl-list-moreutils/PKGBUILD index a23aa1c88..ba06ecb98 100644 --- a/community/perl-list-moreutils/PKGBUILD +++ b/community/perl-list-moreutils/PKGBUILD @@ -2,26 +2,31 @@ pkgname=perl-list-moreutils _cpanname=List-MoreUtils -pkgver=0.22 -pkgrel=6 +pkgver=0.32 +pkgrel=1 pkgdesc="Provide the stuff missing in List::Util" arch=('i686' 'x86_64' 'mips64el') -url="http://search.cpan.org/dist/List-MoreUtils" +url="http://search.cpan.org/dist/$_cpanname" license=('GPL' 'PerlArtistic') depends=('perl') options=('!emptydirs') -source=(http://www.cpan.org/authors/id/V/VP/VPARSEVAL/${_cpanname}-$pkgver.tar.gz) -md5sums=('3a6ec506f40662ab1296c48c5eb72016') +source=("http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/${_cpanname}-${pkgver}.tar.gz") +md5sums=('5af56334f8261f4662bd5e2b3f5e4e62') build() { - cd $srcdir/${_cpanname}-$pkgver + cd "$srcdir/${_cpanname}-$pkgver" PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make } +check() { + cd "$srcdir/${_cpanname}-$pkgver" + make test +} + package() { - cd $srcdir/${_cpanname}-$pkgver - make install DESTDIR=$pkgdir - find $pkgdir -name '.packlist' -delete - find $pkgdir -name '*.pod' -delete + cd "$srcdir/${_cpanname}-$pkgver" + make install DESTDIR="$pkgdir" + find "$pkgdir" -name '.packlist' -o -name '*.pod' -delete } + diff --git a/community/picard/PKGBUILD b/community/picard/PKGBUILD index 9f47399bd..655d032f0 100644 --- a/community/picard/PKGBUILD +++ b/community/picard/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 51943 2011-07-18 12:42:54Z bisson $ +# $Id: PKGBUILD 53236 2011-08-02 00:40:12Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> # Maintainer: Mateusz Herych <heniekk@gmail.com> # Contributor: sysrq pkgname=picard -pkgver=0.15 +pkgver=0.15.1 pkgrel=1 pkgdesc='Official MusicBrainz tagger' url='http://musicbrainz.org/doc/MusicBrainz_Picard' @@ -12,7 +13,7 @@ arch=('i686' 'x86_64' 'mips64el') depends=('python2-qt' 'mutagen' 'libofa' 'ffmpeg') optdepends=('libdiscid: CD-Lookup feature') source=("http://ftp.musicbrainz.org/pub/musicbrainz/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('0e8d8afa6f9e493d494a3e9c746834e0') +md5sums=('21b51e229c246e2d17b746649bfa370f') install=install diff --git a/community/pingus/PKGBUILD b/community/pingus/PKGBUILD index 751711d03..36e16a77a 100644 --- a/community/pingus/PKGBUILD +++ b/community/pingus/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 47672 2011-05-24 18:43:41Z tdziedzic $ +# $Id: PKGBUILD 52474 2011-07-25 20:35:38Z jelle $ # Maintainer: Eric Belanger <eric@archlinux.org> pkgname=pingus pkgver=0.7.3 -pkgrel=4 +pkgrel=5 pkgdesc="A Lemmings clone, i.e. a level-based puzzle game." arch=('i686' 'x86_64' 'mips64el') url="http://pingus.seul.org" diff --git a/community/pokerth/PKGBUILD b/community/pokerth/PKGBUILD index cc4df5fca..6020707ed 100644 --- a/community/pokerth/PKGBUILD +++ b/community/pokerth/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 47635 2011-05-24 14:23:55Z tdziedzic $ +# $Id: PKGBUILD 52482 2011-07-25 20:51:19Z jelle $ # Maintainer: Mateusz Herych <heniekk@gmail.com> # Contributor: Vasco Costa <vasco.costa@meiodigital.com> pkgname=pokerth _realname=PokerTH pkgver=0.8.3 -pkgrel=4 +pkgrel=5 pkgdesc="Poker game written in C++/QT4" arch=('i686' 'x86_64' 'mips64el') url="http://www.pokerth.net/" diff --git a/community/qbittorrent/PKGBUILD b/community/qbittorrent/PKGBUILD index 7ecc827e8..07bc8e0ff 100644 --- a/community/qbittorrent/PKGBUILD +++ b/community/qbittorrent/PKGBUILD @@ -4,7 +4,7 @@ pkgname=qbittorrent pkgver=2.8.2 -pkgrel=1 +pkgrel=2 pkgdesc="A bittorrent client written in C++ / Qt4 using the good libtorrent library" arch=('i686' 'x86_64' 'mips64el') url="http://www.qbittorrent.org/" diff --git a/community/qc-usb-messenger/PKGBUILD b/community/qc-usb-messenger/PKGBUILD deleted file mode 100644 index 6563e93e3..000000000 --- a/community/qc-usb-messenger/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 38937 2011-02-03 15:23:52Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Luiz Ribeiro <luizribeiro@gmail.com> - -pkgname=qc-usb-messenger -pkgver=1.8 -pkgrel=14 -pkgdesc="QuickCam Messenger & Communicate driver for Linux" -arch=('i686' 'x86_64' 'mips64el') -url="http://home.mag.cx/messenger/" -license=('GPL') -depends=("kernel26") -conflicts=('qc-usb') -install=$pkgname.install -source=(http://home.mag.cx/messenger/source/$pkgname-$pkgver.tar.gz - qc-usb-messenger-kernel-2.6.33.patch - qc-usb-messenger-kernel-2.6.36.patch - qc-usb-messenger-kernel-2.6.37.patch) -md5sums=('58dc5652a0c91e6cc2adc682ca848964' - 'aa4bb3f2262622d16c3827a4f23400d9' - 'ac2bec633194ac3f06aa683d6ff5668e' - '56a9f78ad1448fa870fa9ca3521fd2a7') - -build() { - _kernver=`pacman -Q kernel26 | cut -d . -f 3 | cut -f 1 -d -` - depends=("kernel26>=2.6.${_kernver}" "kernel26<2.6.`expr ${_kernver} + 1`") - - cd $srcdir/$pkgname-$pkgver - patch -p1 < $srcdir/qc-usb-messenger-kernel-2.6.33.patch - patch -p1 < $srcdir/qc-usb-messenger-kernel-2.6.36.patch - patch -p1 < $srcdir/qc-usb-messenger-kernel-2.6.37.patch - make all - _kernelver=`uname -r` - make install PREFIX=$pkgdir/usr MODULE_DIR=$pkgdir/lib/modules/${_kernelver} LINUX_DIR=/lib/modules/${_kernelver}/build -} diff --git a/community/qc-usb-messenger/qc-usb-messenger-kernel-2.6.33.patch b/community/qc-usb-messenger/qc-usb-messenger-kernel-2.6.33.patch deleted file mode 100644 index b4f6f9833..000000000 --- a/community/qc-usb-messenger/qc-usb-messenger-kernel-2.6.33.patch +++ /dev/null @@ -1,251 +0,0 @@ -Only in qc-usb-messenger-1.8.my: input_read -Only in qc-usb-messenger-1.8.my: modules.order -Only in qc-usb-messenger-1.8.my: Module.symvers -diff -wbBur qc-usb-messenger-1.8/qc-driver.c qc-usb-messenger-1.8.my/qc-driver.c ---- qc-usb-messenger-1.8/qc-driver.c 2008-05-26 11:29:16.000000000 +0000 -+++ qc-usb-messenger-1.8.my/qc-driver.c 2010-04-12 15:59:23.000000000 +0000 -@@ -49,10 +49,8 @@ - #include <linux/quickcam.h> - #endif - #include <linux/version.h> --#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)) || (HAVE_UTSRELEASE_H == 1) --#include <linux/utsrelease.h> --#endif --#include <linux/autoconf.h> -+#include <generated/utsrelease.h> -+#include <generated/autoconf.h> - #include <linux/module.h> - - #include "qc-memory.h" -@@ -1124,7 +1122,6 @@ - PRINTK(KERN_WARNING,"Could not register procfs file entry"); - return -ENXIO; - } -- entry->owner = THIS_MODULE; - entry->data = qc; - entry->read_proc = qc_proc_read; - entry->write_proc = qc_proc_write; -@@ -1137,7 +1134,6 @@ - PRINTK(KERN_WARNING,"Could not register procfs file entry"); - return -ENXIO; - } -- entry->owner = THIS_MODULE; - entry->data = qc; - entry->read_proc = qc_proc_button_read; - entry->write_proc = qc_proc_write; -@@ -1179,13 +1175,11 @@ - PRINTK(KERN_WARNING,"Could not register procfs dir entry"); - return -ENXIO; - } -- qc_proc_video_entry->owner = THIS_MODULE; - qc_proc_quickcam_entry = create_proc_entry(qc_proc_quickcam_name, S_IFDIR, qc_proc_video_entry); - if (!qc_proc_quickcam_entry) { - PRINTK(KERN_WARNING,"Could not register procfs dir entry"); - return -ENXIO; - } -- qc_proc_quickcam_entry->owner = THIS_MODULE; - return 0; - } - /* }}} */ -@@ -2622,7 +2616,11 @@ - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) - struct video_device *dev = video_devdata(file); - #endif -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28) -+ struct quickcam *qc = (struct quickcam *)video_get_drvdata(dev); -+#else - struct quickcam *qc = (struct quickcam *)dev->priv; -+#endif - struct qc_frame_data *fd = &qc->frame_data; - int mask; - -@@ -2674,7 +2672,11 @@ - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) - struct video_device *dev = video_devdata(file); - #endif -- struct quickcam *qc = dev->priv; -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28) -+ struct quickcam *qc = (struct quickcam *)video_get_drvdata(dev); -+#else -+ struct quickcam *qc = (struct quickcam *)dev->priv; -+#endif - int r; - - if (qcdebug&QC_DEBUGLOGIC || qcdebug&QC_DEBUGUSER) PDEBUG("qc_v4l_open(qc=%p)", qc); -@@ -2739,7 +2741,11 @@ - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) - struct video_device *dev = video_devdata(file); - #endif -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28) -+ struct quickcam *qc = (struct quickcam *)video_get_drvdata(dev); -+#else - struct quickcam *qc = (struct quickcam *)dev->priv; -+#endif - if (qcdebug&QC_DEBUGLOGIC || qcdebug&QC_DEBUGUSER) PDEBUG("qc_v4l_close(dev=%p,qc=%p)",dev,qc); - - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) -@@ -2788,7 +2794,11 @@ - struct video_device *dev = video_devdata(file); - int noblock = file->f_flags & O_NONBLOCK; - #endif -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28) -+ struct quickcam *qc = (struct quickcam *)video_get_drvdata(dev); -+#else - struct quickcam *qc = (struct quickcam *)dev->priv; -+#endif - int frame_len; - unsigned char *frame; - long r = 0; -@@ -2845,7 +2855,11 @@ - const void *start = (void *)vma->vm_start; - unsigned long size = vma->vm_end - vma->vm_start; - #endif -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28) -+ struct quickcam *qc = (struct quickcam *)video_get_drvdata(dev); -+#else - struct quickcam *qc = (struct quickcam *)dev->priv; -+#endif - unsigned char *frame; - int ret = 0, frame_size; - #if !HAVE_VMA && LINUX_VERSION_CODE<KERNEL_VERSION(2,6,0) -@@ -2877,7 +2891,11 @@ - struct video_device *dev = video_devdata(file); - void *argp = (void *)arg; - #endif -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28) -+ struct quickcam *qc = (struct quickcam *)video_get_drvdata(dev); -+#else - struct quickcam *qc = (struct quickcam *)dev->priv; -+#endif - int i, retval = 0; - - if (qcdebug&QC_DEBUGLOGIC || qcdebug&QC_DEBUGUSER) PDEBUG("qc_v4l_ioctl(dev=%p,cmd=%u,arg=%p,qc=%p)",dev,cmd,argp,qc); -@@ -2895,7 +2913,7 @@ - if (qcdebug&QC_DEBUGUSER) PDEBUG("VIDIOCGCAP"); - memset(&b, 0, sizeof(b)); - strcpy(b.name, "Logitech QuickCam USB"); /* Max 31 characters */ -- b.type = qc->vdev.type; -+ b.type = qc->vdev.vfl_type; - b.channels = 1; - b.audios = 0; - b.maxwidth = qc->sensor_data.maxwidth; -@@ -3484,7 +3502,7 @@ - - static struct video_device qc_v4l_template = { - name: "QuickCam USB", -- type: VID_TYPE_CAPTURE, // | VID_TYPE_SUBCAPTURE, -+ vfl_type: VID_TYPE_CAPTURE, // | VID_TYPE_SUBCAPTURE, - #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24) - hardware: VID_HARDWARE_QCAM_USB, - #endif -@@ -3662,7 +3680,7 @@ - #endif - /* Register input device for button */ - qc->input_ptr->name = "Quickcam snapshot button"; -- qc->input_ptr->private = qc; -+ input_set_drvdata(qc->input_ptr, qc); - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24) - qc->input_ptr->evbit[0] = BIT_MASK(EV_KEY); - qc->input_ptr->keybit[BIT_WORD(BTN_0)] = BIT_MASK(BTN_0); -@@ -3736,7 +3754,12 @@ - - /* Register V4L video device */ - memcpy(&qc->vdev, &qc_v4l_template, sizeof(qc_v4l_template)); -+ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28) -+ video_set_drvdata(&qc->vdev, qc); -+#else - qc->vdev.priv = qc; -+#endif - - mb(); - r = video_register_device(&qc->vdev, VFL_TYPE_GRABBER, video_nr); -Only in qc-usb-messenger-1.8.my: qc-driver.c.rej -Only in qc-usb-messenger-1.8.my: qc-driver.o -Only in qc-usb-messenger-1.8.my: .qc-driver.o.cmd -Only in qc-usb-messenger-1.8.my: qc-formats.o -Only in qc-usb-messenger-1.8.my: .qc-formats.o.cmd -diff -wbBur qc-usb-messenger-1.8/qc-memory.c qc-usb-messenger-1.8.my/qc-memory.c ---- qc-usb-messenger-1.8/qc-memory.c 2006-11-05 06:36:51.000000000 +0000 -+++ qc-usb-messenger-1.8.my/qc-memory.c 2010-04-12 15:58:26.000000000 +0000 -@@ -27,7 +27,7 @@ - */ - /* }}} */ - /* {{{ [fold] Includes */ --#include <linux/autoconf.h> -+#include <generated/autoconf.h> - #include <linux/version.h> - - #ifdef CONFIG_SMP -@@ -81,12 +81,14 @@ - #define pte_offset(pmd,adr) pte_offset_map(pmd,adr) /* Emulation for a kernel using the new rmap-vm */ - #endif /* Fix by Michele Balistreri <brain87@gmx.net> */ - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26) - #ifndef SetPageReserved - #define SetPageReserved(p) mem_map_reserve(p) - #endif - #ifndef ClearPageReserved - #define ClearPageReserved(p) mem_map_unreserve(p) - #endif -+#endif - /* }}} */ - - /* {{{ [fold] kvirt_to_pa(): obtain physical address from virtual address obtained by vmalloc() */ -Only in qc-usb-messenger-1.8.my: qc-memory.c.rej -Only in qc-usb-messenger-1.8.my: qc-memory.o -Only in qc-usb-messenger-1.8.my: .qc-memory.o.cmd -Only in qc-usb-messenger-1.8.my: qcmessenger.ko -Only in qc-usb-messenger-1.8.my: .qcmessenger.ko.cmd -Only in qc-usb-messenger-1.8.my: qcmessenger.mod.c -Only in qc-usb-messenger-1.8.my: qcmessenger.mod.o -Only in qc-usb-messenger-1.8.my: .qcmessenger.mod.o.cmd -Only in qc-usb-messenger-1.8.my: qcmessenger.o -Only in qc-usb-messenger-1.8.my: .qcmessenger.o.cmd -Only in qc-usb-messenger-1.8.my: qcset -Only in qc-usb-messenger-1.8.my: qc-vv6450.o -Only in qc-usb-messenger-1.8.my: .qc-vv6450.o.cmd -diff -wbBur qc-usb-messenger-1.8/quickcam.h qc-usb-messenger-1.8.my/quickcam.h ---- qc-usb-messenger-1.8/quickcam.h 2008-05-27 06:53:17.000000000 +0000 -+++ qc-usb-messenger-1.8.my/quickcam.h 2010-04-12 15:58:33.000000000 +0000 -@@ -92,7 +92,7 @@ - - #include <linux/version.h> - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19) --#include <linux/autoconf.h> -+#include <generated/autoconf.h> - #else - #include <linux/config.h> - #endif -@@ -242,7 +242,7 @@ - #if LINUX_VERSION_CODE<KERNEL_VERSION(2,4,20) || LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,0) - /* Things come and go... */ - /* Used only for debugging, so this could be actually removed if needed */ --#define sem_getcount(sem) atomic_read(&(sem)->count) -+#define sem_getcount(sem) 0 - #endif - - #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) -Only in qc-usb-messenger-1.8.my: quickcam.h.rej -diff -wbBur qc-usb-messenger-1.8/quickcam.sh qc-usb-messenger-1.8.my/quickcam.sh ---- qc-usb-messenger-1.8/quickcam.sh 2008-05-27 06:53:16.000000000 +0000 -+++ qc-usb-messenger-1.8.my/quickcam.sh 2010-04-12 15:58:18.000000000 +0000 -@@ -374,7 +374,7 @@ - echo "[!] Can not find version.h in kernel source." - KERNELOK="n" - fi --if [ ! -r "$KERNEL_SOURCE/include/linux/autoconf.h" ]; then -+if [ ! -r "$KERNEL_SOURCE/include/generated/autoconf.h" ]; then - echo "[!] Kernel source is not configured properly." - KERNELOK="n" - fi -@@ -414,7 +414,7 @@ - echo "[!] Can still not find version.h in kernel source." - KERNELOK="n" - fi -- if [ ! -r "$KERNEL_SOURCE/include/linux/autoconf.h" ]; then -+ if [ ! -r "$KERNEL_SOURCE/include/generated/autoconf.h" ]; then - echo "[!] Kernel source is still not configured properly." - KERNELOK="n" - fi -Only in qc-usb-messenger-1.8.my: .tmp_versions diff --git a/community/qc-usb-messenger/qc-usb-messenger-kernel-2.6.36.patch b/community/qc-usb-messenger/qc-usb-messenger-kernel-2.6.36.patch deleted file mode 100644 index 426bf95a7..000000000 --- a/community/qc-usb-messenger/qc-usb-messenger-kernel-2.6.36.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -wbBur qc-usb-messenger-1.8/qc-driver.c qc-usb-messenger-1.8.my/qc-driver.c ---- qc-usb-messenger-1.8/qc-driver.c 2008-05-26 11:29:16.000000000 +0000 -+++ qc-usb-messenger-1.8.my/qc-driver.c 2010-12-16 14:08:06.000000000 +0000 -@@ -3476,7 +3494,7 @@ - release: qc_v4l_close, - read: qc_v4l_read, - // write: qc_v4l_write, -- ioctl: qc_v4l_ioctl, -+ compat_ioctl: qc_v4l_ioctl, - mmap: qc_v4l_mmap, - poll: qc_v4l_poll, - }; diff --git a/community/qc-usb-messenger/qc-usb-messenger-kernel-2.6.37.patch b/community/qc-usb-messenger/qc-usb-messenger-kernel-2.6.37.patch deleted file mode 100644 index 234f21e53..000000000 --- a/community/qc-usb-messenger/qc-usb-messenger-kernel-2.6.37.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -wbBur qc-usb-messenger-1.8/qc-driver.c qc-usb-messenger-1.8.my/qc-driver.c ---- qc-usb-messenger-1.8/qc-driver.c 2008-05-26 11:29:16.000000000 +0000 -+++ qc-usb-messenger-1.8.my/qc-driver.c 2011-02-03 15:21:38.000000000 +0000 -@@ -225,7 +223,7 @@ - }; - - static LIST_HEAD(quickcam_list); /* Linked list containing all QuickCams */ --static DECLARE_MUTEX(quickcam_list_lock); /* Always lock first quickcam_list_lock, then qc->lock */ -+static struct semaphore quickcam_list_lock; /* Always lock first quickcam_list_lock, then qc->lock */ - - /* Default values for user-specified lookup-table; may be overwritten by user */ - static unsigned char userlut_contents[QC_LUT_SIZE] = { -@@ -3588,7 +3606,7 @@ - PDEBUG("poisoning qc in qc_usb_init"); - POISON(*qc); - if (qcdebug&QC_DEBUGMUTEX) PDEBUG("init down(%p) in qc_usb_init()", qc); -- init_MUTEX_LOCKED(&qc->lock); -+ sema_init(&qc->lock, 1); - qc->users = 0; - qc->dev = usbdev; - qc->iface = ifacenum; diff --git a/community/qc-usb-messenger/qc-usb-messenger.install b/community/qc-usb-messenger/qc-usb-messenger.install deleted file mode 100644 index 3f6611aea..000000000 --- a/community/qc-usb-messenger/qc-usb-messenger.install +++ /dev/null @@ -1,35 +0,0 @@ -# This is a default template for a post-install scriptlet. You can -# remove any functions you don't need (and this header). - -# arg 1: the new package version -pre_install() { - /bin/true -} - -# arg 1: the new package version -post_install() { - /sbin/depmod -a -} - -# arg 1: the new package version -# arg 2: the old package version -pre_upgrade() { - /bin/true -} - -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - /sbin/depmod -a -} - -# arg 1: the old package version -pre_remove() { - /bin/true -} - -# arg 1: the old package version -post_remove() { - /sbin/depmod -a -} - diff --git a/community/qrencode/PKGBUILD b/community/qrencode/PKGBUILD deleted file mode 100644 index a719c25fe..000000000 --- a/community/qrencode/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id$ -# Maintainer: Florian Pritz< flo@xinu.at> -# Contributor: Dany Martineau <dany.luc.martineau@gmail.com> - -pkgname=qrencode -pkgver=3.1.1 -pkgrel=2 -pkgdesc="C library for encoding data in a QR Code symbol." -arch=(i686 x86_64 'mips64el') -depends=('libpng>=1.4.0') -makedepends=(sdl) -url="http://megaui.net/fukuchi/works/qrencode/index.en.html" -license=('GPL') -options=(!libtool) -source=(http://megaui.net/fukuchi/works/${pkgname}/${pkgname}-${pkgver}.tar.bz2 libpng14.diff) -md5sums=('e7feb2c2c65d0f2f4010a14da3ecdb89' '93e87b2751b0d422a08e96ccaae4d082') - -build() { - cd "${srcdir}/$pkgname-$pkgver" - patch -p1 < "$srcdir/libpng14.diff" - autoreconf - ./autogen.sh - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/$pkgname-$pkgver" - - make prefix="$pkgdir/usr" install -} diff --git a/community/qrencode/libpng14.diff b/community/qrencode/libpng14.diff deleted file mode 100644 index eadf68dde..000000000 --- a/community/qrencode/libpng14.diff +++ /dev/null @@ -1,65 +0,0 @@ -diff -U 3 -H -d -r -N -- qrencode-3.1.1/configure qrencode-3.1.1-ok/configure ---- qrencode-3.1.1/configure 2010-02-02 19:43:16.000000000 -0500 -+++ qrencode-3.1.1-ok/configure 2010-02-03 21:41:43.205709796 -0500 -@@ -11445,12 +11445,12 @@ - pkg_cv_png_CFLAGS="$png_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\"libpng12\"\""; } >&5 -- ($PKG_CONFIG --exists --print-errors ""libpng12"") 2>&5 -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\"libpng14\"\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors ""libpng14"") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then -- pkg_cv_png_CFLAGS=`$PKG_CONFIG --cflags ""libpng12"" 2>/dev/null` -+ pkg_cv_png_CFLAGS=`$PKG_CONFIG --cflags ""libpng14"" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -11463,12 +11463,12 @@ - pkg_cv_png_LIBS="$png_LIBS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\"libpng12\"\""; } >&5 -- ($PKG_CONFIG --exists --print-errors ""libpng12"") 2>&5 -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\"libpng14\"\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors ""libpng14"") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then -- pkg_cv_png_LIBS=`$PKG_CONFIG --libs ""libpng12"" 2>/dev/null` -+ pkg_cv_png_LIBS=`$PKG_CONFIG --libs ""libpng14"" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -11487,14 +11487,14 @@ - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- png_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors ""libpng12""` -+ png_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors ""libpng14""` - else -- png_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors ""libpng12""` -+ png_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors ""libpng14""` - fi - # Put the nasty error message in config.log where it belongs - echo "$png_PKG_ERRORS" >&5 - -- as_fn_error "Package requirements (\"libpng12\") were not met: -+ as_fn_error "Package requirements (\"libpng14\") were not met: - - $png_PKG_ERRORS - -diff -U 3 -H -d -r -N -- qrencode-3.1.1/configure.ac qrencode-3.1.1-ok/configure.ac ---- qrencode-3.1.1/configure.ac 2010-02-02 19:42:12.000000000 -0500 -+++ qrencode-3.1.1-ok/configure.ac 2010-02-03 21:42:07.202419056 -0500 -@@ -36,7 +36,7 @@ - [build_tools=$withval], [build_tools=yes]) - AM_CONDITIONAL(BUILD_TOOLS, [test "x$build_tools" = "xyes" ]) - if test x$build_tools = xyes ; then -- PKG_CHECK_MODULES(png, "libpng12") -+ PKG_CHECK_MODULES(png, "libpng14") - fi - - dnl --with-tests diff --git a/community/qtractor/PKGBUILD b/community/qtractor/PKGBUILD index 5396ea5d9..a191bf2f6 100644 --- a/community/qtractor/PKGBUILD +++ b/community/qtractor/PKGBUILD @@ -1,21 +1,22 @@ -# $Id: PKGBUILD 48203 2011-05-29 20:38:19Z schiv $ +# $Id: PKGBUILD 52272 2011-07-22 23:53:54Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Philipp Überbacher <hollunder at gmx dot at> pkgname=qtractor -pkgver=0.4.9 +pkgver=0.5.0 pkgrel=1 pkgdesc="Audio/MIDI multitrack sequencer" arch=('i686' 'x86_64' 'mips64el') url="http://qtractor.sourceforge.net/" license=('GPL') -depends=('qt' 'jack' 'slv2' 'libmad' 'liblo' +depends=('qt' 'jack' 'slv2>=0.6.6-6' 'libmad' 'liblo' 'libsamplerate' 'rubberband') + # slv2 versioned for https://bugs.archlinux.org/task/25060 makedepends=('ladspa' 'dssi') [ "$CARCH" = "i686" ] && optdepends=('dssi-vst: win32 VST support') changelog=$pkgname.changelog source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('0d7d8c8783dd29f3cd4ceee16ff38333') +md5sums=('6dcc05532f71eaaa1aa0f336bcd265b0') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/rawtherapee/PKGBUILD b/community/rawtherapee/PKGBUILD index e89ad91c5..55dbf6837 100644 --- a/community/rawtherapee/PKGBUILD +++ b/community/rawtherapee/PKGBUILD @@ -1,27 +1,24 @@ -# $Id: PKGBUILD 49124 2011-06-11 10:51:22Z stativ $ +# $Id: PKGBUILD 52439 2011-07-25 17:38:27Z stativ $ # Maintainer: Lukas Jirkovsky <l.jirkovsky AT gmail.com> # Contributor: Bogdan Szczurek <thebodzio(at)gmail.com> # Contributor: Vaclav Kramar <vaclav.kramar@tiscali.cz> # Contributor: Archie <mymaud@gmail.com> pkgname=rawtherapee -pkgver=3.1m6 +pkgver=3.1.1 pkgrel=1 pkgdesc="RAW photo editor" arch=('i686' 'x86_64' 'mips64el') url="http://www.rawtherapee.com/" license=('GPL') -depends=('bzip2' 'gtkmm' 'libiptcdata' 'lcms2' 'desktop-file-utils') +depends=('bzip2' 'gtkmm' 'libiptcdata' 'lcms2' 'desktop-file-utils' 'hicolor-icon-theme') makedepends=('mercurial' 'cmake') install=rawtherapee.install -source=(rawtherapee.desktop rawtherapee.png) -md5sums=('83f14b57b27f066705b0aec7ad56c53d' - '4e54e74684971a2f04d9396b9051570e') +source=() +md5sums=() _root="https://rawtherapee.googlecode.com/hg/" _repo="rawtherapee" -#_branch="branch_3.0" -#_changeset="71045bfba97e" # changeset $pkgver build() { cd "$srcdir" @@ -30,10 +27,10 @@ build() { if [ -d $_repo ] ; then cd $_repo hg pull - hg up "Dev-$pkgver" + hg up "$pkgver" msg "The local files are updated." else - hg clone -u "Dev-$pkgver" $_root $_repo + hg clone -u "$pkgver" $_root $_repo fi msg "Mercurial checkout done or server timeout" @@ -54,11 +51,4 @@ build() { package() { cd "$srcdir/$_repo-build" make DESTDIR="$pkgdir/" install - - # remove unneded rtstart script - # see http://code.google.com/p/rawtherapee/issues/detail?id=184 - rm "$pkgdir"/usr/bin/rtstart - - install -D -m644 "$srcdir"/rawtherapee.desktop "$pkgdir"/usr/share/applications/rawtherapee.desktop - install -D -m644 "$srcdir"/rawtherapee.png "$pkgdir"/usr/share/pixmaps/rawtherapee.png } diff --git a/community/rawtherapee/rawtherapee.desktop b/community/rawtherapee/rawtherapee.desktop deleted file mode 100644 index 3395712a8..000000000 --- a/community/rawtherapee/rawtherapee.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Version=1.0 -Type=Application -Name=RawTherapee -GenericName=RAW image editor -Exec=rt -Icon=rawtherapee -Terminal=false -Categories=Graphics; -StartupNotify=true -MimeType=image/jpeg;image/jpg;image/tiff;image/png;image/x-canon-cr2;image/x-canon-crw;image/x-nikon-nef;image/x-fuji-raf;image/x-pentax-pef;image/x-adobe-dng;image/x-sony-arw;image/x-sony-sr2;image/x-minolta-mrw;image/x-panasonic-raw;image/x-olympus-orf;image/x-kodak-kdc; diff --git a/community/rawtherapee/rawtherapee.install b/community/rawtherapee/rawtherapee.install index 6162b34dd..385eec8f4 100644 --- a/community/rawtherapee/rawtherapee.install +++ b/community/rawtherapee/rawtherapee.install @@ -2,6 +2,7 @@ post_install() { echo "update desktop mime database..." update-desktop-database -q update-mime-database usr/share/mime 1>&2 > /dev/null + xdg-icon-resource forceupdate --theme hicolor &> /dev/null } post_upgrade() { diff --git a/community/rawtherapee/rawtherapee.png b/community/rawtherapee/rawtherapee.png Binary files differdeleted file mode 100644 index 694f4e5da..000000000 --- a/community/rawtherapee/rawtherapee.png +++ /dev/null diff --git a/community/rsyslog/PKGBUILD b/community/rsyslog/PKGBUILD index 1804ebda9..28b8dc0ca 100644 --- a/community/rsyslog/PKGBUILD +++ b/community/rsyslog/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 51093 2011-07-05 08:47:52Z spupykin $ +# $Id: PKGBUILD 52620 2011-07-26 12:19:20Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=rsyslog -pkgver=5.8.2 +pkgver=5.8.3 pkgrel=1 pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability" url="http://www.rsyslog.com/" @@ -22,7 +22,7 @@ source=("http://www.rsyslog.com/files/download/rsyslog/rsyslog-$pkgver.tar.gz" 'rsyslog' 'rsyslog.logrotate' 'rsyslog.conf.d') -md5sums=('fd7822622e974cc263bbd54768d5621c' +md5sums=('b505c1558814335c000f15b59c4db562' 'a18bbcbb6ebdaa13a6ec6d9f3d9eb2da' '8065db4bef3061a4f000ba58779f6829' '1a0cd4530dd5d1439456d5ae230574d9') diff --git a/community/sakura/PKGBUILD b/community/sakura/PKGBUILD index e9bb21b92..aa0f750bb 100644 --- a/community/sakura/PKGBUILD +++ b/community/sakura/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 51984 2011-07-18 20:42:27Z rvanharen $ +# $Id: PKGBUILD 53190 2011-07-31 20:35:40Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Dmitry N. Shilov <stormblast@land.ru> pkgname=sakura -pkgver=2.4.1 +pkgver=2.4.2 pkgrel=1 pkgdesc="A terminal emulator based on GTK and VTE" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('vte' 'libxft' 'desktop-file-utils') makedepends=('cmake') source=(http://pleyades.net/david/projects/$pkgname/$pkgname-$pkgver.tar.bz2) install=sakura.install -sha1sums=('43858ba79574b4e9413aefd19131dc21c9c1f575') +sha1sums=('24b98c42c057da39f57c281a4726901952774641') build() { cd $srcdir/${pkgname}-${pkgver} diff --git a/community/schroot/PKGBUILD b/community/schroot/PKGBUILD index 3601e266b..6cdf2cc9f 100644 --- a/community/schroot/PKGBUILD +++ b/community/schroot/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 47626 2011-05-24 13:55:50Z tdziedzic $ +# $Id: PKGBUILD 52459 2011-07-25 20:06:11Z jelle $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Andreas Wagner <Andreas dot Wagner at em dot uni-frankfurt dot de> pkgname=schroot -pkgver=1.4.22 +pkgver=1.4.23 pkgrel=1 pkgdesc="Allows users to execute shell commands under different root filesystems. \ (Successor to dchroot)." @@ -24,7 +24,7 @@ source=("http://ftp.debian.org/debian/pool/main/s/$pkgname/${pkgname}_${pkgver}. 'script-arch32' 'copyfiles-arch32' 'mount-arch32') -md5sums=('0dde4c76b1623cc277d92f8dc06109d1' +md5sums=('73873e0fee83a45655ed8efa246a1e26' '8e86445e188129232e1782d978dfc967' 'd4558d5691fbdaa46ce669e8f327133b' 'f0d5d5b5e34a860f6f90b5628c680f46') @@ -45,6 +45,12 @@ build() { make } +check() { + cd ${pkgname}-${pkgver} + + make -k check +} + package() { cd ${pkgname}-${pkgver} diff --git a/community/sfml/PKGBUILD b/community/sfml/PKGBUILD index 346c4a828..c183908ef 100644 --- a/community/sfml/PKGBUILD +++ b/community/sfml/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 51998 2011-07-19 14:00:57Z svenstaro $ +# $Id: PKGBUILD 52817 2011-07-28 21:00:43Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Ondrej Martinak <omartinak@gmail.com> @@ -7,7 +7,7 @@ pkgname=sfml _git=true if [[ "${_git}" = "true" ]]; then - pkgver=1.99.git20110719 + pkgver=1.99.git20110728 fi pkgrel=1 diff --git a/community/smc/PKGBUILD b/community/smc/PKGBUILD index 74b9e3bfc..a78f04172 100644 --- a/community/smc/PKGBUILD +++ b/community/smc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 47652 2011-05-24 16:35:46Z schuay $ +# $Id: PKGBUILD 52531 2011-07-26 04:15:24Z svenstaro $ # Maintainer: # Contributor: Juergen Hoetzel <juergen@archlinux.org> # Contributor: Kritoke <typeolinux@yahoo.com> pkgname=smc pkgver=1.9 -pkgrel=11 +pkgrel=12 pkgdesc="Secret Maryo Chronicles" arch=('i686' 'x86_64' 'mips64el') url="http://www.secretmaryo.org/" diff --git a/community/spring/PKGBUILD b/community/spring/PKGBUILD index 36a14a209..f4c1b9bd5 100644 --- a/community/spring/PKGBUILD +++ b/community/spring/PKGBUILD @@ -1,23 +1,25 @@ -# $Id: PKGBUILD 47908 2011-05-26 01:20:52Z svenstaro $ +# $Id: PKGBUILD 52636 2011-07-26 15:57:38Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Arkham <arkham at archlinux dot us> # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> pkgname=spring pkgver=0.82.7.1 -pkgrel=4 +pkgrel=6 pkgdesc='A free 3D real-time-strategy (RTS) game engine' arch=('i686' 'x86_64' 'mips64el') url="http://springrts.com/" license=('GPL') depends=('openal' 'glew' 'boost-libs' 'freetype2' 'devil' 'libvorbis') -makedepends=('boost' 'cmake' 'zip' 'lzma-utils' 'p7zip' 'python' 'java-environment') -optdepends=('python: python-based bots' +makedepends=('boost' 'cmake' 'zip' 'lzma-utils' 'p7zip' 'python2') +optdepends=('python2: python-based bots' 'java-runtime: java-based bots') source=(http://downloads.sourceforge.net/sourceforge/springrts/${pkgname}_${pkgver}_src.tar.lzma - gcc46.patch) + gcc46.patch + awk-java.patch) md5sums=('378cf0b18a5dd5b840964e5945778503' - 'e9586b611db1ed04fe4f0c5982fda7d2') + 'e9586b611db1ed04fe4f0c5982fda7d2' + 'cd94edf21e49ff6ff7d256442ed9aa3c') build() { bsdtar -xf ${pkgname}_${pkgver}_src.tar.lzma @@ -27,6 +29,7 @@ build() { sed -i '1i\ #include <list>' rts/lib/lobby/Connection.h patch -Np1 < $srcdir/gcc46.patch + patch -Np1 < $srcdir/awk-java.patch cmake . \ -DCMAKE_INSTALL_PREFIX=/usr \ -DDATADIR=share/spring diff --git a/community/spring/awk-java.patch b/community/spring/awk-java.patch new file mode 100644 index 000000000..36c932924 --- /dev/null +++ b/community/spring/awk-java.patch @@ -0,0 +1,48 @@ +diff -ru spring_0.82.7.1-old//AI/Interfaces/Java/bin/jna_wrappCommands.awk spring_0.82.7.1/AI/Interfaces/Java/bin/jna_wrappCommands.awk +--- spring_0.82.7.1-old//AI/Interfaces/Java/bin/jna_wrappCommands.awk 2011-07-26 17:29:16.623158278 +0200 ++++ spring_0.82.7.1/AI/Interfaces/Java/bin/jna_wrappCommands.awk 2011-07-26 17:33:00.872921328 +0200 +@@ -341,7 +341,7 @@ + } + + # beginn of struct S*Command +-/^\struct S.*Command( \{)?/ { ++/^struct S.*Command( \{)?/ { + + isInsideCmdStruct = 1; + ind_cmdMember = 0; +diff -ru spring_0.82.7.1-old//AI/Interfaces/Java/bin/jna_wrappEvents.awk spring_0.82.7.1/AI/Interfaces/Java/bin/jna_wrappEvents.awk +--- spring_0.82.7.1-old//AI/Interfaces/Java/bin/jna_wrappEvents.awk 2011-07-26 17:29:16.623158278 +0200 ++++ spring_0.82.7.1/AI/Interfaces/Java/bin/jna_wrappEvents.awk 2011-07-26 17:32:51.009745026 +0200 +@@ -473,7 +473,7 @@ + } + + # beginn of struct S*Event +-/^\struct S.*Event( \{)?/ { ++/^struct S.*Event( \{)?/ { + + isInsideEvtStruct = 1; + ind_evtMember = 0; +diff -ru spring_0.82.7.1-old//AI/Wrappers/Cpp/bin/wrappCommands.awk spring_0.82.7.1/AI/Wrappers/Cpp/bin/wrappCommands.awk +--- spring_0.82.7.1-old//AI/Wrappers/Cpp/bin/wrappCommands.awk 2011-07-26 17:29:16.626491558 +0200 ++++ spring_0.82.7.1/AI/Wrappers/Cpp/bin/wrappCommands.awk 2011-07-26 17:30:25.695391913 +0200 +@@ -387,7 +387,7 @@ + } + + # beginn of struct S*Command +-/^\struct S.*Command( \{)?/ { ++/^struct S.*Command( \{)?/ { + + isInsideCmdStruct = 1; + ind_cmdMember = 0; +diff -ru spring_0.82.7.1-old//AI/Wrappers/Cpp/bin/wrappEvents.awk spring_0.82.7.1/AI/Wrappers/Cpp/bin/wrappEvents.awk +--- spring_0.82.7.1-old//AI/Wrappers/Cpp/bin/wrappEvents.awk 2011-07-26 17:29:16.626491558 +0200 ++++ spring_0.82.7.1/AI/Wrappers/Cpp/bin/wrappEvents.awk 2011-07-26 17:30:13.942245701 +0200 +@@ -366,7 +366,7 @@ + } + + # beginn of struct S*Event +-/^\struct S.*Event( \{)?/ { ++/^struct S.*Event( \{)?/ { + + isInsideEvtStruct = 1; + ind_evtMember = 0; diff --git a/community/springlobby/PKGBUILD b/community/springlobby/PKGBUILD index 795c2ad35..c1107bc53 100644 --- a/community/springlobby/PKGBUILD +++ b/community/springlobby/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 52092 2011-07-20 05:49:04Z svenstaro $ +# $Id: PKGBUILD 53068 2011-07-30 16:48:24Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: DuGi <dugi@irc.pl> pkgname=springlobby -pkgver=0.134 +pkgver=0.135 pkgrel=1 pkgdesc="A free cross-platform lobby client for the Spring RTS project." arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ makedepends=('boost' 'asio' 'cmake') source=(http://www.springlobby.info/tarballs/${pkgname}-${pkgver}.tar.bz2 springlobby.desktop springlobby.png) -md5sums=('0ca0519bc118eb41b4a3fec83e4419ba' +md5sums=('6d02bc0d91a112591460ac86e6a9baaa' '45f8b59d033931d02e734fe3bd7777dd' '1f388187539aeb0358b51995e26ed890') @@ -27,7 +27,7 @@ build() { sed -e 's|/usr/bin/awk|/bin/awk|g' $srcdir/${pkgname}-$pkgver/tools/test-susynclib.awk.bak>$srcdir/${pkgname}-$pkgver/tools/test-susynclib.awk sed -i 's/boost_system-mt/boost_system/g' $srcdir/$pkgname-$pkgver/CMakeLists.txt - sed -i '/curl\/types.h/d' $srcdir/$pkgname-$pkgver/src/utils/downloader.cpp + #sed -i '/curl\/types.h/d' $srcdir/$pkgname-$pkgver/src/utils/downloader.cpp cmake . \ -DCMAKE_INSTALL_PREFIX=/usr \ -DOPTION_SOUND=false diff --git a/community/sword/PKGBUILD b/community/sword/PKGBUILD index 151487e90..3908c9d5d 100644 --- a/community/sword/PKGBUILD +++ b/community/sword/PKGBUILD @@ -1,23 +1,26 @@ -# $Id: PKGBUILD 49750 2011-06-20 22:08:06Z andrea $ +# $Id: PKGBUILD 52657 2011-07-26 22:56:39Z shusmann $ # Maintainer: Stefan Husmann <stefan-husmann@t-online.de> # Contributor: TripleE <eric1548@yahoo.com> pkgname=sword pkgver=1.6.2 -pkgrel=4 -pkgdesc="SWORD libraries for Bible programs" +pkgrel=5 +pkgdesc="Libraries for Bible programs" arch=('i686' 'x86_64' 'mips64el') url="http://www.crosswire.org/sword/index.jsp" license=('GPL') -depends=('curl' 'icu' 'clucene' 'swig') +depends=('curl' 'clucene' 'swig') makedepends=('cmake') backup=('etc/sword.conf') -source=("http://www.crosswire.org/ftpmirror/pub/${pkgname}/source/v1.6/${pkgname}-${pkgver}.tar.gz") -md5sums=('a7dc4456e20e915fec46d774b690e305') +source=("http://www.crosswire.org/ftpmirror/pub/${pkgname}/source/v1.6/${pkgname}-${pkgver}.tar.gz" curl.patch) +md5sums=('a7dc4456e20e915fec46d774b690e305' + 'e84a226ce3697af33b9fdd9a22884a2a') build() { - cd "${srcdir}" - mkdir build + cd "${srcdir}"/$pkgname-$pkgver + patch -p1 < $srcdir/curl.patch + cd $srcdir + [[ -d build ]] || mkdir build cd build cmake ../${pkgname}-${pkgver} \ -DCMAKE_INSTALL_PREFIX=/usr \ diff --git a/community/sword/curl.patch b/community/sword/curl.patch new file mode 100644 index 000000000..63fd4433c --- /dev/null +++ b/community/sword/curl.patch @@ -0,0 +1,22 @@ +diff -Naur sword-1.6.2.orig/src/mgr/curlftpt.cpp sword-1.6.2.new/src/mgr/curlftpt.cpp +--- sword-1.6.2.orig/src/mgr/curlftpt.cpp 2011-07-27 00:41:40.000000000 +0200 ++++ sword-1.6.2.new/src/mgr/curlftpt.cpp 2011-07-27 00:42:05.000000000 +0200 +@@ -26,7 +26,6 @@ + #include <fcntl.h> + + #include <curl/curl.h> +-#include <curl/types.h> + #include <curl/easy.h> + + #include <swlog.h> +diff -Naur sword-1.6.2.orig/src/mgr/curlhttpt.cpp sword-1.6.2.new/src/mgr/curlhttpt.cpp +--- sword-1.6.2.orig/src/mgr/curlhttpt.cpp 2011-07-27 00:41:40.000000000 +0200 ++++ sword-1.6.2.new/src/mgr/curlhttpt.cpp 2011-07-27 00:42:45.000000000 +0200 +@@ -25,7 +25,6 @@ + #include <cctype> + + #include <curl/curl.h> +-#include <curl/types.h> + #include <curl/easy.h> + + #include <swlog.h> diff --git a/community/tagpy/PKGBUILD b/community/tagpy/PKGBUILD index 51c11eaf4..c6871ac03 100644 --- a/community/tagpy/PKGBUILD +++ b/community/tagpy/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 47614 2011-05-24 13:24:59Z jelle $ +# $Id: PKGBUILD 52446 2011-07-25 19:31:48Z jelle $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Callan Barrett <wizzomafizzo@gmail.com> # Contributor: Scott Horowitz <stonecrest@gmail.com> pkgname=tagpy pkgver=0.94.8 -pkgrel=4 +pkgrel=5 pkgdesc="Python bindings for TagLib" arch=('i686' 'x86_64' 'mips64el') url="http://pypi.python.org/pypi/tagpy" diff --git a/community/teeworlds/PKGBUILD b/community/teeworlds/PKGBUILD index eff0bbfca..4c9f80ea9 100644 --- a/community/teeworlds/PKGBUILD +++ b/community/teeworlds/PKGBUILD @@ -5,7 +5,7 @@ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> pkgname=teeworlds -pkgver=0.6.0 +pkgver=0.6.1 _bamver=0.4.0 pkgrel=1 pkgdesc="A multiplayer 2D shooter" @@ -15,14 +15,14 @@ license=('custom') depends=('alsa-lib' 'mesa' 'sdl' 'freetype2') makedepends=('python2') replaces=('teewars') -source=(http://www.teeworlds.com/files/${pkgname}-${pkgver}-src.tar.gz +source=(http://www.teeworlds.com/files/${pkgname}-${pkgver}-source.tar.gz https://github.com/downloads/matricks/bam/bam-${_bamver}.tar.bz2 teeworlds.desktop teeworlds.png) -md5sums=('4d6e5d0fb1b5f0bdf6c5c49714045ef1' +md5sums=('00de7195ecd1f23596dc3237341af512' 'f8b62ad553c3615a725a034df4fb4257' '3944aaf7a8c19a83510b2b39c4cddf5f' - '44f39e398409232a0e0a431ed46d8cc8') + '44f39e398409232a0e0a431ed46d8cc8') build() { # Build bam (used to build teeworlds) @@ -31,7 +31,7 @@ build() { ./make_unix.sh # Build teeworlds - cd ${srcdir}/${pkgname}-${pkgver}-source + cd ${srcdir}/${pkgname}-*-source # Use Python 2 sed -i 's/python /python2 /' bam.lua @@ -40,7 +40,7 @@ build() { } package() { - cd ${srcdir}/${pkgname}-${pkgver}-source + cd ${srcdir}/${pkgname}-*-source # Install data files mkdir -p ${pkgdir}/usr/share/${pkgname}/data diff --git a/community/tellico/PKGBUILD b/community/tellico/PKGBUILD index 3e52ce2c1..5ceb84d20 100644 --- a/community/tellico/PKGBUILD +++ b/community/tellico/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 44985 2011-04-13 23:48:59Z schiv $ +# $Id: PKGBUILD 52662 2011-07-27 08:16:49Z andrea $ # Maintainer: Ray Rashif <schiv@archlinux.org # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> @@ -6,31 +6,32 @@ pkgname=tellico pkgver=2.3.3 -pkgrel=1 +pkgrel=2 pkgdesc="A collection manager for KDE" arch=('i686' 'x86_64' 'mips64el') url="http://tellico-project.org/" license=('GPL') -depends=('kdebase-workspace' 'yaz' 'exempi' 'kdegraphics-libs' 'taglib' +depends=('kdebase-workspace' 'yaz' 'exempi' 'libksane' 'taglib' 'kdemultimedia-kioslave' 'poppler-qt' 'qjson') -makedepends=('automoc4' 'cmake' 'docbook-xsl') +makedepends=('automoc4' 'cmake') install=$pkgname.install source=("http://tellico-project.org/files/${pkgname}-${pkgver}.tar.bz2") md5sums=('7e3da69119324995308fca7ddf8ea6a9') build() { - cd "$srcdir/$pkgname-$pkgver" - - cmake . -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr make } package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir/" install + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install # fix python 2.7 path find "$pkgdir" -iname "*.py" | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' diff --git a/community/tracker/PKGBUILD b/community/tracker/PKGBUILD index 3479de368..02b0597a1 100644 --- a/community/tracker/PKGBUILD +++ b/community/tracker/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 51608 2011-07-12 08:24:26Z spupykin $ +# $Id: PKGBUILD 52920 2011-07-29 21:10:45Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Alexander Fehr <pizzapunk gmail com> pkgname=tracker -pkgver=0.10.19 -pkgrel=2 +pkgver=0.10.21 +pkgrel=1 pkgdesc="Powerful object database, tag/metadata database, search tool and indexer" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnome.org/projects/tracker/" @@ -26,7 +26,7 @@ conflicts=('libtracker') provides=("libtracker") install=tracker.install source=(http://ftp.gnome.org/pub/GNOME/sources/tracker/0.10/tracker-$pkgver.tar.bz2) -md5sums=('59f105fbe7248749aee7ae8d9432b6a9') +md5sums=('200e15db4e2ae9acbd439947219c0d7f') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/twinkle/PKGBUILD b/community/twinkle/PKGBUILD index 3bbc94879..0032df664 100644 --- a/community/twinkle/PKGBUILD +++ b/community/twinkle/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 47620 2011-05-24 13:41:29Z jelle $ +# $Id: PKGBUILD 52444 2011-07-25 19:31:08Z jelle $ # Maintainer: # Contributor: Jeff Mickey <jeff@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> @@ -6,7 +6,7 @@ pkgname=twinkle pkgver=1.4.2 -pkgrel=10 +pkgrel=11 pkgdesc="A softphone for voice over IP and instant messaging communications using the SIP protocol" arch=('i686' 'x86_64' 'mips64el') url="http://www.twinklephone.com/" diff --git a/community/vhba-module/PKGBUILD b/community/vhba-module/PKGBUILD index 509ff2db3..fc76e3b59 100644 --- a/community/vhba-module/PKGBUILD +++ b/community/vhba-module/PKGBUILD @@ -1,27 +1,28 @@ -# $Id: PKGBUILD 48166 2011-05-29 11:57:10Z mherych $ +# $Id: PKGBUILD 51733 2011-07-13 18:23:43Z schiv $ # Maintainer: Mateusz Herych <heniekk@gmail.com> # Contributor: Charles Lindsay <charles@chaoslizard.org> pkgname=vhba-module -pkgver=20100822 +pkgver=20110416 _kernver='2.6.39-ARCH' -pkgrel=5 +pkgrel=1 pkgdesc="Kernel module that emulates SCSI devices" arch=('i686' 'x86_64' 'mips64el') url="http://cdemu.sourceforge.net/" license=('GPL2') depends=('kernel26>=2.6.39' 'kernel26<2.6.40') -makedepends=('kernel26-headers>=2.6.39' 'git') +makedepends=('kernel26-headers>=2.6.39') install=vhba-module.install -source=(http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.gz - vhba-kernel2.6.37.patch) -md5sums=('1d2f06ae33c5d15b7c29e467e4658aa2' - 'f0499fc54f6ef9b8d6ca0b9e940c5906') +source=(http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.gz) +md5sums=('2f91dd4ee8648da92d625221d4275b60') build() { cd "$srcdir/$pkgname-$pkgver" - git apply -p2 ../vhba-kernel2.6.37.patch - make -j1 KDIR=/usr/src/linux-${_kernver} || return 1 - install -D vhba.ko "$pkgdir/lib/modules/${_kernver}/extra/vhba.ko" || return 1 - sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" "$startdir/vhba-module.install" + make -j1 KDIR=/usr/src/linux-${_kernver} +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + install -D vhba.ko "$pkgdir/lib/modules/${_kernver}/extra/vhba.ko" + sed -i "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" "$startdir/vhba-module.install" } diff --git a/community/vhba-module/vhba-module.install b/community/vhba-module/vhba-module.install index c3bcbca3f..edb9e8d2b 100644 --- a/community/vhba-module/vhba-module.install +++ b/community/vhba-module/vhba-module.install @@ -1,7 +1,7 @@ post_install() { echo ">> Place 'vhba' in MODULES= in /etc/rc.conf to enable vhba on system boot." echo ">> This module needs to be recompiled for every kernel version upgrade." - KERNEL_VERSION='2.6.37-ARCH' + KERNEL_VERSION='2.6.39-ARCH' depmod $KERNEL_VERSION > /dev/null 2>&1 } @@ -10,7 +10,7 @@ post_upgrade() { } post_remove() { - KERNEL_VERSION='2.6.37-ARCH' + KERNEL_VERSION='2.6.39-ARCH' depmod $KERNEL_VERSION > /dev/null 2>&1 } diff --git a/community/virtualbox/LocalConfig.kmk b/community/virtualbox/LocalConfig.kmk index d0e939ad4..e5cbcebcd 100644 --- a/community/virtualbox/LocalConfig.kmk +++ b/community/virtualbox/LocalConfig.kmk @@ -14,6 +14,6 @@ VBOX_WITH_REGISTRATION_REQUEST = VBOX_WITH_UPDATE_REQUEST = VBOX_WITH_VNC := 1 VBOX_BLD_PYTHON = python2 -VBOX_JAVA_HOME = /opt/java +VBOX_JAVA_HOME = /usr/lib/jvm/java-6-openjdk VBOX_GCC_WERR = VBOX_GCC_WARN = diff --git a/community/virtualbox/PKGBUILD b/community/virtualbox/PKGBUILD index ddfe5ac4d..5091d201e 100644 --- a/community/virtualbox/PKGBUILD +++ b/community/virtualbox/PKGBUILD @@ -1,21 +1,22 @@ -# $Id: PKGBUILD 52263 2011-07-22 18:30:40Z ibiru $ +# $Id: PKGBUILD 53171 2011-07-31 11:38:59Z ibiru $ #Maintainer: Ionut Biru <ibiru@archlinux.org> pkgbase=virtualbox pkgname=('virtualbox' 'virtualbox-archlinux-additions' 'virtualbox-archlinux-modules' 'virtualbox-sdk') pkgver=4.1.0 -pkgrel=2 +pkgrel=2.1 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' 'mesa' 'libxrandr' 'libxinerama' 'libvncserver' 'jdk' 'gsoap' 'vde2' +'xalan-c' 'sdl' 'libxmu' 'curl' 'python2' 'kernel26-headers' 'mesa' 'libxrandr' 'libxinerama' 'libvncserver' 'openjdk6' '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 UserManual-$pkgver.pdf::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 - change_default_driver_dir.patch) + change_default_driver_dir.patch + fix-kernel-panic.patch) _kernver=2.6.39-LIBRE build() { @@ -25,6 +26,7 @@ build() { patch -Np1 -i "$srcdir/virtualbox-4-mkisofs-check.patch" patch -Np1 -i "$srcdir/vboxdrv-reference.patch" patch -Np1 -i "$srcdir/change_default_driver_dir.patch" + patch -Np0 -i "$srcdir/fix-kernel-panic.patch" cp "$srcdir/LocalConfig.kmk" . @@ -200,6 +202,7 @@ md5sums=('02556a6b4877cfdfbaa3ce0a0c0dcf31' '5f85710e0b8606de967716ded7b2d351' 'ed1341881437455d9735875ddf455fbe' '4cf75d9c091199a47a7a1bc2f4e347d9' - 'c1a07f044c476a190af8486fe78bee0f' - '838c4c4ebe11b34ae2168df5cd06f694' - '97e193f050574dd272a38e5ee5ebe62b') + '78ffa67ff131680f1d2b6f06d4325c5b' + 'b3de603560b2fb2c33e704e4e8ab3de8' + '97e193f050574dd272a38e5ee5ebe62b' + '19b05b85a8a46af5a429b2ab618638cd') diff --git a/community/virtualbox/fix-kernel-panic.patch b/community/virtualbox/fix-kernel-panic.patch new file mode 100644 index 000000000..237715db2 --- /dev/null +++ b/community/virtualbox/fix-kernel-panic.patch @@ -0,0 +1,22 @@ +Index: src/VBox/Runtime/r0drv/linux/mpnotification-r0drv-linux.c
+===================================================================
+--- src/VBox/Runtime/r0drv/linux/mpnotification-r0drv-linux.c (revision 73165)
++++ src/VBox/Runtime/r0drv/linux/mpnotification-r0drv-linux.c (revision 73166)
+@@ -32,6 +32,7 @@
+ #include "internal/iprt.h"
+
+ #include <iprt/mp.h>
++#include <iprt/asm-amd64-x86.h>
+ #include <iprt/err.h>
+ #include <iprt/cpuset.h>
+ #include <iprt/thread.h>
+@@ -82,7 +83,8 @@
+ NOREF(pvUser1);
+
+ AssertRelease(!RTThreadPreemptIsEnabled(NIL_RTTHREAD));
+- AssertRelease(idCpu == RTMpCpuId()); /* ASSUMES iCpu == RTCPUID */
++ AssertReleaseMsg(idCpu == RTMpCpuId(), /* ASSUMES iCpu == RTCPUID */
++ ("idCpu=%u RTMpCpuId=%d ApicId=%d\n", idCpu, RTMpCpuId(), ASMGetApicId() ));
+
+ switch (ulNativeEvent)
+ {
\ No newline at end of file diff --git a/community/virtualbox/vboxdrv.sh b/community/virtualbox/vboxdrv.sh index 5eb7ecb89..845f6c769 100755 --- a/community/virtualbox/vboxdrv.sh +++ b/community/virtualbox/vboxdrv.sh @@ -21,7 +21,7 @@ fi case "$1" in setup) stat_busy "Unloading VirtualBox kernel modules" - for module in vbox{netflt,netadp,drv}; do + for module in vbox{netflt,netadp,drv,pci}; do if grep -q "^${module}" /proc/modules; then MODLIST+=($module) modprobe -r $module diff --git a/community/virtviewer/PKGBUILD b/community/virtviewer/PKGBUILD index 67b2c4613..cbb8cf506 100644 --- a/community/virtviewer/PKGBUILD +++ b/community/virtviewer/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 40291 2011-02-22 18:19:32Z spupykin $ +# $Id: PKGBUILD 52795 2011-07-28 14:05:17Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jonathan Wiersma <archaur at jonw dot org> pkgname=virtviewer -pkgver=0.3.1 +pkgver=0.4.0 pkgrel=1 pkgdesc="A lightweight interface for interacting with the graphical display of virtualized guest OS." depends=('gtk-vnc' 'libglade>=2.6.0' 'libvirt') +makedepends=('intltool') url="http://virt-manager.et.redhat.com" arch=('i686' 'x86_64' 'mips64el') license=('GPL') source=("http://virt-manager.et.redhat.com/download/sources/virt-viewer/virt-viewer-$pkgver.tar.gz") -md5sums=('f7416e4d6b3e04e2d4bdfabe9ef442b2') +md5sums=('392a32a650dd07bed2c858faa85208ba') build() { cd $srcdir/virt-viewer-$pkgver diff --git a/community/vuze/PKGBUILD b/community/vuze/PKGBUILD deleted file mode 100644 index 9443cd719..000000000 --- a/community/vuze/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# Maintainer: Thomas Dziedzic < gostrc at gmail > -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> -# Contributor: Andrea Scarpino <andrea@archlinux.org> - -pkgname=vuze -pkgver=4.6.0.2 -pkgrel=2 -pkgdesc='BitTorrent client with GUI, written in Java.' -arch=('i686' 'x86_64' 'mips64el') -url='http://www.vuze.com/' -license=('GPL') -depends=('java-runtime') -optdepends=('xulrunner: needed for browsing the vuze content') -source=("http://downloads.sourceforge.net/project/azureus/vuze/Vuze_${pkgver//./}/Vuze_${pkgver//./}_linux.tar.bz2" - 'vuze.desktop') -md5sums=('af80c418f0bcc718941762485c916914' - '345ad45b972009dcd672c4eaf52fb336') -[[ $CARCH == 'x86_64' ]] && source[0]="http://downloads.sourceforge.net/project/azureus/vuze/Vuze_${pkgver//./}/Vuze_${pkgver//./}_linux-x86_64.tar.bz2" && md5sums[0]='22a9c2077cb686fbc00b09dc281fe5a1' - -package() { - install -d ${pkgdir}/usr/share - cp -r vuze ${pkgdir}/usr/share - - install -Dm755 vuze/vuze ${pkgdir}/usr/bin/vuze - sed -i 's%#PROGRAM_DIR="/home/username/apps/azureus"%PROGRAM_DIR="/usr/share/vuze"%' ${pkgdir}/usr/bin/vuze - - install -Dm644 vuze/vuze.png ${pkgdir}/usr/share/pixmaps/vuze.png - install -Dm644 vuze.desktop ${pkgdir}/usr/share/applications/vuze.desktop -} diff --git a/community/vuze/vuze.desktop b/community/vuze/vuze.desktop deleted file mode 100644 index fd31db05f..000000000 --- a/community/vuze/vuze.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Vuze -GenericName=BitTorrent Client -Comment=Transfer files via Peer to Peer -Exec=vuze %F -Icon=vuze -Terminal=false -Type=Application -MimeType=application/x-bittorrent; -Categories=Network;FileTransfer;P2P;GTK; -StartupNotify=true diff --git a/community/wt/PKGBUILD b/community/wt/PKGBUILD index a97a41844..d0024d3f5 100644 --- a/community/wt/PKGBUILD +++ b/community/wt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 51980 2011-07-18 20:26:38Z spupykin $ +# $Id: PKGBUILD 52510 2011-07-25 22:14:25Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Denis Martinez <deuns.martinez@gmail.com> pkgname=wt pkgver=3.1.10 -pkgrel=2 +pkgrel=3 pkgdesc="a C++ library and application server for developing and deploying web applications" arch=('i686' 'x86_64') url="http://www.webtoolkit.eu/" @@ -23,15 +23,19 @@ optdepends=('openssl: for SSL support in built-in webserver' 'mysql++: for the hangman example' 'qt: for the Wt/Qt interopability example (wtwithqt)') backup=('etc/wt/wt_config.xml') -source=(http://downloads.sourceforge.net/witty/$pkgname-${pkgver}.tar.gz) -md5sums=('535945f48f479e74b893adf5b1a857b7') +source=(http://downloads.sourceforge.net/witty/$pkgname-${pkgver}.tar.gz + wt-boost-1.47.patch) +md5sums=('535945f48f479e74b893adf5b1a857b7' + '9374ca2e0af1e951d585872ffface805') build() { cd ${srcdir}/${pkgname}-${pkgver} - mkdir build + patch -Rp1 <$srcdir/wt-boost-1.47.patch + mkdir -p build cd build cmake -DCONNECTOR_HTTP=ON -DCMAKE_INSTALL_PREFIX=/usr \ -DWEBUSER=http -DWEBGROUP=http -DRUNDIR=/var/run/wt -DDEPLOYROOT=/var/www/wt \ + -DUSE_SYSTEM_SQLITE3=ON -DCMAKE_EXE_LINKER_FLAGS="-lboost_random" \ -DDESTDIR=${pkgdir} -DWT_CMAKE_FINDER_INSTALL_DIR="share/cmake-2.8/Modules" .. make } diff --git a/community/wt/wt-boost-1.47.patch b/community/wt/wt-boost-1.47.patch new file mode 100644 index 000000000..919e1371f --- /dev/null +++ b/community/wt/wt-boost-1.47.patch @@ -0,0 +1,11 @@ +diff -wbBur wt-3.1.10.q/src/CMakeLists.txt wt-3.1.10/src/CMakeLists.txt +--- wt-3.1.10.q/src/CMakeLists.txt 2011-07-26 00:58:19.000000000 +0400 ++++ wt-3.1.10/src/CMakeLists.txt 2011-06-24 18:51:54.000000000 +0400 +@@ -236,6 +236,7 @@ + web/TimeUtil.C + web/XSSFilter.C + web/XSSUtils.C ++web/random_device.cpp + web/base64.cpp + Plain_html.C + Boot_html.C diff --git a/community/xwax/PKGBUILD b/community/xwax/PKGBUILD index d3a799376..1a98e7f65 100644 --- a/community/xwax/PKGBUILD +++ b/community/xwax/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 45265 2011-04-18 22:19:06Z lfleischer $ +# $Id: PKGBUILD 53200 2011-07-31 23:46:37Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: sputnick <gilles DOT quenot AT gmail DOT com> pkgname=xwax -pkgver=0.9 +pkgver=1.0 pkgrel=1 pkgdesc='Open-source vinyl emulation software for Linux.' arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ optdepends=('cdparanoia: for CD import' 'mpg123: for MP3 import' 'ffmpeg: for video fallback import') source=("http://www.xwax.co.uk/releases/${pkgname}-${pkgver}.tar.gz") -md5sums=('37152a16cbeb6878818ca406959af9b2') +md5sums=('cb07866ac8d4f9e2e12518a6ebd1d6e7') build() { cd "${srcdir}/${pkgname}-${pkgver}" |
