diff options
Diffstat (limited to 'community')
218 files changed, 1717 insertions, 3849 deletions
diff --git a/community/apvlv/PKGBUILD b/community/apvlv/PKGBUILD index b554c403c..b3e7346c6 100644 --- a/community/apvlv/PKGBUILD +++ b/community/apvlv/PKGBUILD @@ -1,28 +1,31 @@ -# $Id: PKGBUILD 55080 2011-09-02 08:40:53Z andrea $ +# $Id: PKGBUILD 56937 2011-10-17 08:19:53Z ibiru $ # 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.2 -pkgrel=1 +pkgrel=2 pkgdesc="A PDF Viewer which behaves like Vim" arch=('i686' 'x86_64' 'mips64el') url="http://naihe2010.github.com/apvlv/" license=('GPL') -depends=('poppler-glib' 'djvulibre') -source=(https://github.com/downloads/naihe2010/$pkgname/$pkgname-${pkgver}-Source.tar.gz apvlv-poppler015.patch) +depends=('gtk2' 'cairo' 'poppler-glib' 'djvulibre') +source=(https://github.com/downloads/naihe2010/$pkgname/$pkgname-${pkgver}-Source.tar.gz apvlv-poppler015.patch poppler-gdk.patch) md5sums=('381d83aa9c253fac5e0be165fca39222' - '308b17a563ed470ea47d408f324ab745') + '308b17a563ed470ea47d408f324ab745' + '076d794ab865e9bd53a5dfd2db1eaa8b') makedepends=('cmake') build() { cd $srcdir/$pkgname-$pkgver-Source patch -Np1 -i $srcdir/apvlv-poppler015.patch + patch -Np1 -i $srcdir/poppler-gdk.patch + mkdir -p build cd build - + cmake -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DAPVLV_WITH_UMD=no .. diff --git a/community/apvlv/poppler-gdk.patch b/community/apvlv/poppler-gdk.patch new file mode 100644 index 000000000..ab487cf1c --- /dev/null +++ b/community/apvlv/poppler-gdk.patch @@ -0,0 +1,150 @@ +diff -ruN apvlv-0.1.2-Source/src/ApvlvFile.cpp apvlv-0.1.2-Source.new/src/ApvlvFile.cpp +--- apvlv-0.1.2-Source/src/ApvlvFile.cpp 2011-10-10 14:23:19.205606984 +0200 ++++ apvlv-0.1.2-Source.new/src/ApvlvFile.cpp 2011-10-10 14:21:50.870952455 +0200 +@@ -29,6 +29,10 @@ + #include "ApvlvUtil.hpp" + #include "ApvlvView.hpp" + ++#ifndef POPPLER_WITH_GDK ++#include "poppler-gdk.h" ++#endif ++ + #ifdef HAVE_LIBUMD + #define LIBUMD_ENABLE_GTK + #include <umd.h> +diff -ruN apvlv-0.1.2-Source/src/poppler-gdk.h apvlv-0.1.2-Source.new/src/poppler-gdk.h +--- apvlv-0.1.2-Source/src/poppler-gdk.h 1970-01-01 01:00:00.000000000 +0100 ++++ apvlv-0.1.2-Source.new/src/poppler-gdk.h 2011-10-10 14:22:06.077846565 +0200 +@@ -0,0 +1,132 @@ ++#include <goo/gtypes.h> ++ ++static void ++copy_cairo_surface_to_pixbuf (cairo_surface_t *surface, ++ GdkPixbuf *pixbuf) ++{ ++ int cairo_width, cairo_height, cairo_rowstride; ++ unsigned char *pixbuf_data, *dst, *cairo_data; ++ int pixbuf_rowstride, pixbuf_n_channels; ++ unsigned int *src; ++ int x, y; ++ ++ cairo_width = cairo_image_surface_get_width (surface); ++ cairo_height = cairo_image_surface_get_height (surface); ++ cairo_rowstride = cairo_image_surface_get_stride (surface); ++ cairo_data = cairo_image_surface_get_data (surface); ++ ++ pixbuf_data = gdk_pixbuf_get_pixels (pixbuf); ++ pixbuf_rowstride = gdk_pixbuf_get_rowstride (pixbuf); ++ pixbuf_n_channels = gdk_pixbuf_get_n_channels (pixbuf); ++ ++ if (cairo_width > gdk_pixbuf_get_width (pixbuf)) ++ cairo_width = gdk_pixbuf_get_width (pixbuf); ++ if (cairo_height > gdk_pixbuf_get_height (pixbuf)) ++ cairo_height = gdk_pixbuf_get_height (pixbuf); ++ for (y = 0; y < cairo_height; y++) ++ { ++ src = (unsigned int *) (cairo_data + y * cairo_rowstride); ++ dst = pixbuf_data + y * pixbuf_rowstride; ++ for (x = 0; x < cairo_width; x++) ++ { ++ dst[0] = (*src >> 16) & 0xff; ++ dst[1] = (*src >> 8) & 0xff; ++ dst[2] = (*src >> 0) & 0xff; ++ if (pixbuf_n_channels == 4) ++ dst[3] = (*src >> 24) & 0xff; ++ dst += pixbuf_n_channels; ++ src++; ++ } ++ } ++} ++ ++static void ++_poppler_page_render_to_pixbuf (PopplerPage *page, ++ int src_x, int src_y, ++ int src_width, int src_height, ++ double scale, ++ int rotation, ++ GBool printing, ++ GdkPixbuf *pixbuf) ++{ ++ cairo_t *cr; ++ cairo_surface_t *surface; ++ ++ surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, ++ src_width, src_height); ++ cr = cairo_create (surface); ++ cairo_save (cr); ++ switch (rotation) { ++ case 90: ++ cairo_translate (cr, src_x + src_width, -src_y); ++ break; ++ case 180: ++ cairo_translate (cr, src_x + src_width, src_y + src_height); ++ break; ++ case 270: ++ cairo_translate (cr, -src_x, src_y + src_height); ++ break; ++ default: ++ cairo_translate (cr, -src_x, -src_y); ++ } ++ ++ if (scale != 1.0) ++ cairo_scale (cr, scale, scale); ++ ++ if (rotation != 0) ++ cairo_rotate (cr, rotation * G_PI / 180.0); ++ ++ if (printing) ++ poppler_page_render_for_printing (page, cr); ++ else ++ poppler_page_render (page, cr); ++ cairo_restore (cr); ++ ++ cairo_set_operator (cr, CAIRO_OPERATOR_DEST_OVER); ++ cairo_set_source_rgb (cr, 1., 1., 1.); ++ cairo_paint (cr); ++ ++ cairo_destroy (cr); ++ ++ copy_cairo_surface_to_pixbuf (surface, pixbuf); ++ cairo_surface_destroy (surface); ++} ++ ++/** ++ * poppler_page_render_to_pixbuf: ++ * @page: the page to render from ++ * @src_x: x coordinate of upper left corner ++ * @src_y: y coordinate of upper left corner ++ * @src_width: width of rectangle to render ++ * @src_height: height of rectangle to render ++ * @scale: scale specified as pixels per point ++ * @rotation: rotate the document by the specified degree ++ * @pixbuf: pixbuf to render into ++ * ++ * First scale the document to match the specified pixels per point, ++ * then render the rectangle given by the upper left corner at ++ * (src_x, src_y) and src_width and src_height. ++ * This function is for rendering a page that will be displayed. ++ * If you want to render a page that will be printed use ++ * poppler_page_render_to_pixbuf_for_printing() instead ++ * ++ * Deprecated: 0.16 ++ **/ ++void ++poppler_page_render_to_pixbuf (PopplerPage *page, ++ int src_x, int src_y, ++ int src_width, int src_height, ++ double scale, ++ int rotation, ++ GdkPixbuf *pixbuf) ++{ ++ g_return_if_fail (POPPLER_IS_PAGE (page)); ++ g_return_if_fail (scale > 0.0); ++ g_return_if_fail (pixbuf != NULL); ++ ++ _poppler_page_render_to_pixbuf (page, src_x, src_y, ++ src_width, src_height, ++ scale, rotation, ++ gFalse, ++ pixbuf); ++} diff --git a/community/aria2/PKGBUILD b/community/aria2/PKGBUILD index c2317ad5e..32df8c75c 100644 --- a/community/aria2/PKGBUILD +++ b/community/aria2/PKGBUILD @@ -4,15 +4,15 @@ # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=aria2 -pkgver=1.12.1 -pkgrel=2 +pkgver=1.13.0 +pkgrel=1 pkgdesc='Download utility that supports HTTP(S), FTP, BitTorrent, and Metalink' arch=('i686' 'x86_64' 'mips64el') url='http://aria2.sourceforge.net/' license=('GPL') depends=('gnutls' 'libxml2' 'sqlite3' 'c-ares' 'ca-certificates') source=("http://downloads.sourceforge.net/aria2/aria2-${pkgver}.tar.bz2") -md5sums=('9f3bf96d92bc8b70b74817ed10c2c7e7') +md5sums=('b86a5bd4a94e465a58656f71b48c90b9') build() { cd aria2-${pkgver} diff --git a/community/arp-scan/PKGBUILD b/community/arp-scan/PKGBUILD new file mode 100644 index 000000000..6987f26d9 --- /dev/null +++ b/community/arp-scan/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 57027 2011-10-18 19:06:52Z mtorromeo $ +# Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> +# Contributor: xav <xav at ethertricks dot net> + +pkgname=arp-scan +pkgver=1.8.1 +pkgrel=1 +pkgdesc="A tool that uses ARP to discover and fingerprint IP hosts on the local network" +arch=('i686' 'x86_64') +url="http://www.nta-monitor.com/tools/arp-scan/" +license=('GPL') +depends=('libpcap' 'perl-libwww') +source=(http://www.nta-monitor.com/tools/arp-scan/download/${pkgname}-${pkgver}.tar.gz) +md5sums=('38db8f27fc6553a88367748ea04483d6') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --mandir=/usr/share/man + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} + diff --git a/community/astyle/PKGBUILD b/community/astyle/PKGBUILD index 0ccad7c7e..670efdf1b 100644 --- a/community/astyle/PKGBUILD +++ b/community/astyle/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 34584 2010-12-09 23:29:27Z mherych $ +# $Id: PKGBUILD 56885 2011-10-16 05:34:00Z bpiotrowski $ # Maintainer: Mateusz Herych <heniekk@gmail.com> # Contributor: Thomas Mader <thezema@gmail.com> # Contributor: Vinay S Shastry <vinayshastry@gmail.com> # Contributor: tardo <tardo@nagi-fanboi.net> pkgname=astyle -pkgver=2.01 +pkgver=2.02 pkgrel=1 pkgdesc="A Free, Fast and Small Automatic Formatter for C, C++, C#, and Java Source Code" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ url="http://sourceforge.net/projects/astyle/" license=('LGPL') depends=('gcc-libs') source=(http://downloads.sourceforge.net/sourceforge/astyle/${pkgname}_${pkgver}_linux.tar.gz) -md5sums=('e85b31972c532373a4054842e2149b34') +md5sums=('6ce1f5c766ba142f152dab4ddd1ee3b7') build() { cd $srcdir/$pkgname/build/gcc diff --git a/community/atanks/PKGBUILD b/community/atanks/PKGBUILD index 6bdf29c51..5dfb0c657 100644 --- a/community/atanks/PKGBUILD +++ b/community/atanks/PKGBUILD @@ -1,43 +1,32 @@ -# $Id: PKGBUILD 48863 2011-06-06 21:45:37Z tdziedzic $ +# $Id: PKGBUILD 56999 2011-10-18 03:48:36Z ebelanger $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jacek Poplawski <jacekpoplawski@gmail.com> # Contributor: Charlie Cox <ccoxiv@yahoo.com> pkgname=atanks -pkgver=5.0 +pkgver=5.2 pkgrel=1 pkgdesc="Atomic Tanks" url="http://atanks.sourceforge.net" license=('GPL') arch=('i686' 'x86_64' 'mips64el') makedepends=('sed') -depends=('allegro>=4.4.0.1' 'gcc-libs') +depends=('allegro4>=4.4.0.1' 'gcc-libs') source=("http://downloads.sourceforge.net/project/atanks/atanks/atanks-${pkgver}/atanks-${pkgver}.tar.gz") -md5sums=('1978fabfb5ab2c33bd079eb492ee4362') +md5sums=('05bedbb7b3f50831a30b47f7776c8c1a') build() { cd atanks-${pkgver} - - #debug messages fix - #sed -i '/lines->Display_All(TRUE)/d' src/files.cpp - #sed -i '/Scroll Offset:/d' src/files.cpp - #sed -i '/T offset:/d' src/files.cpp - # - #sed -i '1,1i#include <sys/stat.h>' src/files.cpp - make } package() { cd atanks-${pkgver} - - make PREFIX=${pkgdir}/usr/ INSTALL="install -c" install + make DESTDIR=${pkgdir} INSTALL="install -c" install sed -i 's/^Name=atanks/Name=Atomic Tanks/' atanks.desktop sed -i 's/^Categories=Game;/Categories=Game;StrategyGame;/' atanks.desktop - install -Dm644 atanks.desktop \ - $pkgdir/usr/share/applications/atanks.desktop - install -Dm644 atanks.png \ - $pkgdir/usr/share/pixmaps/atanks.png + install -Dm644 atanks.desktop $pkgdir/usr/share/applications/atanks.desktop + install -Dm644 atanks.png $pkgdir/usr/share/pixmaps/atanks.png } diff --git a/community/audex/PKGBUILD b/community/audex/PKGBUILD index 0cab5542d..a1d238750 100644 --- a/community/audex/PKGBUILD +++ b/community/audex/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 37808 2011-01-17 23:22:59Z lcarlier $ +# $Id: PKGBUILD 56794 2011-10-12 23:16:45Z lcarlier $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: mightyjaym <jmambrosino@gmail.com> # Contributor: moostik <mooostik_at_gmail.com> pkgname=audex pkgver=0.74b1 -pkgrel=1 +pkgrel=2 pkgdesc="A CDDA extraction tool with a ftp upload function for KDE" arch=('i686' 'x86_64' 'mips64el') url="http://kde.maniatek.com/audex/" @@ -17,11 +17,16 @@ optdepends=('vorbis-tools: OGG encoder' 'flac: FLAC encoder' 'lame: MP3 encoder') install=${pkgname}.install -source=("http://kde.maniatek.com/audex/files/${pkgname}-${pkgver}.tar.xz") -md5sums=('20fdf9a0f89c08f44a151b6bdaab8782') +source=("http://kde.maniatek.com/audex/files/${pkgname}-${pkgver}.tar.xz" + "google_regex.patch") +md5sums=('20fdf9a0f89c08f44a151b6bdaab8782' + '77b33d8daead89d5f4f15b78a1cd1d55') build() { cd ${srcdir} + # fix bug FS#25193 + patch -Np0 -i google_regex.patch + mkdir build cd build diff --git a/community/audex/google_regex.patch b/community/audex/google_regex.patch new file mode 100644 index 000000000..86917e66f --- /dev/null +++ b/community/audex/google_regex.patch @@ -0,0 +1,14 @@ +--- audex-0.74b1/utils/coverfetcher.cpp 2011-01-15 12:06:25.000000000 +0100 ++++ audex-0.74b1/utils/coverfetcher_new.cpp 2011-07-20 18:43:37.554588883 +0200 +@@ -162,7 +162,10 @@ + cover_tbnids.clear(); + cover_thumbnails.clear(); + +- QRegExp rx("<a\\shref=(\\/imgres\\?imgurl=[a-zA-Z0-9\\&\\_\\%\\/\\=\\.\\:\\-\\?]+)>[\\s\\n]*<img\\ssrc=([a-zA-Z0-9\\&\\_\\%\\/\\=\\.\\:\\-\\?]+).*>[\\s\\n]*</a>"); ++ QRegExp rx("<a\\shref=\"(\\/imgres\\?imgurl=[^\"]+)\">[\\s\\n]*<img[^>]+src=\"([^>]+)\"></a>"); ++ QString html = xml; ++ html.replace( QLatin1String("&"), QLatin1String("&") ); ++ + rx.setMinimal(TRUE); + + int pos = 0; int i = 0; diff --git a/community/autossh/PKGBUILD b/community/autossh/PKGBUILD index 4e1769724..dc3634f58 100644 --- a/community/autossh/PKGBUILD +++ b/community/autossh/PKGBUILD @@ -1,8 +1,8 @@ # Contributor: Ian Taylor <ian at lorf dot orgs> pkgname=autossh -pkgver=1.4b -pkgrel=2 +pkgver=1.4c +pkgrel=1 pkgdesc="Automatically restart SSH sessions and tunnels" arch=('i686' 'x86_64' 'mips64el') url="http://www.harding.motd.ca/autossh/" @@ -10,24 +10,24 @@ license=('custom') depends=('openssh') source=("http://www.harding.motd.ca/autossh/$pkgname-$pkgver.tgz" "LICENSE") -md5sums=('8f9aa006f6f69e912d3c2f504622d6f7' +md5sums=('26520eea934f296be0783dabe7fcfd28' '5d65ce1eff3f2c72546a8343b18d67bf') build() { cd $srcdir/$pkgname-$pkgver msg "Configuring" - ./configure --prefix=$pkgdir/usr --sysconfdir=/etc --localstatedir=/var || return 1 + ./configure --prefix=$pkgdir/usr --sysconfdir=/etc --localstatedir=/var msg "Building" - make || return 1 + make msg "Creating package" - install -D -m755 autossh $pkgdir/usr/bin/autossh || return 1 - install -D -m644 CHANGES $pkgdir/usr/share/doc/autossh/CHANGES || return 1 - install -D -m644 README $pkgdir/usr/share/doc/autossh/README || return 1 - install -D -m644 autossh.host $pkgdir/usr/share/autossh/examples/autossh.host || return 1 - install -D -m644 rscreen $pkgdir/usr/share/autossh/examples/rscreen || return 1 - install -D -m644 autossh.1 $pkgdir/usr/share/man/man1/autossh.1 || return 1 - install -D -m644 ${startdir}/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE || return 1 + install -D -m755 autossh $pkgdir/usr/bin/autossh + install -D -m644 CHANGES $pkgdir/usr/share/doc/autossh/CHANGES + install -D -m644 README $pkgdir/usr/share/doc/autossh/README + install -D -m644 autossh.host $pkgdir/usr/share/autossh/examples/autossh.host + install -D -m644 rscreen $pkgdir/usr/share/autossh/examples/rscreen + install -D -m644 autossh.1 $pkgdir/usr/share/man/man1/autossh.1 + install -D -m644 ${srcdir}/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE } diff --git a/community/blueman/PKGBUILD b/community/blueman/PKGBUILD index 79ada2587..21e070311 100644 --- a/community/blueman/PKGBUILD +++ b/community/blueman/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 40729 2011-02-26 08:51:40Z ibiru $ +# $Id: PKGBUILD 56850 2011-10-14 21:12:20Z spupykin $ # Maintainer : Ionut Biru <ibiru@archlinux.org # Contributor: Abhishek Dasgupta <abhidg@gmail.com> pkgname=blueman -pkgver=1.21 -pkgrel=7 +pkgver=1.23 +pkgrel=1 pkgdesc="GTK+ bluetooth manager" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -22,13 +22,13 @@ options=('!libtool') install=$pkgname.install source=(http://download.tuxfamily.org/blueman/${pkgname}-${pkgver}.tar.gz PulsePatch.patch) -md5sums=('26b70341b3d3da28da62c917c8b20377' +md5sums=('f0bee59589f4c23e35bf08c2ef8acaef' 'cdce55a57d7628ed8b6c7fcf4391f4f0') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/PulsePatch.patch" +# patch -Np1 -i "${srcdir}/PulsePatch.patch" # python2 fix for file in apps/blueman*; do diff --git a/community/busybox/PKGBUILD b/community/busybox/PKGBUILD index 6fd6943e1..8d34c17d3 100644 --- a/community/busybox/PKGBUILD +++ b/community/busybox/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 55611 2011-09-15 22:10:36Z ebelanger $ +# $Id: PKGBUILD 56916 2011-10-16 17:30:46Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jens Pranaitis <jens@jenux.homelinux.org> pkgname=busybox pkgver=1.19.2 -pkgrel=2 +pkgrel=3 pkgdesc="Utilities for rescue and embedded systems" arch=("i686" "x86_64" 'mips64el') url="http://busybox.net" @@ -12,6 +12,7 @@ license=('GPL') makedepends=("make" "gcc" "sed" "ncurses") source=($url/downloads/$pkgname-$pkgver.tar.bz2 config) +install=busybox.install md5sums=('50267054345f1a0b77fe65f6e0e5ba29' 'edd5c66c974ccc1b0030fd00beaa1b02') @@ -26,5 +27,5 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" - install -Dm4755 busybox $pkgdir/bin/busybox + install -Dm755 busybox $pkgdir/bin/busybox } diff --git a/community/busybox/busybox.install b/community/busybox/busybox.install new file mode 100644 index 000000000..233b70799 --- /dev/null +++ b/community/busybox/busybox.install @@ -0,0 +1,13 @@ +post_install() { + echo "You may want to do setuid on /bin/busybox" + echo " chmod 4555 /bin/busybox" +} + +pre_upgrade() { + stat -c %a /bin/busybox >tmp/busybox.upgrade.script +} + +post_upgrade() { + [ -f tmp/busybox.upgrade.script ] && chmod `cat tmp/busybox.upgrade.script` /bin/busybox + rm -f tmp/busybox.upgrade.script +} diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD index 372ab6f9a..1ec370976 100644 --- a/community/calibre/PKGBUILD +++ b/community/calibre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 56089 2011-09-30 23:22:23Z giovanni $ +# $Id: PKGBUILD 56939 2011-10-17 08:20:07Z ibiru $ # 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.21 -pkgrel=1 +pkgver=0.8.22 +pkgrel=2 pkgdesc="Ebook management application" arch=('i686' 'x86_64' 'mips64el') url="http://calibre-ebook.com/" @@ -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=('46317b1f4bd6f1cd5279a5f8a1d712ae' +md5sums=('b4e968cda582f362124a52ad588f8af0' '253ce4fe5d01f8ff76b63cd3825755ea') build() { diff --git a/community/catdvi/PKGBUILD b/community/catdvi/PKGBUILD index 820ccb535..d75c81ab1 100644 --- a/community/catdvi/PKGBUILD +++ b/community/catdvi/PKGBUILD @@ -1,26 +1,37 @@ -# Contributor: Xilon <xilonmu@gmail.com> +# $Id: PKGBUILD 56716 2011-10-11 07:11:55Z andrea $ # Maintainer: Stefan Husmann <stefan-husmann@t-online.de> +# Contributor: Xilon <xilonmu@gmail.com> + pkgname=catdvi pkgver=0.14 -pkgrel=3 +pkgrel=4 pkgdesc="A DVI to plain text translator" arch=('i686' 'x86_64' 'mips64el') url="http://catdvi.sourceforge.net" license=('GPL') depends=('glibc' 'texlive-core') -maedepends=('texlive-fontsextra') -source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2") -md5sums=('b18eac65baf522c1e37bb3dc37ab42c3') +makedepends=('texlive-fontsextra') +source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2" + 'texlive2008.patch') +md5sums=('b18eac65baf522c1e37bb3dc37ab42c3' + '509f61a30d3758e5d102c124bc5fa9a0') build() { cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr --mandir=/usr/share/man || return 1 + patch -p1 -i "${srcdir}"/texlive2008.patch + autoconf + + ./configure --prefix=/usr --mandir=/usr/share/man - install -d $pkgdir/usr/bin $pkgdir/usr/share/man/man1 || return 1 - sed -i "s#\(bindir = \)\(.*\)#\1$pkgdir\2#" config.mk || return 1 - sed -i "s#\(mandir = \)\(.*\)#\1$pkgdir\2#" config.mk || return 1 + install -d $pkgdir/usr/bin $pkgdir/usr/share/man/man1 + sed -i "s#\(bindir = \)\(.*\)#\1$pkgdir\2#" config.mk + sed -i "s#\(mandir = \)\(.*\)#\1$pkgdir\2#" config.mk - make || return 1 - make DESTDIR="$pkgdir" install || return 1 + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } diff --git a/community/catdvi/texlive2008.patch b/community/catdvi/texlive2008.patch new file mode 100644 index 000000000..20ee9732e --- /dev/null +++ b/community/catdvi/texlive2008.patch @@ -0,0 +1,58 @@ +--- catdvi-0.14-orig/config.mk.in ++++ catdvi-0.14/config.mk.in +@@ -23,6 +23,7 @@ + + CFG_HAS_GETOPT_LONG = @CFG_HAS_GETOPT_LONG@ + CFG_HAS_KPATHSEA = @CFG_HAS_KPATHSEA@ ++CFG_HAS_KPATHSEA_VERSION_H = @CFG_HAS_KPATHSEA_VERSION_H@ + CFG_KPATHSEA_HAS_GETOPT_LONG = @CFG_KPATHSEA_HAS_GETOPT_LONG@ + CFG_SHOW_PSE2UNIC_WARNINGS = @CFG_SHOW_PSETOUNIC_WARNINGS@ + +--- catdvi-0.14-orig/configure.in ++++ catdvi-0.14/configure.in +@@ -48,6 +48,9 @@ + AC_MSG_ERROR([*** kpathsea library (required) not found; try to use the --with-kpathsea-prefix option ***]) + fi + ++AC_CHECK_HEADERS([kpathsea/version.h], CFG_HAS_KPATHSEA_VERSION_H=yes, CFG_HAS_KPATHSEA_VERSION_H=no) ++AC_SUBST(CFG_HAS_KPATHSEA_VERSION_H) ++ + dnl It seem libkpathsea provides a getopt_long() implementation + dnl if and only if the C library does not. + dnl +--- catdvi-0.14-orig/GNUmakefile ++++ catdvi-0.14/GNUmakefile +@@ -36,6 +36,10 @@ + endif + endif + ++ifeq ($(CFG_HAS_KPATHSEA_VERSION_H),yes) ++CPPFLAGS += -DCFG_HAS_KPATHSEA_VERSION_H ++endif ++ + ifeq ($(CFG_HAS_KPATHSEA),yes) + FINDTFM = kpathsea.o + LDLIBS = -lkpathsea +--- catdvi-0.14-orig/kpathsea.c ++++ catdvi-0.14/kpathsea.c +@@ -21,6 +21,12 @@ + #include "findtfm.h" + #include "version.h" + ++#ifdef CFG_HAS_KPATHSEA_VERSION_H ++#include <kpathsea/version.h> ++#else ++extern char * kpathsea_version_string; ++#endif ++ + void setup_findtfm(char const * progname) + { + kpse_set_program_name(progname, PACKAGE); +@@ -36,7 +42,6 @@ + + void version_findtfm(void) + { +- extern char * kpathsea_version_string; + puts(kpathsea_version_string); + } + diff --git a/community/cdemu-client/PKGBUILD b/community/cdemu-client/PKGBUILD index 3afaa3bcf..278fa33dd 100644 --- a/community/cdemu-client/PKGBUILD +++ b/community/cdemu-client/PKGBUILD @@ -1,8 +1,9 @@ # Maintainer: Mateusz Herych <heniekk@gmail.com> # Contributor: Charles Lindsay <charles@chaoslizard.org> + pkgname=cdemu-client -pkgver=1.3.0 -pkgrel=2 +pkgver=1.4.0 +pkgrel=1 pkgdesc="Simple command-line client for controlling cdemu-daemon" arch=('i686' 'x86_64' 'mips64el') url="http://cdemu.sourceforge.net/" @@ -11,7 +12,7 @@ depends=('python2' 'dbus-python' 'cdemu-daemon') makedepends=('intltool') conflicts=('cdemu') source=(http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.gz) -md5sums=('e1789ec4f839e9dbdb5db88e3923d7ae') +md5sums=('ce469f0660dfa4a9306faed00b3e6d6c') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/cdemu-daemon/PKGBUILD b/community/cdemu-daemon/PKGBUILD index 61ed46c7b..da6024658 100644 --- a/community/cdemu-daemon/PKGBUILD +++ b/community/cdemu-daemon/PKGBUILD @@ -1,25 +1,25 @@ -# $Id: PKGBUILD 40133 2011-02-20 13:02:28Z jelle $ +# $Id: PKGBUILD 57021 2011-10-18 18:14:16Z bpiotrowski $ # Maintainer: Mateusz Herych <heniekk@gmail.com> # Contributor: Charles Lindsay <charles@chaoslizard.org> pkgname=cdemu-daemon -pkgver=1.3.0 -pkgrel=4 +pkgver=1.4.0 +pkgrel=1 pkgdesc="CD/DVD-ROM device emulator daemon" arch=('i686' 'x86_64' 'mips64el') backup=('etc/conf.d/cdemud' 'etc/dbus-1/system.d/cdemud-dbus.conf') url="http://cdemu.sourceforge.net/" license=('GPL') -depends=('glib2' 'dbus' 'dbus-glib' 'libdaemon' 'vhba-module' 'libmirage' 'libao') +depends=('glib2' 'dbus' 'dbus-glib' 'libdaemon' 'vhba-module' "libmirage=$pkgver" 'libao') install=cdemud.install source=(http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.gz cdemud.conf cdemud.rc 60-vhba.rules) -md5sums=('4ec07bd202ac1dcc2f352fc394268d67' - '26b94a626c2c1d0a83ad5a7593dff70f' - '655b2bf46802f2fa7821a649cecd1c4d' +md5sums=('f7ccc0abc33057d552ec7b0925fce63a' + '2b94bd399873e585e40b2bfd8634f322' + '340a30ab2c42162b3bd042c74a399219' '93324b320e7b68d01ad9a0b548018ed5') build() { diff --git a/community/cdemu-daemon/cdemud.conf b/community/cdemu-daemon/cdemud.conf index 91ada613f..8e49cdfd5 100644 --- a/community/cdemu-daemon/cdemud.conf +++ b/community/cdemu-daemon/cdemud.conf @@ -6,3 +6,7 @@ CTL_DEVICE=/dev/vhba_ctl # audio backend (null or alsa) AUDIO_BACKEND=null + +DAEMON="/usr/bin/cdemud" +BUS="system" +LOG_FILE="/var/log/cdemu.log" diff --git a/community/cdemu-daemon/cdemud.rc b/community/cdemu-daemon/cdemud.rc index c13fa6239..6e1b0b091 100644 --- a/community/cdemu-daemon/cdemud.rc +++ b/community/cdemu-daemon/cdemud.rc @@ -7,7 +7,6 @@ case "$1" in start) stat_busy "Loading vhba and loop modules" - modprobe loop modprobe vhba if [ $? -ne 0 ]; then stat_fail @@ -28,7 +27,7 @@ case "$1" in fi stat_busy "Starting cdemud" - cdemud -d -n $NUM_DRIVES -c $CTL_DEVICE -a $AUDIO_BACKEND &>/dev/null + cdemud --ctl-device=$CTL_DEVICE --bus=$SYSTEM --num-devices=$NUM_DEVICES --audio-driver=$AUDIO_DRIVER --logfile=$LOG_FILE & if [ $? -ne 0 ]; then stat_fail else @@ -38,7 +37,7 @@ case "$1" in ;; stop) stat_busy "Stopping cdemud" - cdemud -k &>/dev/null + kill -9 `pidof cdemud` &>/dev/null && sleep 1 && rmmod vhba if [ $? -ne 0 ]; then stat_fail else diff --git a/community/cherokee/PKGBUILD b/community/cherokee/PKGBUILD index 0e5498b2c..6f7fbb9c7 100644 --- a/community/cherokee/PKGBUILD +++ b/community/cherokee/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 55615 2011-09-16 00:44:29Z foutrelis $ +# $Id: PKGBUILD 56833 2011-10-14 14:02:14Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Link Dupont <link@subpop.net> pkgname=cherokee -pkgver=1.2.99 -pkgrel=3 +pkgver=1.2.100 +pkgrel=2 pkgdesc="A very fast, flexible and easy to configure Web Server" arch=('i686' 'x86_64' 'mips64el') url="http://www.cherokee-project.com/" @@ -20,16 +20,19 @@ optdepends=('python2: cherokee-admin (administrative web interface)' 'geoip: GeoIP rule module' 'rrdtool: RRDtool based information collector') backup=('etc/cherokee/cherokee.conf' - 'etc/logrotate.d/cherokee') + 'etc/logrotate.d/cherokee' + 'etc/pam.d/cherokee') options=('!libtool') source=(http://www.cherokee-project.com/download/1.2/$pkgver/cherokee-$pkgver.tar.gz cherokee.rc cherokee.logrotate - fix-ctk-path-handler-match.patch) -md5sums=('c83115c3eebb29e6f2b4cc6fe699affe' - 'a2d2b69c6220fab57cda4f531b680f9f' - '8d69341bd4002bffd69c6e82ff6c905f' - 'e9475edd26ee24d035783e5999244857') + fix-ctk-path-handler-match.patch + cherokee-admin-socket-bind.patch) +sha1sums=('2ed95504c7f156227f9b688a901608be21cf3dff' + '85e24ccc94e6e97858226222ac62cca79c17bc80' + '266064ab6d3ebd206d7207e1d97b003d2021b2e4' + '6d64371dfb23f43c29a24e37e7ae99e08a0c84cc' + '3c0b407e7282542657125d7cfb1c64eb3521ed8c') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/cherokee/cherokee-admin-socket-bind.patch b/community/cherokee/cherokee-admin-socket-bind.patch new file mode 100644 index 000000000..0b266a245 --- /dev/null +++ b/community/cherokee/cherokee-admin-socket-bind.patch @@ -0,0 +1,23 @@ +diff --git a/cherokee/main_admin.c b/cherokee/main_admin.c +index 861473f..e52b2d6 100644 +--- a/cherokee/main_admin.c ++++ b/cherokee/main_admin.c +@@ -89,9 +89,9 @@ find_empty_port (int starting, int *port) + cherokee_buffer_add_str (&bind_, "127.0.0.1"); + + cherokee_socket_init (&s); +- cherokee_socket_create_fd (&s, AF_INET); + + while (true) { ++ cherokee_socket_create_fd (&s, AF_INET); + ret = cherokee_socket_bind (&s, p, &bind_); + if (ret == ret_ok) + break; +@@ -104,6 +104,7 @@ find_empty_port (int starting, int *port) + } + } + ++ cherokee_socket_close (&s); + cherokee_socket_mrproper (&s); + cherokee_buffer_mrproper (&bind_); + diff --git a/community/collectd/PKGBUILD b/community/collectd/PKGBUILD index 8efe669b1..9d4d70ec6 100644 --- a/community/collectd/PKGBUILD +++ b/community/collectd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 56117 2011-10-02 02:52:22Z ebelanger $ +# $Id: PKGBUILD 56935 2011-10-17 07:29:09Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Gerhard Brauer <gerhard.brauer@web.de> pkgname=collectd -pkgver=5.0.0 -pkgrel=7 +pkgver=5.0.1 +pkgrel=1 pkgdesc='Daemon which collects system performance statistics periodically' arch=('i686' 'x86_64' 'mips64el') url='http://collectd.org/' @@ -42,13 +42,9 @@ makedepends=('curl' 'libdbi' 'libesmtp' 'libgcrypt' 'iptables' 'libmemcached' depends=('libtool') source=("${url}files/${pkgname}-${pkgver}.tar.gz" - 'libnotify-0.7.patch' - 'yajl-2.x.patch' 'libperl.patch' 'rc.d') -sha1sums=('026e5121348f0e525dedb3844fe61c7713994bb7' - 'f6fed097c16f6c9c90b9a32a5b8e48d54b35b337' - 'd3854c39c9596b4f6dcf67a9eb8decea4d17120d' +sha1sums=('ec1bf97d21a27d9b53b20f7dc4fb61441b4e42e0' 'b221352447b2d42cade4a65ced322bcff8a40366' '0f441718d5519cb043b1130e5a1d0379078adbcc') @@ -60,10 +56,6 @@ build() { patch -p1 -i ../libperl.patch autoconf - sed -i 's/ipt_error_target/bozo_error_target/g' src/owniptc/libiptc.c - patch -p1 -i ../libnotify-0.7.patch - patch -p1 -i ../yajl-2.x.patch - ./configure \ --prefix=/usr \ --sysconfdir=/etc \ @@ -71,8 +63,6 @@ build() { --enable-static=no \ --with-python=/usr/bin/python2 - sed -i 's/ -Werror//g' */Makefile* */*/Makefile* - make all } diff --git a/community/collectd/libnotify-0.7.patch b/community/collectd/libnotify-0.7.patch deleted file mode 100644 index 5ea67047a..000000000 --- a/community/collectd/libnotify-0.7.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -aur old/src/notify_desktop.c new/src/notify_desktop.c ---- old/src/notify_desktop.c 2011-03-07 23:50:24.096691200 +0100 -+++ new/src/notify_desktop.c 2011-03-07 23:52:35.486691201 +0100 -@@ -95,7 +95,7 @@ - : (NOTIF_WARNING == n->severity) ? "WARNING" - : (NOTIF_OKAY == n->severity) ? "OKAY" : "UNKNOWN"); - -- notification = notify_notification_new (summary, n->message, NULL, NULL); -+ notification = notify_notification_new (summary, n->message, NULL); - if (NULL == notification) { - log_err ("Failed to create a new notification."); - return -1; diff --git a/community/collectd/yajl-2.x.patch b/community/collectd/yajl-2.x.patch deleted file mode 100644 index b90543dfe..000000000 --- a/community/collectd/yajl-2.x.patch +++ /dev/null @@ -1,57 +0,0 @@ ---- old/src/curl_json.c 2011-04-25 20:43:00.972938855 -0400 -+++ new/src/curl_json.c 2011-04-25 20:46:03.859938860 -0400 -@@ -98,8 +98,7 @@ - return (0); - - status = yajl_parse(db->yajl, (unsigned char *)buf, len); -- if ((status != yajl_status_ok) -- && (status != yajl_status_insufficient_data)) -+ if ((status != yajl_status_ok)) - { - unsigned char *msg = - yajl_get_error(db->yajl, /* verbose = */ 1, -@@ -130,7 +129,7 @@ - /* "number" may not be null terminated, so copy it into a buffer before - * parsing. */ - static int cj_cb_number (void *ctx, -- const char *number, unsigned int number_len) -+ const char *number, size_t number_len) - { - char buffer[number_len + 1]; - -@@ -159,7 +158,7 @@ - } /* int cj_cb_number */ - - static int cj_cb_map_key (void *ctx, const unsigned char *val, -- unsigned int len) -+ size_t len) - { - cj_t *db = (cj_t *)ctx; - c_avl_tree_t *tree; -@@ -187,7 +186,7 @@ - } - - static int cj_cb_string (void *ctx, const unsigned char *val, -- unsigned int len) -+ size_t len) - { - cj_t *db = (cj_t *)ctx; - char str[len + 1]; -@@ -697,7 +696,7 @@ - char *url; - yajl_handle yprev = db->yajl; - -- db->yajl = yajl_alloc (&ycallbacks, NULL, NULL, (void *)db); -+ db->yajl = yajl_alloc (&ycallbacks, NULL, (void *)db); - if (db->yajl == NULL) - { - ERROR ("curl_json plugin: yajl_alloc failed."); -@@ -730,7 +729,7 @@ - return (-1); - } - -- status = yajl_parse_complete (db->yajl); -+ status = yajl_complete_parse (db->yajl); - if (status != yajl_status_ok) - { - unsigned char *errmsg; diff --git a/community/comix/PKGBUILD b/community/comix/PKGBUILD deleted file mode 100644 index ae59c1036..000000000 --- a/community/comix/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# Contributor: Geoffroy Carrier <geoffroy@archlinux.org> -# Contributor: Eric Belanger <eric@archlinux.org> -# Contributor: William Rea <sillywilly@gmail.com> -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> - -pkgname=comix -pkgver=4.0.4 -pkgrel=5 -pkgdesc="A comic book viewer" -arch=('i686' 'x86_64' 'mips64el') -url="http://comix.sourceforge.net" -license=('GPL') -depends=('pygtk' 'pil' 'unrar' 'xdg-utils') -makedepends=('gettext' 'intltool') -install=comix.install -source=(http://downloads.sourceforge.net/sourceforge/comix/comix-${pkgver}.tar.gz) - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - - # python2 fix - for file in src/comix.py mime/comicthumb; do - sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file - done -} - -package() { - cd ${srcdir}/comix-${pkgver} - mkdir -p ${pkgdir}/usr - python2 install.py install --no-mime --dir ${pkgdir}/usr - install -D -m644 mime/comicbook.schemas \ - ${pkgdir}/usr/share/gconf/schemas/comix.schemas - install -D mime/comicthumb ${pkgdir}/usr/bin/comicthumb - install -D -m644 mime/comicthumb.1.gz \ - ${pkgdir}/usr/share/man/man1/comicthumb.1.gz -} -md5sums=('029227a77b122f7080ee0280d41bee78') diff --git a/community/comix/comix.install b/community/comix/comix.install deleted file mode 100644 index 8e99f7f91..000000000 --- a/community/comix/comix.install +++ /dev/null @@ -1,26 +0,0 @@ -pkgname=comix - -post_install() { - which xdg-icon-resource >/dev/null 2>&1 && xdg-icon-resource forceupdate || true - which gconfpkg >/dev/null 2>&1 && usr/sbin/gconfpkg --install ${pkgname} - echo "update desktop mime database..." - update-desktop-database -q -} - -pre_upgrade() { - pre_remove $1 -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - which gconfpkg >/dev/null 2>&1 && usr/sbin/gconfpkg --uninstall ${pkgname} -} - -post_remove() { - which xdg-icon-resource >/dev/null 2>&1 && xdg-icon-resource forceupdate || true - echo "update desktop mime database..." - update-desktop-database -q -} diff --git a/community/cppcheck/PKGBUILD b/community/cppcheck/PKGBUILD index c40ddb0ca..66b96cc50 100644 --- a/community/cppcheck/PKGBUILD +++ b/community/cppcheck/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 55608 2011-09-15 21:38:48Z stephane $ +# $Id: PKGBUILD 56835 2011-10-14 14:22:51Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> pkgname=cppcheck -pkgver=1.50 +pkgver=1.51 pkgrel=1 pkgdesc="A tool for static C/C++ code analysis" arch=('i686' 'x86_64' 'mips64el') @@ -9,7 +9,7 @@ url="http://cppcheck.wiki.sourceforge.net/" license=('GPL') depends=('pcre') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('39ad14cb4cb9caa45fd3365203c5f54981ee2870') +sha1sums=('d6774e123b9fa086cb6cc3722743e1de7a1f0b0c') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/ctpl/PKGBUILD b/community/ctpl/PKGBUILD index 8a8aacbf5..ba37f84d9 100644 --- a/community/ctpl/PKGBUILD +++ b/community/ctpl/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 29702 2010-10-18 18:39:07Z angvp $ +# $Id: PKGBUILD 56633 2011-10-09 09:46:57Z angvp $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: Patrick Melo <patrick@patrickmelo.eti.br> pkgname=ctpl -pkgver=0.3 +pkgver=0.3.3 pkgrel=1 pkgdesc="CTPL is a template engine library written in C" arch=('i686' 'x86_64' 'mips64el') @@ -11,11 +11,15 @@ url="http://ctpl.tuxfamily.org/" license=('GPL') depends=('glib2' 'gvfs') source=(http://download.tuxfamily.org/ctpl/releases/$pkgname-$pkgver.tar.gz) -md5sums=('fdc63a4a3eabf7d1be0078c6827579a5') +md5sums=('3380e06d94d921fb50b0e40ddb351daa') build() { cd ${srcdir}/$pkgname-$pkgver ./configure --prefix=/usr make +} + +package() { + cd ${srcdir}/$pkgname-$pkgver make DESTDIR=${pkgdir} install } diff --git a/community/devil/PKGBUILD b/community/devil/PKGBUILD index e04442257..52aef74b8 100644 --- a/community/devil/PKGBUILD +++ b/community/devil/PKGBUILD @@ -1,28 +1,33 @@ -# $Id: PKGBUILD 64433 2010-01-20 12:05:44Z ibiru $ +# $Id: PKGBUILD 57001 2011-10-18 03:48:42Z ebelanger $ # Maintainer: damir <damir@archlinux.org> # Contributor: TheHoff <forums> pkgname=devil pkgver=1.7.8 -pkgrel=6 +pkgrel=7 pkgdesc="Library for reading several different image formats" arch=('i686' 'x86_64' 'mips64el') url="http://openil.sourceforge.net/" -depends=('allegro>=4.4.0.1' 'sdl' 'libpng>=1.4.0' 'libmng>=1.0.10-3' 'freeglut' - 'jasper>=1.900.1-4' 'lcms>=1.18-3' 'openexr') +depends=('allegro4' 'sdl' 'libpng' 'libmng' 'freeglut' + 'jasper' 'lcms' 'openexr') makedepends=('bash') options=('!libtool' '!docs') license=('GPL') source=(http://downloads.sourceforge.net/openil/DevIL-$pkgver.tar.gz libpng14.patch) +md5sums=('7918f215524589435e5ec2e8736d5e1d' + '0f839ccefd43b0ee8b4b3f99806147fc') build() { cd $srcdir/devil-$pkgver - patch -Np1 -i $srcdir/libpng14.patch || return 1 - # configure and build + patch -Np1 -i $srcdir/libpng14.patch + ./configure --prefix=/usr --enable-ILU --enable-ILUT --enable-opengl --enable-sdl - make || return 1 + make +} + +package() { + cd $srcdir/devil-$pkgver + make prefix=$pkgdir/usr install } -md5sums=('7918f215524589435e5ec2e8736d5e1d' - '0f839ccefd43b0ee8b4b3f99806147fc') diff --git a/community/dumb/PKGBUILD b/community/dumb/PKGBUILD index 30d71c3f4..ccbbbb04b 100644 --- a/community/dumb/PKGBUILD +++ b/community/dumb/PKGBUILD @@ -1,15 +1,15 @@ # Contributor: Chris Brannon <cmbrannon79@gmail.com> # Contributor: JJDaNiMoTh <jjdanimoth@gmail.com> -# Contributor: Bjørn Lindeijer <bjorn lindeijer nl> +# Contributor: Bjørn Lindeijer <bjorn lindeijer nl> pkgname=dumb pkgver=0.9.3 -pkgrel=4 +pkgrel=5 pkgdesc="An IT, XM, S3M and MOD player library" arch=('i686' 'x86_64' 'mips64el') license=('custom:dumb' 'GPL') url="http://dumb.sourceforge.net/" -depends=('glibc' 'allegro') +depends=('glibc' 'allegro4') source=(http://downloads.sourceforge.net/sourceforge/dumb/$pkgname-$pkgver.tar.gz) md5sums=('f48da5b990aa8aa822d3b6a951baf5c2') diff --git a/community/ekg/ChangeLog b/community/ekg/ChangeLog deleted file mode 100644 index 717d49b5d..000000000 --- a/community/ekg/ChangeLog +++ /dev/null @@ -1,5 +0,0 @@ -2009-03-16 Mateusz Herych <heniekk@gmail.com> -* Rebuild against python 2.6 -2007-07-02 tardo <tardo@nagi-fanboi.net> -* Built for x86_64 - diff --git a/community/ekg/PKGBUILD b/community/ekg/PKGBUILD index 23c565002..4bca941b7 100644 --- a/community/ekg/PKGBUILD +++ b/community/ekg/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 26474 2010-09-15 21:57:57Z schuay $ +# $Id: PKGBUILD 56895 2011-10-16 06:24:00Z bpiotrowski $ # Contributor: Jaroslaw Swierczynski <swiergot@juvepoland.com> pkgname=ekg -pkgver=1.7 -pkgrel=6 +pkgver=1.8rc2 +pkgrel=1 pkgdesc="A text-mode Gadu-Gadu client" arch=('i686' 'x86_64' 'mips64el') url="http://ekg.chmurka.net/" license=('GPL') -depends=('libjpeg' 'aspell' 'python2' 'giflib') +depends=('libjpeg' 'aspell' 'python2' 'giflib' 'libgadu') source=(http://ekg.chmurka.net/$pkgname-$pkgver.tar.gz) -md5sums=('2aa92b56517fdf09d75519a105772b74') +md5sums=('f697c711da91ddf57c882114539e92fe') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/epdfview/PKGBUILD b/community/epdfview/PKGBUILD index 26db195b6..e226d2235 100644 --- a/community/epdfview/PKGBUILD +++ b/community/epdfview/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 48161 2011-05-29 11:36:51Z schuay $ +# $Id: PKGBUILD 56941 2011-10-17 08:20:15Z ibiru $ # Maintainer: schuay <jakob.gruber@gmail.com> # Contributor: Tom K <tomk@runbox.com> # Contributor: Thayer Williams <thayer@archlinux.org> pkgname=epdfview pkgver=0.1.8 -pkgrel=1 +pkgrel=2 pkgdesc="A free lightweight PDF document viewer." url="http://www.emma-soft.com/projects/epdfview/" arch=('i686' 'x86_64' 'mips64el') license=('GPL') -depends=('poppler-glib' 'desktop-file-utils' 'hicolor-icon-theme') +depends=('poppler-glib' 'desktop-file-utils' 'hicolor-icon-theme' 'gtk2') makedepends=('pkgconfig') install='epdfview.install' source=("http://www.emma-soft.com/projects/${pkgname}/chrome/site/releases/${pkgname}-${pkgver}.tar.bz2" diff --git a/community/espeak/PKGBUILD b/community/espeak/PKGBUILD index e1a8efcb9..9e51a6a47 100644 --- a/community/espeak/PKGBUILD +++ b/community/espeak/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 46811 2011-05-12 17:39:15Z mherych $ +# $Id: PKGBUILD 56889 2011-10-16 05:47:23Z bpiotrowski $ # Maintainer: Mateusz Herych <heniekk@gmail.com> # Contributor: niQo # Contributor: Christoph Siegenthaler <csi@gmx.ch> pkgname=espeak -pkgver=1.45.04 +pkgver=1.45.05 pkgrel=1 pkgdesc="Text to Speech engine for good quality English, with support for other languages" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ url="http://espeak.sourceforge.net/" license=('GPL') depends=('gcc-libs' 'portaudio') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}-source.zip) -md5sums=('6e810d2786b55cddb34f31b3eb813507') +md5sums=('00692552d54f1849a1a0ad21ae3fc820') build() { cd $srcdir/$pkgname-$pkgver-source/src diff --git a/community/exim/ChangeLog b/community/exim/ChangeLog index 16eab50c2..80a101472 100644 --- a/community/exim/ChangeLog +++ b/community/exim/ChangeLog @@ -1,3 +1,6 @@ +2011-10-10 Angel Velasquez <angvp@archlinux.org> + * Updated to 4.77 + 2011-07-15 Angel Velasquez <angvp@archlinux.org> * Rebuilt without tcp_wrappers * Fixing logrotate issue FS#25094 diff --git a/community/exim/PKGBUILD b/community/exim/PKGBUILD index eb976e536..e5a90878c 100644 --- a/community/exim/PKGBUILD +++ b/community/exim/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 51959 2011-07-18 17:27:22Z dreisner $ +# $Id: PKGBUILD 56931 2011-10-17 02:10:43Z angvp $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Maintainer: judd <jvinet@zeroflux.org> pkgname=exim -pkgver=4.76 -pkgrel=4 +pkgver=4.77 +pkgrel=1 pkgdesc="A Message Transfer Agent" arch=(i686 x86_64 'mips64el') url="http://www.exim.org/" @@ -22,7 +22,7 @@ source=(ftp://mirrors.24-7-solutions.net/pub/exim/ftp/exim/exim4/exim-$pkgver.ta exim.logrotate exim.conf.d exim.Makefile) -md5sums=('58e784b33c7a2ab335ec6400346d6362' +md5sums=('5d746275f2cc85845567f9d5eb84a57a' '4874006f0585253ddab027d441009757' '9aed772e87223213e8da9ca5e7376869' 'e18a535218718c5eb394ed5c9296fe06' diff --git a/community/ffmpeg2theora/PKGBUILD b/community/ffmpeg2theora/PKGBUILD index af1f1a7af..c9516ffb6 100644 --- a/community/ffmpeg2theora/PKGBUILD +++ b/community/ffmpeg2theora/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 19599 2010-06-26 01:11:45Z ebelanger $ -# Maintainer: Eric Belanger <eric@archlinux.org> +# $Id: PKGBUILD 56650 2011-10-09 12:33:26Z jlichtblau $ +# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> +# Contributor: Eric Belanger <eric@archlinux.org> # Contributor: Angelo Theodorou <encelo@users.sourceforge.net> pkgname=ffmpeg2theora -pkgver=0.27 +pkgver=0.28 pkgrel=1 pkgdesc="A simple converter to create Ogg Theora files" arch=('i686' 'x86_64' 'mips64el') @@ -11,9 +12,9 @@ url="http://www.v2v.cc/~j/ffmpeg2theora/" license=('GPL3') depends=('ffmpeg') makedepends=('pkgconfig' 'scons') -source=(http://www.v2v.cc/~j/ffmpeg2theora/downloads/${pkgname}-${pkgver}.tar.bz2) -md5sums=('ec6bc7418aeb37f20759280f236c214a') -sha1sums=('7480eb53995707f3f37769f5bfb590e56f943ac6') +changelog=$pkgname.changelog +source=(http://www.v2v.cc/~j/${pkgname}/downloads/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('6893c1444d730a1514275ba76ba487ca207205b916d6cb1285704225ee86fe1e') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/ffmpeg2theora/ChangeLog b/community/ffmpeg2theora/ffmpeg2theora.changelog index 266ff0032..adbe34807 100644 --- a/community/ffmpeg2theora/ChangeLog +++ b/community/ffmpeg2theora/ffmpeg2theora.changelog @@ -1,3 +1,8 @@ +2011-10-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + + * ffmpeg2theora 0.28-1 + * Upstream update + 2010-06-25 Eric Belanger <eric@archlinux.org> * ffmpeg2theora 0.27-1 diff --git a/community/galculator/PKGBUILD b/community/galculator/PKGBUILD new file mode 100644 index 000000000..58a85a7e7 --- /dev/null +++ b/community/galculator/PKGBUILD @@ -0,0 +1,29 @@ +# Maintainer: BartÅ‚omiej Piotrowski <barthalion@gmail.com> +# Contributor: SpepS <dreamspepser at yahoo dot it> +# Contributor: Alexander Fehr <pizzapunk gmail com> + +pkgname=galculator +pkgver=1.3.4 +pkgrel=1 +pkgdesc="GTK+ based scientific calculator" +arch=('i686' 'x86_64') +url="http://galculator.sourceforge.net/" +license=('GPL') +depends=('libglade') +makedepends=('intltool') +install="$pkgname.install" +source=("http://downloads.sourceforge.net/galculator/galculator-$pkgver.tar.bz2") +md5sums=('d30e6fbf5947bb1c873bc9d5a21046f1') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install +} diff --git a/community/pcmanfm/pcmanfm.install b/community/galculator/galculator.install index 98965c989..a852f0449 100644 --- a/community/pcmanfm/pcmanfm.install +++ b/community/galculator/galculator.install @@ -1,14 +1,10 @@ post_install() { - update-mime-database usr/share/mime > /dev/null update-desktop-database -q } post_upgrade() { post_install } - post_remove() { post_install } - - diff --git a/community/gambas2/PKGBUILD b/community/gambas2/PKGBUILD index a775b9b25..ba7beb938 100644 --- a/community/gambas2/PKGBUILD +++ b/community/gambas2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 48045 2011-05-27 17:00:59Z lcarlier $ +# $Id: PKGBUILD 56943 2011-10-17 08:20:39Z ibiru $ # Maintainer : Laurent Carlier <lordheavym@gmail.com> # Contributor: Biru Ionut <ionut@archlinux.ro> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -20,13 +20,13 @@ pkgname=('gambas2-meta' 'gambas2-runtime' 'gambas2-devel' 'gambas2-ide' 'gambas2 'gambas2-gb-sdl-sound' 'gambas2-gb-settings' 'gambas2-gb-v4l' 'gambas2-gb-vb' 'gambas2-gb-web' 'gambas2-gb-xml' 'gambas2-gb-xml-rpc' 'gambas2-gb-xml-xslt') pkgver=2.23.1 -pkgrel=1 +pkgrel=2 pkgdesc="A free development environment based on a Basic interpreter." arch=('i686' 'x86_64' 'mips64el') url="http://gambas.sourceforge.net" depends=('libffi' 'bzip2' 'libfbclient' 'zlib' 'kdelibs3' 'libgl' 'gtk2' 'librsvg' 'xdg-utils' 'postgresql-libs>=8.4.1' 'libmysqlclient' 'unixodbc' 'sqlite2' 'sqlite3' - 'curl' 'poppler' 'sdl_mixer' 'sdl_image' 'libxtst' 'pcre' 'omniorb' 'libxft' + 'curl' 'poppler-glib' 'sdl_mixer' 'sdl_image' 'libxtst' 'pcre' 'omniorb' 'libxft' 'libxcursor' 'libsm') makedepends=('intltool' 'mysql' 'postgresql') license=('GPL2') @@ -36,10 +36,12 @@ replaces=('gambas2') conflicts=('gambas2') source=(http://downloads.sourceforge.net/gambas/$pkgbase-$pkgver.tar.bz2 'fix-gbi-gba-path.patch' 'db.firebird.gcc-4.6.0-fix.patch' + 'poppler-0.18.patch' 'gambas2-script.install' 'gambas2-runtime.install') md5sums=('ff8d2c1f310222c150b114e7ce247dfd' '9dda03a1bbfb7e7ba8b6a4ae91b6752b' 'ac9703b390502ed3242c8d34485c9236' + 'a551b4b216bbdb3489f3c264bf73ee66' '870ff5b4b33cd75aa9c290539e6fdd5d' 'ab5667175c4945282d2f40a35d0e9e5b') _gbfiles="${srcdir}/$pkgbase-$pkgver/main/gbc" @@ -70,6 +72,7 @@ build() { patch -Np1 -i "${srcdir}/fix-gbi-gba-path.patch" # merged upstream patch -Np3 -i "${srcdir}/db.firebird.gcc-4.6.0-fix.patch" + patch -Np2 -i "${srcdir}/poppler-0.18.patch" ./reconf-all ## @@ -677,7 +680,7 @@ package_gambas2-gb-pcre() { } package_gambas2-gb-pdf() { - depends=('gambas2-runtime' 'poppler') + depends=('gambas2-runtime' 'poppler-glib') pkgdesc="Gambas2 PDF component" cd ${srcdir}/${pkgbase}-${pkgver}/gb.pdf diff --git a/community/gambas2/poppler-0.18.patch b/community/gambas2/poppler-0.18.patch new file mode 100644 index 000000000..fbcc430bf --- /dev/null +++ b/community/gambas2/poppler-0.18.patch @@ -0,0 +1,40 @@ +--- gambas/trunk/gb.pdf/configure.ac 2010/07/14 01:50:18 3038 ++++ gambas/trunk/gb.pdf/configure.ac 2011/08/09 10:43:30 3997 +@@ -22,6 +22,8 @@ + AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_8, $((1-$?)), Poppler version >= 0.8) + pkg-config --atleast-version=0.11.3 poppler + AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_11_3, $((1-$?)), Poppler version >= 0.11.3) ++ pkg-config --atleast-version=0.17.0 poppler ++ AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_17, $((1-$?)), Poppler version >= 0.17) + fi + + AC_OUTPUT( \ + +--- gambas/trunk/gb.pdf/src/CPdfDocument.cpp 2011/06/03 00:51:09 3870 ++++ gambas/trunk/gb.pdf/src/CPdfDocument.cpp 2011/08/09 10:43:30 3997 +@@ -44,6 +44,7 @@ + #include <Outline.h> + #include <Link.h> + #include <Gfx.h> ++#include <glib/poppler-features.h> + + /***************************************************************************** + +@@ -956,12 +957,17 @@ + Bookmarks of a PDF page + + ******************************************************************************/ ++ + void aux_fill_links(void *_object) + { ++ #if POPPLER_VERSION_0_17 ++ THIS->links = new Links (THIS->page->getAnnots (THIS->doc->getCatalog())); ++ #else + Object obj; + + THIS->links = new Links (THIS->page->getAnnots (&obj),THIS->doc->getCatalog()->getBaseURI ()); + obj.free(); ++ #endif + } + + BEGIN_PROPERTY (PDFPAGELINKS_count) diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD index ab0bb8702..585e37179 100644 --- a/community/gambas3/PKGBUILD +++ b/community/gambas3/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 55911 2011-09-24 19:25:08Z lcarlier $ +# $Id: PKGBUILD 56945 2011-10-17 08:20:48Z ibiru $ # Maintainer: Laurent Carlier <lordheavym@gmail.com> pkgbase=gambas3 @@ -12,7 +12,7 @@ pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gamba 'gambas3-gb-pdf' 'gambas3-gb-qt4' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-opengl' 'gambas3-gb-qt4-webkit' 'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings' 'gambas3-gb-signal' 'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web') -pkgver=2.99.4 +pkgver=2.99.5 pkgrel=1 pkgdesc="A free development environment based on a Basic interpreter." arch=('i686' 'x86_64' 'mips64el') @@ -27,7 +27,7 @@ makedepends=('intltool' 'mysql' 'postgresql' 'libffi' 'bzip2' 'glib2' 'v4l-utils options=('!emptydirs' '!makeflags') source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2" 'gambas3-script.install' 'gambas3-runtime.install') -md5sums=('4f918a701a862c7755b35d6eba988dad' +md5sums=('dfa16f5208463e81ba8ca801948c353a' 'b284be39d147ec799f1116a6abc068b4' 'b5cc403990f31b8ea1c5cf37366d3d29') @@ -424,6 +424,8 @@ package_gambas3-gb-form() { make XDG_UTILS='' DESTDIR="${pkgdir}" install cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 make XDG_UTILS='' DESTDIR="${pkgdir}" install + cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk + make XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/comp @@ -434,6 +436,8 @@ package_gambas3-gb-form() { make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall rm -r ${pkgdir}/usr/share/gambas3/control/{gb.db*,gb.form.*,gb.report} rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-e]*,[m-w]*,form.{d*,m*,s*}} rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-e]*,[m-w]*,form.{d*,m*,s*}} @@ -449,6 +453,8 @@ package_gambas3-gb-form-dialog() { make XDG_UTILS='' DESTDIR="${pkgdir}" install cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 make XDG_UTILS='' DESTDIR="${pkgdir}" install + cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk + make XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/comp @@ -459,6 +465,8 @@ package_gambas3-gb-form-dialog() { make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall rm -r ${pkgdir}/usr/share/gambas3/control rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-e]*,[m-w]*,form.{c*,g*,m*,s*}} rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-e]*,[m-w]*,form.{i*,l*,m*,s*}} @@ -474,6 +482,8 @@ package_gambas3-gb-form-mdi() { make XDG_UTILS='' DESTDIR="${pkgdir}" install cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 make XDG_UTILS='' DESTDIR="${pkgdir}" install + cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk + make XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/comp @@ -484,6 +494,8 @@ package_gambas3-gb-form-mdi() { make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall rm -r ${pkgdir}/usr/share/gambas3/control/{gb.db*,gb.form,gb.report} rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-e]*,[m-w]*,form.{c*,d*,g*,s*}} rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-e]*,[m-w]*,form.{i*,l*,d*,s*}} @@ -497,6 +509,8 @@ package_gambas3-gb-form-stock() { ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main make XDG_UTILS='' DESTDIR="${pkgdir}" install + cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk + make XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/comp @@ -505,7 +519,7 @@ package_gambas3-gb-form-stock() { ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 + cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall rm -r ${pkgdir}/usr/lib/gambas3/gb.{eval*,[m-w]*} rm -r ${pkgdir}/usr/share/gambas3/info/gb.{eval*,[m-w]*} diff --git a/community/geany/PKGBUILD b/community/geany/PKGBUILD index 931495c68..89b1c5700 100644 --- a/community/geany/PKGBUILD +++ b/community/geany/PKGBUILD @@ -1,37 +1,43 @@ -# $Id: PKGBUILD 36732 2011-01-06 18:13:58Z angvp $ -# Maintainer: Angel Velasquez <angvp@archlinux.org> +# $Id: PKGBUILD 56636 2011-10-09 11:13:50Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Ionut Biru <ibiru@archlinux.ro> # Contributor: William Rea <sillywilly@gmail.com> # Contributor: Allan McRae <mcrae_allan@hotmail.com> - pkgname=geany -pkgver=0.20 +pkgver=0.21 pkgrel=1 -pkgdesc="A fast and lightweight IDE" +pkgdesc="Fast and lightweight IDE" arch=('i686' 'x86_64' 'mips64el') -url="http://www.geany.org" +url="http://www.geany.org/" license=('GPL') -depends=('gtk2>=2.8.0') +depends=('gtk2' 'hicolor-icon-theme' 'desktop-file-utils' 'python2') makedepends=('perlxml' 'intltool') optdepends=("vte: for terminal support") install=geany.install -source=(http://download.geany.org/$pkgname-$pkgver.tar.gz) +source=("http://download.geany.org/${pkgname}-${pkgver}.tar.gz") options=('!libtool') -md5sums=('7e7d6e4a40e04ecacb9bc317f97becfb') +md5sums=('d2734776badc3f5f9a778814ed56fb8a') build() { - cd ${srcdir}/$pkgname-$pkgver - - # python2 fix - sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' data/templates/files/main.py + cd "${srcdir}/${pkgname}-${pkgver}" + msg2 "Configuring..." ./configure --prefix=/usr + msg2 "Compiling..." make - - # FS#10318 + msg2 "Python2 fix..." + sed -i '0,/on/s//on2/' data/templates/files/main.py + msg2 "Fixing FS#10318..." sed -i 's|MimeType=text/plain;|MimeType=|' geany.desktop - # Add colors for PKGBUILD file + msg2 "Enabling colors for PKGBUILD files..." sed -i 's|Sh=|Sh=PKGBUILD;|' data/filetype_extensions.conf +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR=${pkgdir} install } + +# vim:set ts=2 sw=2 et: diff --git a/community/geany/geany.install b/community/geany/geany.install index 7e83162e5..4cd573a65 100644 --- a/community/geany/geany.install +++ b/community/geany/geany.install @@ -1,13 +1,16 @@ pkgname=geany -post_install() { +post_upgrade() { gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-desktop-database -q } -post_upgrade() { - post_install +post_install() { + post_upgrade } post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + post_upgrade } + +# vim:set ts=2 sw=2 et: diff --git a/community/glom/PKGBUILD b/community/glom/PKGBUILD index 80ccec00a..83075f22c 100644 --- a/community/glom/PKGBUILD +++ b/community/glom/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 56168 2011-10-02 16:56:39Z ibiru $ +# $Id: PKGBUILD 57035 2011-10-18 22:47:54Z heftig $ # Maintainer: Roman Kyrylych <Roman.Kyrylych@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> pkgname=glom -pkgver=1.19.11 -pkgrel=2 +pkgver=1.19.14 +pkgrel=1 pkgdesc="An easy-to-use database designer and user interface" arch=('i686' 'x86_64' 'mips64el') url="http://www.glom.org/" @@ -15,7 +15,7 @@ makedepends=('intltool' 'gnome-doc-utils' 'python-sphinx' 'boost') options=('!libtool') install=$pkgname.install source=(http://ftp.gnome.org/pub/GNOME/sources/glom/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('c28ead8b37d31550c295004de50e0dc09debd3af665691b852737330bf68514d') +sha256sums=('18dbbf572045380c07fb6cb2bdbca1893bbd322fb1283e1f0d0d2b295b4a28c8') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/gmic/PKGBUILD b/community/gmic/PKGBUILD index 8237bdc36..5c6e5ac1e 100644 --- a/community/gmic/PKGBUILD +++ b/community/gmic/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 56316 2011-10-05 15:22:43Z spupykin $ +# $Id: PKGBUILD 56505 2011-10-07 13:41:51Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: farid <farid at archlinuc-br.org> @@ -6,7 +6,7 @@ pkgbase=gmic pkgname=('gmic' 'gimp-plugin-gmic') -pkgver=1.5.0.3 +pkgver=1.5.0.4 pkgrel=1 pkgdesc="image procession framework" arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +16,7 @@ makedepends=('gimp' 'fftw' 'lapack' 'opencv' 'graphicsmagick' 'openexr' 'imagema options=('docs' '!emptydirs') source=("http://downloads.sourceforge.net/sourceforge/gmic/gmic_$pkgver.tar.gz" opencv-buildfix.patch) -md5sums=('beb98c3f257d664da750455a98cc3aa9' +md5sums=('8a1fe1207fb09fa2d515ccd484be521c' 'f135182ced743c296e08ddd560fa6be9') build() { diff --git a/community/gnome-do-docklets/PKGBUILD b/community/gnome-do-docklets/PKGBUILD deleted file mode 100644 index 278a99793..000000000 --- a/community/gnome-do-docklets/PKGBUILD +++ /dev/null @@ -1,25 +0,0 @@ -# $Id: PKGBUILD 82 2009-07-17 19:56:55Z aaron $ -# Maintainer: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com> -pkgname=gnome-do-docklets -pkgver=0.8.2 -pkgrel=1 -pkgdesc="GNOME Do Docky docklets" -arch=('i686' 'x86_64' 'mips64el') -url="http://do.davebsd.com/" -license=('GPL3') -depends=('gnome-do>=0.8.2') -makedepends=('intltool' 'pkgconfig' 'monodevelop') -source=(http://code.edge.launchpad.net/do-plugins/0.8/0.8.2/+download/${pkgname}-${pkgver}.tar.gz) -build() { - export MONO_SHARED_DIR=$srcdir/.wabi - mkdir -p "${MONO_SHARED_DIR}" - - cd $srcdir/$pkgname-$pkgver - - ./configure --prefix=/usr - make || return 1 - make DESTDIR="$pkgdir" install || return 1 - - rm -rf ${pkgdir}/usr/share/gnome-do/plugins/*.mdb -} -md5sums=('977b494af7cd46438f406cdf2fe79c90') diff --git a/community/gnome-do-plugins/PKGBUILD b/community/gnome-do-plugins/PKGBUILD deleted file mode 100644 index 240b27086..000000000 --- a/community/gnome-do-plugins/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 5443 2009-11-08 15:41:13Z ibiru $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Contributor: Doehni <dohny@gmx.de> - -pkgname=gnome-do-plugins -pkgver=0.8.2.1 -pkgrel=1 -pkgdesc="Plugins for gnome-do" -arch=('i686' 'x86_64' 'mips64el') -url="http://do.davebsd.com/" -license=('GPL3') -depends=('gnome-do>=0.8.1') -makedepends=('intltool' 'pkgconfig' 'banshee' 'flickrnet' 'evolution-sharp' 'monodevelop') -optdepends=('evolution-sharp: Evolution plugin' - 'flickrnet: Flickr plugin') -source=("http://code.edge.launchpad.net/do-plugins/0.8/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz" - killsomeplugins.patch) - -build() { - export MONO_SHARED_DIR=$srcdir/.wabi - mkdir -p "${MONO_SHARED_DIR}" - - cd $srcdir/$pkgname-$pkgver - - # GNOME dictionary plugin cause system lock-up (infinite memory leak) - patch -Np1 -i $srcdir/killsomeplugins.patch || return 1 - - ./configure --prefix=/usr - make || return 1 - make DESTDIR="$pkgdir" install || return 1 - - rm -rf ${pkgdir}/usr/share/gnome-do/plugins/*.mdb -} -md5sums=('32b88c062209e5b107602ccc5df285e7' - '0322d0374f80f607535120f545ab6ed7') diff --git a/community/gnome-do-plugins/killsomeplugins.patch b/community/gnome-do-plugins/killsomeplugins.patch deleted file mode 100644 index 4ad27cbbd..000000000 --- a/community/gnome-do-plugins/killsomeplugins.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur gnome-do-plugins-0.8.2-old/Makefile.in gnome-do-plugins-0.8.2/Makefile.in ---- gnome-do-plugins-0.8.2-old/Makefile.in 2009-06-26 08:43:48.317475187 +0300 -+++ gnome-do-plugins-0.8.2/Makefile.in 2009-07-12 01:24:12.743978011 +0300 -@@ -407,7 +407,6 @@ - File \ - Firefox \ - Flickr \ -- GNOME-Dictionary \ - GNOME-Screenshot \ - GNOME-Session \ - GNOME-Terminal \ diff --git a/community/gnome-system-tools/PKGBUILD b/community/gnome-system-tools/PKGBUILD deleted file mode 100644 index 6962177cc..000000000 --- a/community/gnome-system-tools/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 53804 2011-08-08 09:59:18Z ibiru $ -# Maintainer : Ionut Biru <ibiru@archlinux.org> -# Contributor: Hugo Doria <hugodoria@archlinux-br.org> - -pkgname=gnome-system-tools -pkgver=3.0.0 -pkgrel=2 -pkgdesc="Gnome System Configuration Utilities" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.gnome.org/projects/gst/" -license=('GPL') -options=('!libtool') -depends=('wireless_tools' 'liboobs' 'nautilus' 'polkit-gnome' 'dconf') -makedepends=('gnome-doc-utils' 'intltool' 'gnome-common') -install=gnome-system-tools.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/3.0/${pkgname}-${pkgver}.tar.bz2 - po.patch) -sha256sums=('905df26c02f00a6c2c18706ba3db7eab764e3df6576289e103504aa39a47ae0b' - '827c3169ae5060403b3f833b0f9c1d5cefe1d80aa5ade22e2ff7908b1ce1b5ef') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/po.patch" - gnome-autogen.sh - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-scrollkeeper --disable-static \ - --disable-services --disable-schemas-compile - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/community/gnome-system-tools/gnome-system-tools.install b/community/gnome-system-tools/gnome-system-tools.install deleted file mode 100644 index 25e333a19..000000000 --- a/community/gnome-system-tools/gnome-system-tools.install +++ /dev/null @@ -1,15 +0,0 @@ -post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - update-desktop-database -q -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - update-desktop-database -q -} - diff --git a/community/gnome-system-tools/po.patch b/community/gnome-system-tools/po.patch deleted file mode 100644 index 0f89f2605..000000000 --- a/community/gnome-system-tools/po.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Nur gnome-system-tools-3.0.0.orig//configure.in gnome-system-tools-3.0.0/configure.in ---- gnome-system-tools-3.0.0.orig//configure.in 2011-08-08 09:49:33.514034262 +0000 -+++ gnome-system-tools-3.0.0/configure.in 2011-08-08 09:50:06.967688099 +0000 -@@ -161,8 +161,8 @@ - AM_GNU_GETTEXT([external]) - AM_GNU_GETTEXT_VERSION([0.17]) - GETTEXT_PACKAGE=gnome-system-tools --AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [gettext package name]) --AC_SUBST([GETTEXT_PACKAGE], GETTEXT_PACKAGE) -+AC_SUBST(GETTEXT_PACKAGE) # needed by gettext in po directory -+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",[fix]) - - dnl ======================================================== - dnl END : Translations diff --git a/community/gnunet-gtk/PKGBUILD b/community/gnunet-gtk/PKGBUILD index 2c72a660c..0d987eb07 100644 --- a/community/gnunet-gtk/PKGBUILD +++ b/community/gnunet-gtk/PKGBUILD @@ -1,23 +1,27 @@ -# $Id: PKGBUILD 55842 2011-09-23 16:15:44Z spupykin $ +# $Id: PKGBUILD 56777 2011-10-12 06:44:39Z ibiru $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: wahnby <wahnby@yahoo.fr> pkgname=gnunet-gtk pkgver=0.9.0pre3 -pkgrel=1 +pkgrel=3 pkgdesc="A frontend for GNUnet" arch=('i686' 'x86_64' 'mips64el') url="http://gnunet.org" options=('!libtool') license=('GPL') -depends=('gnunet' 'libnotify' 'libglade' 'adns') -makedepends=('pkgconfig' 'glade') -source=(ftp://ftp.gnu.org/gnu/gnunet/$pkgname-$pkgver.tar.gz) -md5sums=('42f90a00aee541cef576ead682d7fb44') +depends=('gnunet' 'glade' 'adns') +makedepends=('pkgconfig') +source=(ftp://ftp.gnu.org/gnu/gnunet/$pkgname-$pkgver.tar.gz + drop_gtk2.patch) +md5sums=('42f90a00aee541cef576ead682d7fb44' + 'f709c0195beffd0ca64d498be83a118b') build() { cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --with-gnunet=/usr --disable-libgksu2 + patch -Np1 -i $srcdir/drop_gtk2.patch + autoreconf -fi + ./configure --prefix=/usr --with-gnunet=/usr make } diff --git a/community/gnunet-gtk/drop_gtk2.patch b/community/gnunet-gtk/drop_gtk2.patch new file mode 100644 index 000000000..1ae4fda1f --- /dev/null +++ b/community/gnunet-gtk/drop_gtk2.patch @@ -0,0 +1,11 @@ +diff -Nur gnunet-gtk-0.9.0pre3.orig/configure.ac gnunet-gtk-0.9.0pre3/configure.ac +--- gnunet-gtk-0.9.0pre3.orig/configure.ac 2011-10-12 06:30:21.001993062 +0000 ++++ gnunet-gtk-0.9.0pre3/configure.ac 2011-10-12 06:30:50.695578118 +0000 +@@ -169,7 +169,6 @@ + AC_MSG_CHECKING(for gtk) + without_gtk=true + AM_PATH_GTK_3_0(3.0.0,without_gtk=false,) +-AM_PATH_GTK_2_0(2.6.0,without_gtk=false,) + AM_CONDITIONAL(HAVE_GTK, test x$without_gtk != xtrue) + if test $without_gtk != true + then diff --git a/community/gnunet/PKGBUILD b/community/gnunet/PKGBUILD index 736657c44..85b880cfb 100644 --- a/community/gnunet/PKGBUILD +++ b/community/gnunet/PKGBUILD @@ -1,16 +1,15 @@ -# $Id: PKGBUILD 55840 2011-09-23 16:14:42Z spupykin $ +# $Id: PKGBUILD 56776 2011-10-12 06:43:47Z ibiru $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: wahnby <wahnby@yahoo.fr> pkgname=gnunet pkgver=0.9.0pre3 -pkgrel=1 +pkgrel=2 pkgdesc="A framework for secure peer-to-peer networking" arch=('i686' 'x86_64' 'mips64el') url="http://gnunet.org" license=('GPL') -depends=('gmp' 'libgcrypt' 'libextractor' 'sqlite3' 'guile' 'curl' 'libglade' - 'adns' 'libmicrohttpd') +depends=('gmp' 'libgcrypt' 'libextractor' 'sqlite3' 'curl' 'libmicrohttpd') makedepends=('gettext' 'pkgconfig') backup=(etc/gnunetd.conf) options=('!libtool' '!makeflags') diff --git a/community/gnunet/build-fix.patch b/community/gnunet/build-fix.patch deleted file mode 100644 index 2ca902fcd..000000000 --- a/community/gnunet/build-fix.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -wbBur gnunet-0.9.0pre2/src/transport/plugin_transport_http.c gnunet-0.9.0pre2.my/src/transport/plugin_transport_http.c ---- gnunet-0.9.0pre2/src/transport/plugin_transport_http.c 2010-12-23 09:37:50.000000000 +0000 -+++ gnunet-0.9.0pre2.my/src/transport/plugin_transport_http.c 2011-03-24 07:59:13.000000000 +0000 -@@ -1077,7 +1077,7 @@ - - conn_info = MHD_get_connection_info(mhd_connection, MHD_CONNECTION_INFO_CLIENT_ADDRESS ); - /* Incoming IPv4 connection */ -- if ( AF_INET == conn_info->client_addr->sin_family) -+ if ( AF_INET == ((struct sockaddr_in*)(conn_info->client_addr))->sin_family) - { - addrin = conn_info->client_addr; - inet_ntop(addrin->sin_family, &(addrin->sin_addr),address,INET_ADDRSTRLEN); -@@ -1087,7 +1087,7 @@ - addr_len = sizeof(struct IPv4HttpAddress); - } - /* Incoming IPv6 connection */ -- if ( AF_INET6 == conn_info->client_addr->sin_family) -+ if ( AF_INET6 == ((struct sockaddr_in6*)(conn_info->client_addr))->sin6_family) - { - addrin6 = (struct sockaddr_in6 *) conn_info->client_addr; - inet_ntop(addrin6->sin6_family, &(addrin6->sin6_addr),address,INET6_ADDRSTRLEN); diff --git a/community/gnustep-make/ChangeLog b/community/gnustep-make/ChangeLog deleted file mode 100644 index 15622ab88..000000000 --- a/community/gnustep-make/ChangeLog +++ /dev/null @@ -1,2 +0,0 @@ -2007-06-27 tardo <tardo@nagi-fanboi.net> -* version upgrade diff --git a/community/gnustep-make/PKGBUILD b/community/gnustep-make/PKGBUILD deleted file mode 100644 index b2e2e4e37..000000000 --- a/community/gnustep-make/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 45214 2011-04-18 12:46:00Z spupykin $ -# Maintainer: Vesa Kaihlavirta <vegai@iki.fi> -# Contributor: Sebastian Sareyko <public@nooms.de> - -pkgname=gnustep-make -pkgver=2.6.0 -pkgrel=1 -pkgdesc="The GNUstep make package" -arch=(i686 x86_64 'mips64el') -url="http://www.gnustep.org/" -license=('GPL') -depends=('glibc') -conflicts=('gnustep-make-svn') -groups=('gnustep-core') -source=(ftp://ftp.gnustep.org/pub/gnustep/core/$pkgname-$pkgver.tar.gz) -md5sums=('71a6c6d9a0b341495e67c915fe6722c1') - -build() { - cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc/GNUstep - make - make DESTDIR=$pkgdir install - install -D -m755 \ - $pkgdir/usr/share/GNUstep/Makefiles/GNUstep.sh \ - $pkgdir/etc/profile.d/GNUstep.sh -} diff --git a/community/go/PKGBUILD b/community/go/PKGBUILD index af507e693..fee111d1e 100644 --- a/community/go/PKGBUILD +++ b/community/go/PKGBUILD @@ -5,7 +5,7 @@ # Contributor: Christian Himpel <chressie at gmail dot com> pkgname=go -pkgver=r60 +pkgver=r60.3 pkgrel=1 epoch=1 pkgdesc='Google Go compiler and tools (release version)' @@ -13,7 +13,7 @@ arch=('i686' 'x86_64' 'mips64el') url="http://golang.org/" license=('custom') depends=('perl' 'ed') -makedepends=('mercurial') +makedepends=('mercurial' 'inetutils') options=('!strip') install=$pkgname.install source=($pkgname.sh) @@ -45,6 +45,7 @@ build() { export GOOS=linux export GOBIN="$GOROOT/bin" export PATH="$GOBIN:$PATH" + export CGO_ENABLED=0 # disable building net against libc, not needed on arch linux(?) mkdir -p "$GOROOT/bin" cd "$GOROOT/src" diff --git a/community/gogglesmm/PKGBUILD b/community/gogglesmm/PKGBUILD index 276d93581..27b4a9fb2 100644 --- a/community/gogglesmm/PKGBUILD +++ b/community/gogglesmm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 54297 2011-08-16 14:25:26Z spupykin $ +# $Id: PKGBUILD 56576 2011-10-08 22:42:27Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sander Jansen <sander@knology.net> pkgname=gogglesmm -pkgver=0.12.3 -pkgrel=1 +pkgver=0.12.4 +pkgrel=2 pkgdesc="Music Manager and Player" arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/gogglesmm/" @@ -15,7 +15,7 @@ makedepends=('pkgconfig' 'glproto' 'dri2proto') replaces=('musicmanager') conflicts=('musicmanager') source=(http://gogglesmm.googlecode.com/files/gogglesmm-$pkgver.tar.bz2) -md5sums=('77cfc3cb158673193251c85713ac7a4d') +md5sums=('ddbc41ecc6cfcf8958dbe2bca47e79e6') build() { cd $srcdir/gogglesmm-$pkgver diff --git a/community/goocanvas/PKGBUILD b/community/goocanvas/PKGBUILD index 5ae03ebf0..b7812f256 100644 --- a/community/goocanvas/PKGBUILD +++ b/community/goocanvas/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 56140 2011-10-02 09:45:13Z ibiru $ +# $Id: PKGBUILD 56677 2011-10-10 09:46:09Z ibiru $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> pkgname=goocanvas -pkgver=2.0.0 +pkgver=2.0.1 pkgrel=1 pkgdesc="A cairo canvas widget for GTK+" arch=(i686 x86_64 'mips64el') @@ -11,8 +11,9 @@ url="http://live.gnome.org/GooCanvas" options=('!libtool' 'docs') license=("LGPL") depends=('gtk3') -source=(http://ftp.gnome.org/pub/GNOME/sources/goocanvas/2.0/goocanvas-$pkgver.tar.bz2) -sha256sums=('9f8d7f700ad9617adef37e63f58cb2d038d799443e3756040f368ceea7f01331') +makedepends=('gobject-introspection') +source=(http://ftp.gnome.org/pub/GNOME/sources/goocanvas/2.0/goocanvas-$pkgver.tar.xz) +sha256sums=('0c3a595a6d2a4fe0f1a1a5243637e66aa1bfbaf6492455bfd0b51e0dec9b1553') build() { cd $srcdir/goocanvas-$pkgver diff --git a/community/goocanvasmm/PKGBUILD b/community/goocanvasmm/PKGBUILD index ca22cbad0..caab2fc45 100755 --- a/community/goocanvasmm/PKGBUILD +++ b/community/goocanvasmm/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Laurent Meunier <laurent@deltalima.net> pkgname=goocanvasmm -pkgver=1.90.5 +pkgver=1.90.6 pkgrel=1 pkgdesc='C++ wrappers for goocanvas' arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('GPL') depends=('goocanvas' 'gtkmm3') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/goocanvasmm/1.90/goocanvasmm-${pkgver}.tar.xz) -sha256sums=('9648e6fc6c41fceea348571b7db4421748bab7fbd7799700245890b63ae1b4b6') +sha256sums=('2d63cff0ea1a20cb0ebb9b91fbefe2a80f8972b1dbcda018ba4f10fbfda5c699') build() { cd ${pkgname}-${pkgver} diff --git a/community/gpsbabel/PKGBUILD b/community/gpsbabel/PKGBUILD index 75eac72e4..83abf7857 100644 --- a/community/gpsbabel/PKGBUILD +++ b/community/gpsbabel/PKGBUILD @@ -1,30 +1,37 @@ -# $Id: PKGBUILD 38742 2011-01-31 16:53:59Z spupykin $ +# $Id: PKGBUILD 56961 2011-10-17 10:14:20Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: dibblethewrecker dibblethewrecker.at.jiwe.dot.org # Contributor: William Rea <sillywilly@gmail.com> pkgname=gpsbabel pkgver=1.4.2 -pkgrel=1 +pkgrel=2 pkgdesc="Reads, writes, and manipulates GPS waypoints in a variety of formats" arch=('i686' 'x86_64' 'mips64el') url="http://www.gpsbabel.org" license=('GPL') depends=('libusb-compat' 'expat') -makedepends=('fop') +makedepends=('fop' 'qt' 'libxml2' 'libxslt') +optdepends=('qt') options=('docs') source=(gpsbabel-$pkgver.tar.gz::http://archlinux-stuff.googlecode.com/files/gpsbabel-$pkgver.tar.gz) md5sums=('76ea9f7852be2e98aa18976c4697ca93') build() { cd $srcdir/gpsbabel-$pkgver - mkdir -p $pkgdir/usr/bin ./configure --prefix=/usr - make make doc + (cd gui && qmake && make) +} + +package() { + cd $srcdir/gpsbabel-$pkgver make DESTDIR=$pkgdir install + # GUI + install -Dm755 gui/objects/gpsbabelfe-bin ${pkgdir}/usr/bin/gpsbabelfe-bin + # Header install mkdir -p $pkgdir/usr/include/gpsbabel cp {defs.h,queue.h,gbtypes.h,filterdefs.h,cet.h,cet_util.h,garmin_tables.h} \ diff --git a/community/grafx2/PKGBUILD b/community/grafx2/PKGBUILD new file mode 100644 index 000000000..0eb3d0696 --- /dev/null +++ b/community/grafx2/PKGBUILD @@ -0,0 +1,43 @@ +# $Id$ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Simon Parzer <simon.parzer@gmail.com> +pkgname=grafx2 +pkgver=2.3 +pkgrel=1 +pkgdesc="Pixelart-oriented painting program (for pixling)" +arch=('x86_64' 'i686') +url="http://code.google.com/p/grafx2/" +license=('GPL2') +install=grafx2.install +depends=('sdl_ttf' 'sdl_image' 'lua' 'desktop-file-utils') +source=("http://grafx2.googlecode.com/files/${pkgname}-${pkgver}.1781-src.tgz" + "${pkgname}.desktop") +md5sums=('916a35c4762e85b4210a1041fbbfd830' + '73d1cb00b7529de5cbab5c8f00640fbc') + +build() { + cd "${srcdir}/${pkgname}/src" + + msg2 "Compiling..." + make +} + +package() { + cd "${srcdir}/${pkgname}/src" + + msg2 "Packaging files..." + make prefix="/usr" DESTDIR="${pkgdir}" install + msg2 "Packaging shortcut..." + install -Dm644 "${srcdir}/${pkgname}.desktop" \ + "${pkgdir}/usr/share/applications/${pkgname}.desktop" + msg2 "Packaging documentation..." + install -Dm644 "${srcdir}/${pkgname}/doc/README.txt" \ + "${pkgdir}/usr/share/doc/${pkgname}/readme.txt" + msg2 "Packaging license..." + install -Dm644 "${srcdir}/${pkgname}/doc/gpl-2.0.txt" \ + "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + msg2 "Cleaning up..." + rmdir ${pkgdir}/usr/share/grafx2/scripts/libs +} + +# vim:set ts=2 sw=2 et: diff --git a/community/grafx2/grafx2.desktop b/community/grafx2/grafx2.desktop new file mode 100644 index 000000000..fcd6e71fb --- /dev/null +++ b/community/grafx2/grafx2.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Encoding=UTF-8 +GenericName=GrafX2 +Name=GrafX2 +Exec=grafx2 %U +TryExec=grafx2 +Icon=grafx2 +Terminal=false +Type=Application +Categories=Graphics;2DGraphics;RasterGraphics; +MimeType=image/bmp;image/gif;image/png;image/x-tga;image/tiff; diff --git a/community/grafx2/grafx2.install b/community/grafx2/grafx2.install new file mode 100644 index 000000000..ef816a666 --- /dev/null +++ b/community/grafx2/grafx2.install @@ -0,0 +1,14 @@ +post_upgrade() { + gtk-update-icon-cache -q -f -t /usr/share/icons/hicolor + update-desktop-database -q +} + +post_install() { + post_upgrade +} + +post_remove() { + post_upgrade +} + +# vim:set ts=2 sw=2 et: diff --git a/community/gtkdialog/build-fix.patch b/community/gtkdialog/build-fix.patch deleted file mode 100644 index 3322c8830..000000000 --- a/community/gtkdialog/build-fix.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -wbBur gtkdialog-0.7.20/src/glade_support.c gtkdialog-0.7.20.my/src/glade_support.c ---- gtkdialog-0.7.20/src/glade_support.c 2007-03-16 14:25:49.000000000 +0000 -+++ gtkdialog-0.7.20.my/src/glade_support.c 2010-07-08 11:05:46.000000000 +0000 -@@ -40,7 +40,7 @@ - typedef struct signal { - gchar *name; - GCallback callback; --} signal; -+} xsignal; - - /* - ** Signal handler callbascks. -@@ -206,7 +206,7 @@ - static gboolean - find_and_connect_handler( - GtkWidget *widget, -- signal *signals, -+ xsignal *signals, - const gchar *signal_name, - const gchar *handler_name) - { -@@ -288,7 +288,7 @@ - gpointer user_data) - { - gint n; -- signal entry_signals[] = { -+ xsignal entry_signals[] = { - { "activate", (GCallback)on_any_entry_almost_any }, - { "backspace", (GCallback)on_any_entry_almost_any }, - { "copy-clipboard", (GCallback)on_any_entry_almost_any }, -@@ -319,7 +319,7 @@ - gpointer user_data) - { - variable *var; -- signal widget_signals[] = { -+ xsignal widget_signals[] = { - { "accel-closures-changed", (GCallback)on_any_widget_almost_any }, - { "composited-changed", (GCallback)on_any_widget_almost_any }, - { "grab-focus", (GCallback)on_any_widget_almost_any }, diff --git a/community/gtweakui/PKGBUILD b/community/gtweakui/PKGBUILD deleted file mode 100644 index 61a73ffd3..000000000 --- a/community/gtweakui/PKGBUILD +++ /dev/null @@ -1,25 +0,0 @@ -# Contributor: Kritoke <kritoke@nospam.gmail.com> -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> - -pkgname=gtweakui -pkgver=0.4.0 -pkgrel=3 -pkgdesc="A collection of front ends to various gconf configurations." -arch=('i686' 'x86_64' 'mips64el') -url="http://gtweakui.sourceforge.net/" -license=('GPL') -depends=('libgnomeui') -makedepends=('perlxml') -source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/gTweakUI-${pkgver}.tar.bz2) -md5sums=('9d4725ccf4a83da3f46106c3d0be6cc8') - -build() { - cd ${srcdir}/gTweakUI-${pkgver} - ./configure --prefix=/usr - make || return 1 -} - -package() { - cd ${srcdir}/gTweakUI-${pkgver} - make DESTDIR=${pkgdir} install -} diff --git a/community/gummi/PKGBUILD b/community/gummi/PKGBUILD index 1b84304f2..f9bacff80 100644 --- a/community/gummi/PKGBUILD +++ b/community/gummi/PKGBUILD @@ -4,7 +4,7 @@ pkgname=gummi pkgver=0.5.8 -pkgrel=2 +pkgrel=3 pkgdesc='Simple LaTex editor for GTK users' arch=('i686' 'x86_64' 'mips64el') url='http://gummi.midnightcoding.org/' diff --git a/community/highlight/PKGBUILD b/community/highlight/PKGBUILD index 765fa9457..2f29fb30d 100644 --- a/community/highlight/PKGBUILD +++ b/community/highlight/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 48668 2011-06-04 07:12:24Z bluewind $ +# $Id: PKGBUILD 56750 2011-10-11 20:34:16Z bluewind $ # Maintainer: Florian Pritz <flo@xinu.at> # Contributor: Jan Fader <jan.fader@web.de> pkgbase=highlight pkgname=(highlight highlight-gui) -pkgver=3.5 +pkgver=3.6 pkgrel=1 url="http://www.andre-simon.de/doku/highlight/highlight.html" license=('GPL') arch=('i686' 'x86_64' 'mips64el') makedepends=(qt lua boost) source=(http://www.andre-simon.de/zip/$pkgname-$pkgver.tar.bz2) -md5sums=('0bb8cef23209bb6f31a581cb6e7bff77') +md5sums=('b23093dba7c44a7628ee5c97e68c9941') build() { cd "$srcdir/$pkgbase-$pkgver" diff --git a/community/hwinfo/PKGBUILD b/community/hwinfo/PKGBUILD index 562b2df9d..cc0fdb7d7 100644 --- a/community/hwinfo/PKGBUILD +++ b/community/hwinfo/PKGBUILD @@ -1,32 +1,45 @@ -# $Id: PKGBUILD 36515 2011-01-03 19:26:37Z kchen $ +# $Id: PKGBUILD 56757 2011-10-11 21:02:19Z arodseth $ # Maintainer: Kaiting Chen <kaitocracy@gmail.com> +# Contributor: Alexander Rødseth <rodseth@gmail.com> # Contributor: Gergely Imreh <imrehgATgmailDOTcom> -# Originally contributed by champus, madeye, Ranguvar and ninja_pt - +# Contributor: champus +# Contributor: madeye +# Contributor: Ranguvar +# Contributor: ninja_pt pkgname=hwinfo -pkgver=18.1 -_pkgver=$pkgver-3.5 -pkgrel=9 -pkgdesc='The hardware detection tool from openSUSE' +pkgver=19.0 +pkgrel=2 +pkgdesc='Hardware detection tool from openSUSE' arch=('i686' 'x86_64' 'mips64el') url='http://www.opensuse.org/' license=('GPL2') depends=('perl' 'libx86emu') makedepends=('sysfsutils' 'rpmextract' 'flex') -source=("http://download.opensuse.org/source/factory/repo/oss/suse/src/$pkgname-$_pkgver.src.rpm" - 'kbd.patch') -md5sums=('17c2a703643d1f007859c5e743589bb8' +source=("http://download.opensuse.org/source/factory/repo/oss/suse/src/${pkgname}-${pkgver}-1.1.src.rpm" + 'custom_ioctl.patch') +md5sums=('751238feaa13449324593ee5e145cd56' '1500ecfa26f6aaf4d7967eea74e86e5d') build() { cd "${srcdir}" - rpmextract.sh "${pkgname}-${_pkgver}.src.rpm" - tar -xjf $pkgname-$pkgver.tar.bz2 - cd "${srcdir}/${pkgname}-${pkgver}" -# Apply patch for custom ioctl - patch -p 0 < ../kbd.patch + msg2 "Extracting source rpm..." + rpmextract.sh "${pkgname}-${pkgver}-1.1.src.rpm" + tar jxf ${pkgname}-${pkgver}.tar.bz2 + cd "${pkgname}-${pkgver}" + msg2 "Patching..." + patch -p0 < ../custom_ioctl.patch + msg2 "Compiling..." + make -j1 CFLAGS+="-fPIC -I${srcdir}/${pkgname}-${pkgver}/src/hd" LIBDIR=/usr/lib +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" - make -j1 LIBDIR=/usr/lib - make LIBDIR=/usr/lib DESTDIR=$pkgdir install + msg2 "Packaging files..." + make LIBDIR=/usr/lib DESTDIR=${pkgdir} install + msg2 "Cleaning up..." + rmdir "${pkgdir}/sbin" } + +# vim:set ts=2 sw=2 et: diff --git a/community/hwinfo/kbd.patch b/community/hwinfo/custom_ioctl.patch index b9dd67161..b9dd67161 100644 --- a/community/hwinfo/kbd.patch +++ b/community/hwinfo/custom_ioctl.patch diff --git a/community/ibus-chewing/PKGBUILD b/community/ibus-chewing/PKGBUILD index c677bd4ae..1f688da6c 100644 --- a/community/ibus-chewing/PKGBUILD +++ b/community/ibus-chewing/PKGBUILD @@ -1,38 +1,36 @@ -# $Id: PKGBUILD 56294 2011-10-05 06:10:32Z ebelanger $ +# $Id: PKGBUILD 57032 2011-10-18 21:32:56Z ebelanger $ # Maintainer: Thomas Dziedzic < gostrc at gmail > # Contributor: Rainy <rainylau(at)gmail(dot)com> # Contributor: Lee.MaRS <leemars@gmail.com> # Contributor: Hiroshi Yui <hiroshiyui@gmail.com> pkgname=ibus-chewing -pkgver=1.3.9.2 -pkgrel=5 +pkgver=1.3.10 +pkgrel=1 pkgdesc='Chinese Chewing Engine for IBus Framework' arch=('i686' 'x86_64' 'mips64el') license=('GPL') url='http://ibus.googlecode.com' -depends=('ibus' 'libchewing' 'libxtst' 'gconf') +depends=('ibus' 'libchewing' 'libxtst') makedepends=('swig' 'cmake' 'gob2') install=ibus-chewing.install source=(http://ibus.googlecode.com/files/${pkgname}-${pkgver}-Source.tar.gz - ibus-chewing-696864-abrt-ibus-1.4.patch) -md5sums=('8d177d67647944f5d1f9cca0654eaccb' - '4bc83c143243a4fc5aa6a6e6fb0a3aa1') + https://fedorahosted.org/releases/c/m/cmake-fedora/cmake-fedora-modules-only-latest.tar.gz) +md5sums=('2a447828ca9290dd6bdf2336b2889bb0' + 'eb24ff0ec5b7646dd1b077f3b379712b') build() { cd "${srcdir}/${pkgname}-${pkgver}-Source" - patch -p1 -i "${srcdir}/ibus-chewing-696864-abrt-ibus-1.4.patch" + tar -xzf ../cmake-fedora-modules-only-latest.tar.gz cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DSYSCONF_INSTALL_DIR=/usr/share \ -DLIBEXEC_DIR=/usr/lib/ibus \ . - make } package() { cd "${srcdir}/${pkgname}-${pkgver}-Source" - make DESTDIR="${pkgdir}" install } diff --git a/community/ibus-chewing/ibus-chewing-696864-abrt-ibus-1.4.patch b/community/ibus-chewing/ibus-chewing-696864-abrt-ibus-1.4.patch deleted file mode 100644 index fc2be85d7..000000000 --- a/community/ibus-chewing/ibus-chewing-696864-abrt-ibus-1.4.patch +++ /dev/null @@ -1,84 +0,0 @@ -From ff138d7a18b7577e5f04f852bd3caf87cbc9e7cc Mon Sep 17 00:00:00 2001 -From: Ding-Yi Chen <dingyichen@gmail.com> -Date: Thu, 20 Jan 2011 17:03:07 +1000 -Subject: [PATCH] Addressed comments of yusake - ---- - src/IBusChewingEngine-def.c | 30 ++++++++++++++++++++++-------- - 1 files changed, 22 insertions(+), 8 deletions(-) - -diff --git a/src/IBusChewingEngine-def.c b/src/IBusChewingEngine-def.c -index 90c0384..8c90766 100644 ---- a/src/IBusChewingEngine-def.c -+++ b/src/IBusChewingEngine-def.c -@@ -391,21 +391,29 @@ this option determines how these status be synchronized. Valid values:\n\ - void g_variant_to_g_value(GVariant *gVar, GValue *gValue){ - const GVariantType *gVType=g_variant_get_type(gVar); - if (g_variant_type_is_subtype_of(gVType, G_VARIANT_TYPE_BOOLEAN)){ -+ g_value_init(gValue, G_TYPE_BOOLEAN); - g_value_set_boolean(gValue, g_variant_get_boolean(gVar)); - }else if (g_variant_type_is_subtype_of(gVType, G_VARIANT_TYPE_UINT16)){ -+ g_value_init(gValue, G_TYPE_UINT); - g_value_set_uint(gValue, g_variant_get_uint16(gVar)); - }else if (g_variant_type_is_subtype_of(gVType, G_VARIANT_TYPE_UINT32)){ -+ g_value_init(gValue, G_TYPE_UINT); - g_value_set_uint(gValue, g_variant_get_uint32(gVar)); - }else if (g_variant_type_is_subtype_of(gVType, G_VARIANT_TYPE_UINT64)){ -+ g_value_init(gValue, G_TYPE_UINT64); - g_value_set_uint64(gValue, g_variant_get_uint64(gVar)); - }else if (g_variant_type_is_subtype_of(gVType, G_VARIANT_TYPE_INT16)){ -+ g_value_init(gValue, G_TYPE_INT); - g_value_set_int(gValue, g_variant_get_int16(gVar)); - }else if (g_variant_type_is_subtype_of(gVType, G_VARIANT_TYPE_INT32)){ -+ g_value_init(gValue, G_TYPE_INT); - g_value_set_int(gValue, g_variant_get_int32(gVar)); - }else if (g_variant_type_is_subtype_of(gVType, G_VARIANT_TYPE_INT64)){ -+ g_value_init(gValue, G_TYPE_INT); - g_value_set_int64(gValue, g_variant_get_int64(gVar)); - }else if (g_variant_type_is_subtype_of(gVType, G_VARIANT_TYPE_STRING)){ -- g_value_set_int64(gValue, g_variant_get_string(gVar, NULL)); -+ g_value_init(gValue, G_TYPE_STRING); -+ g_value_set_string(gValue, g_variant_get_string(gVar, NULL)); - } - } - -@@ -419,8 +427,14 @@ GVariant *g_value_to_g_variant(GValue *gValue){ - case G_TYPE_UINT: - gVar=g_variant_new_uint32(g_value_get_uint(gValue)); - break; -+ case G_TYPE_UINT64: -+ gVar=g_variant_new_uint64(g_value_get_uint(gValue)); -+ break; - case G_TYPE_INT: -- gVar=g_variant_new_int32(g_value_get_int(gValue)); -+ gVar=g_variant_new_int32(g_value_get_uint(gValue)); -+ break; -+ case G_TYPE_INT64: -+ gVar=g_variant_new_int64(g_value_get_uint(gValue)); - break; - case G_TYPE_STRING: - gVar=g_variant_new_string(g_value_get_string(gValue)); -@@ -435,14 +449,14 @@ GVariant *g_value_to_g_variant(GValue *gValue){ - - static gboolean ibus_chewing_config_get_value(IBusConfig *config, const gchar *section, const gchar *key, GValue *gValue){ - #if IBUS_VERSION >= 10399 -- GVariant *gVar=g_variant_ref_sink(ibus_config_get_value(config, section, key)); -- if (gVar!=NULL){ -- g_variant_to_g_value(gVar, gValue); -- g_variant_unref(gVar); -- return TRUE; -- }else{ -+ GVariant *gVar=ibus_config_get_value(config, section, key); -+ if (gVar==NULL){ - return FALSE; - } -+ g_variant_ref_sink(gVar); -+ g_variant_to_g_value(gVar, gValue); -+ g_variant_unref(gVar); -+ return TRUE; - #else - return ibus_config_get_value(config, section, key, gValue); - #endif --- -1.7.4.4 - diff --git a/community/ibus-hangul/PKGBUILD b/community/ibus-hangul/PKGBUILD index 4042a60df..870d06e60 100644 --- a/community/ibus-hangul/PKGBUILD +++ b/community/ibus-hangul/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 56129 2011-10-02 08:05:56Z ebelanger $ +# $Id: PKGBUILD 57039 2011-10-18 23:59:43Z ebelanger $ # Maintainer: Thomas Dziedzic < gostrc at gmail > # Contributor: Radim Hvizdák <hvizdakr at gmail dot com> pkgname=ibus-hangul -pkgver=1.3.1 -pkgrel=2 +pkgver=1.3.2 +pkgrel=1 pkgdesc='Korean input engine for IBus' arch=('i686' 'x86_64' 'mips64el') url='http://ibus.googlecode.com' @@ -12,21 +12,17 @@ license=('GPL') depends=('ibus' 'libhangul') makedepends=('intltool') source=(http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz ibus-1.4.0.patch) -md5sums=('b71565bba3a1439a47212611b774ecf7' +md5sums=('b8132e8b11afadd803b2602c63294da5' 'edf93824ab2eead1307088d3edc24dbc') build() { cd "${srcdir}/${pkgname}-${pkgver}" patch -p1 -i "${srcdir}/ibus-1.4.0.patch" - ./configure \ - --prefix=/usr \ - --libexecdir=/usr/lib/ibus - + PYTHON=python2 ./configure --prefix=/usr --libexecdir=/usr/lib/ibus make } package() { cd "${srcdir}/${pkgname}-${pkgver}" - make NO_INDEX=true DESTDIR="${pkgdir}" install } diff --git a/community/ibus-table/PKGBUILD b/community/ibus-table/PKGBUILD index bd65d80e5..c7a05272b 100644 --- a/community/ibus-table/PKGBUILD +++ b/community/ibus-table/PKGBUILD @@ -1,25 +1,26 @@ +# $Id: PKGBUILD 56830 2011-10-14 06:44:36Z ebelanger $ # Contributor: coderoar <coderoar@gmail.com> # Contributor: leemars <leemars@gmail.com> # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=ibus-table -pkgver=1.3.0.20100621 -pkgrel=4 +pkgver=1.3.9.20110827 +pkgrel=1 pkgdesc='The IM Engine framework for table-based input methods, such as ZhengMa, WuBi, ErBi, CangJie and so on.' arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/ibus/" license=('LGPL') depends=('python2-pyenchant' 'ibus' 'aspell-en') source=("http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") -md5sums=('0fd5812197400f7b586480fca1a0c082') +md5sums=('251e2c8ace8ed265d780b30755afc163') build() { - cd ${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" # python2 fix find -type f -exec sed -i -e 's_exec python_exec python2_' -e 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' -e 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' {} \; - ./configure \ + PYTHON=/usr/bin/python2 ./configure \ --prefix=/usr \ --libexecdir=/usr/lib/ibus @@ -27,7 +28,7 @@ build() { } package() { - cd ${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR=${pkgdir} install + make DESTDIR="${pkgdir}" install } diff --git a/community/irrlicht/PKGBUILD b/community/irrlicht/PKGBUILD index 345ae3747..740ce5a28 100644 --- a/community/irrlicht/PKGBUILD +++ b/community/irrlicht/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 33729 2010-11-28 11:00:58Z svenstaro $ +# $Id: PKGBUILD 56796 2011-10-12 23:30:10Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Hilton Medeiros <medeiros.hilton AT gmail DOT com> # Contributor: Ali H. Caliskan <ali.h.caliskan AT gmail DOT com> @@ -7,12 +7,13 @@ pkgname=irrlicht pkgver=1.7.2 -pkgrel=1 +pkgrel=3 pkgdesc="An open source high performance realtime 3D graphics engine." arch=('i686' 'x86_64' 'mips64el') url="http://irrlicht.sourceforge.net/" license=('ZLIB') -depends=('mesa' 'libjpeg' 'bzip2') +depends=('libgl' 'libjpeg' 'bzip2' 'libpng') +makedepends=('mesa') source=("http://downloads.sourceforge.net/irrlicht/$pkgname-$pkgver.zip") md5sums=('eb627d4c432bf73f12bc6d9ddc700b07') @@ -21,6 +22,7 @@ build() { sed -i -e '/^#.*NON_SYSTEM_ZLIB/d' \ -e '/^#.*NON_SYSTEM_JPEG/d' \ + -e '/^#.*NON_SYSTEM_LIB_PNG/d' \ -e '/^#.*NON_SYSTEM_BZLIB/d' \ include/IrrCompileConfig.h @@ -28,17 +30,21 @@ build() { sed -i -e '/^CXXFLAGS/s:-g.*::' \ -e '/^CXXFLAGS/s:-Wall::' \ -e '/^CFLAGS/s/:= -O3 -fexpensive-optimizations/+=/' \ - -e '/^CXXINCS/s:-Izlib -Ijpeglib::' \ + -e '/^CXXINCS/s:-Izlib -Ijpeglib -Ilibpng::' \ -e '/^ZLIBOBJ/d' \ -e '/^JPEGLIBOBJ/d' \ -e '/^BZIP2OBJ/d' \ + -e '/^LIBPNGOBJ/d' \ -e '/.o=.d/d' \ - -e '/^sharedlib: LDFLAGS/s:+=:+= -lGL -lXxf86vm -ljpeg -lbz2 -lz:' \ + -e '/^staticlib sharedlib: LDFLAGS/s:+=.*:+= -lGL -lXxf86vm -lpng -ljpeg -lbz2 -lz:' \ -e "/^INSTALL_DIR/s:=.*:=$pkgdir/usr/lib:" \ -e 's/0-SVN/1/' \ -e 's/.$(VERSION_MINOR) -o/ -o/' \ Makefile + sed -i "s/png_set_gray_1_2_4_to_8/png_set_expand_gray_1_2_4_to_8/" \ + CImageLoaderPNG.cpp + make sharedlib make diff --git a/community/jansson/PKGBUILD b/community/jansson/PKGBUILD index a4e64db3f..583354aa6 100644 --- a/community/jansson/PKGBUILD +++ b/community/jansson/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 55139 2011-09-04 02:28:01Z kkeen $ +# $Id: PKGBUILD 56380 2011-10-07 02:59:03Z kkeen $ # Maintainer: Kyle Keen <keenerd@gmail.com> # Contributor: Dave Reisner <d@falconindy.com> pkgname=jansson -pkgver=2.2 +pkgver=2.2.1 pkgrel=1 pkgdesc='C library for encoding, decoding and manipulating JSON data' arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ url='http://www.digip.org/jansson/' license=('MIT') options=('!libtool') source=("$url/releases/$pkgname-$pkgver.tar.bz2") -md5sums=('0e91c6867f49dbc3ef0bbf21d26812ee') +md5sums=('074373f2d101c52d70659be86647e7a1') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/john/PKGBUILD b/community/john/PKGBUILD index 5ba335310..03b9b798f 100644 --- a/community/john/PKGBUILD +++ b/community/john/PKGBUILD @@ -6,7 +6,7 @@ pkgname=john pkgver=1.7.8 -pkgrel=4 +pkgrel=5 _jumbover=7 pkgdesc="John The Ripper - A fast password cracker (jumbo-$_jumbover included)" arch=('i686' 'x86_64' 'mips64el') @@ -65,6 +65,8 @@ package() { # install password list and charset files install -m644 ${srcdir}/${pkgname}-${pkgver}/run/{{all,alnum,alpha,digits,lanman}.chr,password.lst} \ ${pkgdir}/usr/share/john/ + install -m644 ${srcdir}/${pkgname}-${pkgver}/run/{dumb16,dumb32,generic}.conf \ + ${pkgdir}/usr/share/john/ # install binaries install -Dm755 ${srcdir}/john-$pkgver/run/john ${pkgdir}/usr/bin/john diff --git a/community/kungfu/ChangeLog b/community/kungfu/ChangeLog deleted file mode 100644 index 7fd5bbf99..000000000 --- a/community/kungfu/ChangeLog +++ /dev/null @@ -1,2 +0,0 @@ -2007-06-26 tardo <tardo@nagi-fanboi.net> -* Built for x86_64 diff --git a/community/kungfu/PKGBUILD b/community/kungfu/PKGBUILD deleted file mode 100644 index 1424fca75..000000000 --- a/community/kungfu/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com> -# Contributor: Björn Martensen <bjoern.martensen@gmail.com> -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> - -pkgname=kungfu -pkgver=0.3.0 -pkgrel=3 -pkgdesc="A GStreamer based DVD ripper." -arch=('i686' 'x86_64' 'mips64el') -url="https://launchpad.net/kungfu/" -license=('GPL') -depends=('pygtk' 'gstreamer0.10-python' 'gstreamer0.10-ffmpeg' 'dbus-python' \ - 'gstreamer0.10-good-plugins' 'gstreamer0.10-base-plugins' 'gstreamer0.10-ugly-plugins') -makedepends=('python2') -source=(http://launchpad.net/${pkgname}/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz) -md5sums=('1a398887784da4e0694afad893ce48b4') - -build() { - /bin/true -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - python2 setup.py install --root=${pkgdir} - chmod 644 ${pkgdir}/usr/share/pixmaps/kungfu.svg - chmod 644 ${pkgdir}/usr/share/applications/kungfu.desktop -} diff --git a/community/libacpi/PKGBUILD b/community/libacpi/PKGBUILD index 64cf7bb1d..be13c8864 100644 --- a/community/libacpi/PKGBUILD +++ b/community/libacpi/PKGBUILD @@ -1,21 +1,23 @@ -# $Id: PKGBUILD 11341 2010-02-09 23:06:14Z dgriffiths $ +# $Id: PKGBUILD 57009 2011-10-18 09:29:14Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=libacpi pkgver=0.2 -pkgrel=2.1 +pkgrel=3 pkgdesc="general purpose lib to gather ACPI data" arch=(i686 x86_64 'mips64el') url="http://www.ngolde.de/libacpi.html" license=('GPL') depends=() options=(!emptydirs) -source=(http://www.ngolde.de/download/${pkgname}-${pkgver}.tar.gz) -md5sums=('05b53dd7bead66dda35fec502b91066c') +source=(http://www.ngolde.de/download/${pkgname}-${pkgver}.tar.gz + http://ftp.de.debian.org/debian/pool/main/liba/libacpi/libacpi_${pkgver}-4.diff.gz) +md5sums=('05b53dd7bead66dda35fec502b91066c' + '30ecd3c281dfe7e11670618fdd8e3c5b') build() { cd "${srcdir}/${pkgname}-${pkgver}" - - make PREFIX=/usr || return 1 + patch -p1 <$srcdir/libacpi_${pkgver}-4.diff + make PREFIX=/usr make PREFIX=/usr DESTDIR="${pkgdir}" install } diff --git a/community/libdaq/PKGBUILD b/community/libdaq/PKGBUILD index 488bb5f2d..cc8c4b2be 100644 --- a/community/libdaq/PKGBUILD +++ b/community/libdaq/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 54741 2011-08-24 08:34:27Z lfleischer $ +# $Id: PKGBUILD 56490 2011-10-07 10:32:45Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> pkgname=libdaq -pkgver=0.6.1 +pkgver=0.6.2 pkgrel=1 pkgdesc='Data Acquisition library for packet I/O.' arch=('i686' 'x86_64' 'mips64el') @@ -11,8 +11,8 @@ license=('GPL') depends=('libpcap') makedepends=('ca-certificates') options=('!libtool') -source=('http://www.snort.org/downloads/1098') -md5sums=('54ed07a9e903512260fbc30f902748fd') +source=('http://www.snort.org/downloads/1170') +md5sums=('6ea8aaa6f067f8b8ef6de45b95d55875') build() { cd "${srcdir}/daq-${pkgver}" diff --git a/community/libfm/0001-filename-with-spaces-not-supported.patch b/community/libfm/0001-filename-with-spaces-not-supported.patch deleted file mode 100644 index 568f6dc38..000000000 --- a/community/libfm/0001-filename-with-spaces-not-supported.patch +++ /dev/null @@ -1,345 +0,0 @@ -From 96fa31c757189c7c5f60d4de4c2df236d2cba0ea Mon Sep 17 00:00:00 2001 -From: Hong Jen Yee (PCMan) <pcman.tw@gmail.com> -Date: Wed, 20 Oct 2010 06:40:51 +0800 -Subject: [PATCH] Fix #3089625 - Filenames with spaces not supported in copy/paste. - ---- - src/base/fm-file-launcher.c | 2 +- - src/base/fm-folder.c | 6 +- - src/base/fm-path.c | 2 +- - src/gtk/fm-folder-view.c | 130 +++++++++++++++++++++--------------------- - src/gtk/fm-gtk-utils.c | 10 +-- - src/gtk/fm-path-entry.c | 2 +- - 6 files changed, 75 insertions(+), 77 deletions(-) - -diff --git a/src/base/fm-file-launcher.c b/src/base/fm-file-launcher.c -index 3857c33..c356249 100644 ---- a/src/base/fm-file-launcher.c -+++ b/src/base/fm-file-launcher.c -@@ -91,7 +91,7 @@ gboolean fm_launch_desktop_entry(GAppLaunchContext* ctx, const char* file_or_id, - * e.g: If this URL points to the another desktop entry file, and it - * points to yet another desktop entry file, this can create a - * infinite loop. This is a extremely rare case. */ -- FmPath* path = fm_path_new(url); -+ FmPath* path = fm_path_new_for_uri(url); - _uris = g_list_prepend(_uris, path); - ret = fm_launch_paths(ctx, _uris, launcher, user_data); - g_list_free(_uris); -diff --git a/src/base/fm-folder.c b/src/base/fm-folder.c -index ccbb3cc..3474937 100644 ---- a/src/base/fm-folder.c -+++ b/src/base/fm-folder.c -@@ -334,8 +334,8 @@ static void on_job_finished(FmDirListJob* job, FmFolder* folder) - - static FmJobErrorAction on_job_err(FmDirListJob* job, GError* err, FmJobErrorSeverity severity, FmFolder* folder) - { -- FmJobErrorAction ret; -- g_signal_emit(folder, signals[ERROR], 0, err, severity, &ret); -+ FmJobErrorAction ret; -+ g_signal_emit(folder, signals[ERROR], 0, err, severity, &ret); - return ret; - } - -@@ -470,7 +470,7 @@ FmFolder* fm_folder_get_for_path(FmPath* path) - - FmFolder* fm_folder_get_for_path_name(const char* path) - { -- FmPath* fm_path = fm_path_new(path); -+ FmPath* fm_path = fm_path_new_for_str(path); - FmFolder* folder = fm_folder_get_internal(fm_path, NULL); - fm_path_unref(fm_path); - return folder; -diff --git a/src/base/fm-path.c b/src/base/fm-path.c -index ca62256..8b31de2 100644 ---- a/src/base/fm-path.c -+++ b/src/base/fm-path.c -@@ -926,7 +926,7 @@ FmPathList* fm_path_list_new_from_uris(const char** uris) - FmPathList* pl = fm_path_list_new(); - for(uri = uris; *uri; ++uri) - { -- FmPath* path = fm_path_new(*uri); -+ FmPath* path = fm_path_new_for_uri(*uri); - fm_list_push_tail_noref(pl, path); - } - return pl; -diff --git a/src/gtk/fm-folder-view.c b/src/gtk/fm-folder-view.c -index fab88c0..9943015 100644 ---- a/src/gtk/fm-folder-view.c -+++ b/src/gtk/fm-folder-view.c -@@ -41,8 +41,8 @@ - - enum{ - CHDIR, -- LOADED, -- STATUS, -+ LOADED, -+ STATUS, - CLICKED, - SEL_CHANGED, - SORT_CHANGED, -@@ -82,7 +82,7 @@ static void fm_folder_view_class_init(FmFolderViewClass *klass) - { - GObjectClass *g_object_class; - GtkWidgetClass *widget_class; -- FmFolderViewClass *fv_class; -+ FmFolderViewClass *fv_class; - g_object_class = G_OBJECT_CLASS(klass); - g_object_class->finalize = fm_folder_view_finalize; - widget_class = GTK_WIDGET_CLASS(klass); -@@ -165,19 +165,19 @@ gboolean on_folder_view_focus_in(GtkWidget* widget, GdkEventFocus* evt) - - void on_chdir(FmFolderView* fv, FmPath* dir_path) - { -- GtkWidget* toplevel = gtk_widget_get_toplevel((GtkWidget*)fv); -- if(GTK_WIDGET_REALIZED(toplevel)) -- { -- GdkCursor* cursor = gdk_cursor_new(GDK_WATCH); -- gdk_window_set_cursor(toplevel->window, cursor); -- } -+ GtkWidget* toplevel = gtk_widget_get_toplevel((GtkWidget*)fv); -+ if(GTK_WIDGET_REALIZED(toplevel)) -+ { -+ GdkCursor* cursor = gdk_cursor_new(GDK_WATCH); -+ gdk_window_set_cursor(toplevel->window, cursor); -+ } - } - - void on_loaded(FmFolderView* fv, FmPath* dir_path) - { -- GtkWidget* toplevel = gtk_widget_get_toplevel((GtkWidget*)fv); -- if(GTK_WIDGET_REALIZED(toplevel)) -- gdk_window_set_cursor(toplevel->window, NULL); -+ GtkWidget* toplevel = gtk_widget_get_toplevel((GtkWidget*)fv); -+ if(GTK_WIDGET_REALIZED(toplevel)) -+ gdk_window_set_cursor(toplevel->window, NULL); - } - - void on_status(FmFolderView* fv, const char* msg) -@@ -187,15 +187,15 @@ void on_status(FmFolderView* fv, const char* msg) - - void on_model_loaded(FmFolderModel* model, FmFolderView* fv) - { -- FmFolder* folder = model->dir; -- char* msg; -- /* FIXME: prevent direct access to data members */ -- g_signal_emit(fv, signals[LOADED], 0, folder->dir_path); -+ FmFolder* folder = model->dir; -+ char* msg; -+ /* FIXME: prevent direct access to data members */ -+ g_signal_emit(fv, signals[LOADED], 0, folder->dir_path); - - /* FIXME: show number of hidden files and available disk spaces. */ -- msg = g_strdup_printf("%d files are listed.", fm_list_get_length(folder->files) ); -- g_signal_emit(fv, signals[STATUS], 0, msg); -- g_free(msg); -+ msg = g_strdup_printf("%d files are listed.", fm_list_get_length(folder->files) ); -+ g_signal_emit(fv, signals[STATUS], 0, msg); -+ g_free(msg); - } - - FmJobErrorAction on_folder_err(FmFolder* folder, GError* err, FmJobErrorSeverity severity, FmFolderView* fv) -@@ -326,8 +326,8 @@ static void fm_folder_view_finalize(GObject *object) - if( self->model ) - g_object_unref(self->model); - } -- g_object_unref(self->dnd_src); -- g_object_unref(self->dnd_dest); -+ g_object_unref(self->dnd_src); -+ g_object_unref(self->dnd_dest); - - if(self->cwd) - fm_path_unref(self->cwd); -@@ -715,15 +715,15 @@ void fm_folder_view_set_mode(FmFolderView* fv, FmFolderViewMode mode) - - /* FIXME: maybe calling set_icon_size here is a good idea */ - -- gtk_drag_source_set(fv->view, GDK_BUTTON1_MASK, -- fm_default_dnd_src_targets, N_FM_DND_SRC_DEFAULT_TARGETS, -- GDK_ACTION_COPY|GDK_ACTION_MOVE|GDK_ACTION_LINK|GDK_ACTION_ASK); -+ gtk_drag_source_set(fv->view, GDK_BUTTON1_MASK, -+ fm_default_dnd_src_targets, N_FM_DND_SRC_DEFAULT_TARGETS, -+ GDK_ACTION_COPY|GDK_ACTION_MOVE|GDK_ACTION_LINK|GDK_ACTION_ASK); - fm_dnd_src_set_widget(fv->dnd_src, fv->view); - -- gtk_drag_dest_set(fv->view, 0, -- fm_default_dnd_dest_targets, N_FM_DND_DEST_DEFAULT_TARGETS, -- GDK_ACTION_COPY|GDK_ACTION_MOVE|GDK_ACTION_LINK|GDK_ACTION_ASK); -- fm_dnd_dest_set_widget(fv->dnd_dest, fv->view); -+ gtk_drag_dest_set(fv->view, 0, -+ fm_default_dnd_dest_targets, N_FM_DND_DEST_DEFAULT_TARGETS, -+ GDK_ACTION_COPY|GDK_ACTION_MOVE|GDK_ACTION_LINK|GDK_ACTION_ASK); -+ fm_dnd_dest_set_widget(fv->dnd_dest, fv->view); - g_signal_connect_after(fv->view, "drag-motion", G_CALLBACK(on_drag_motion), fv); - g_signal_connect(fv->view, "drag-leave", G_CALLBACK(on_drag_leave), fv); - g_signal_connect(fv->view, "drag-drop", G_CALLBACK(on_drag_drop), fv); -@@ -739,9 +739,9 @@ void fm_folder_view_set_mode(FmFolderView* fv, FmFolderViewMode mode) - gtk_widget_grab_focus(fv->view); - } - else -- { -+ { - /* g_debug("same mode"); */ -- } -+ } - } - - FmFolderViewMode fm_folder_view_get_mode(FmFolderView* fv) -@@ -785,7 +785,7 @@ void fm_folder_view_sort(FmFolderView* fv, GtkSortType type, int by) - fv->sort_by = by; - if(fv->model) - gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(fv->model), -- fv->sort_by, fv->sort_type); -+ fv->sort_by, fv->sort_type); - } - - GtkSortType fm_folder_view_get_sort_type(FmFolderView* fv) -@@ -815,18 +815,18 @@ gboolean fm_folder_view_get_show_hidden(FmFolderView* fv) - - gboolean fm_folder_view_chdir_by_name(FmFolderView* fv, const char* path_str) - { -- gboolean ret; -- FmPath* path; -+ gboolean ret; -+ FmPath* path; - - if( G_UNLIKELY( !path_str ) ) - return FALSE; - -- path = fm_path_new(path_str); -- if(!path) /* might be a malformed path */ -- return FALSE; -- ret = fm_folder_view_chdir(fv, path); -- fm_path_unref(path); -- return ret; -+ path = fm_path_new_for_str(path_str); -+ if(!path) /* might be a malformed path */ -+ return FALSE; -+ ret = fm_folder_view_chdir(fv, path); -+ fm_path_unref(path); -+ return ret; - } - - static void on_folder_unmounted(FmFolder* folder, FmFolderView* fv) -@@ -912,10 +912,10 @@ gboolean fm_folder_view_chdir(FmFolderView* fv, FmPath* path) - } - } - -- /* FIXME: the signal handler should be able to cancel the loading. */ -- g_signal_emit(fv, signals[CHDIR], 0, path); -- if(fv->cwd) -- fm_path_unref(fv->cwd); -+ /* FIXME: the signal handler should be able to cancel the loading. */ -+ g_signal_emit(fv, signals[CHDIR], 0, path); -+ if(fv->cwd) -+ fm_path_unref(fv->cwd); - fv->cwd = fm_path_ref(path); - - fv->folder = folder = fm_folder_get_for_path(path); -@@ -1041,12 +1041,12 @@ gboolean on_btn_pressed(GtkWidget* view, GdkEventButton* evt, FmFolderView* fv) - if(!fv->model) - return FALSE; - -- /* FIXME: handle single click activation */ -+ /* FIXME: handle single click activation */ - if( evt->type == GDK_BUTTON_PRESS ) - { -- /* special handling for ExoIconView */ -- if(evt->button != 1) -- { -+ /* special handling for ExoIconView */ -+ if(evt->button != 1) -+ { - if(fv->mode==FM_FV_ICON_VIEW || fv->mode==FM_FV_COMPACT_VIEW || fv->mode==FM_FV_THUMBNAIL_VIEW) - { - /* select the item on right click for ExoIconView */ -@@ -1089,27 +1089,27 @@ gboolean on_btn_pressed(GtkWidget* view, GdkEventButton* evt, FmFolderView* fv) - gtk_tree_path_free(tp); - } - } -- } -+ } - -- if(evt->button == 2) /* middle click */ -- type = FM_FV_MIDDLE_CLICK; -- else if(evt->button == 3) /* right click */ -- type = FM_FV_CONTEXT_MENU; -+ if(evt->button == 2) /* middle click */ -+ type = FM_FV_MIDDLE_CLICK; -+ else if(evt->button == 3) /* right click */ -+ type = FM_FV_CONTEXT_MENU; - } - -- if( type != FM_FV_CLICK_NONE ) -- { -- sels = fm_folder_view_get_selected_tree_paths(fv); -- if( sels || type == FM_FV_CONTEXT_MENU ) -- { -- item_clicked(fv, sels ? sels->data : NULL, type); -- if(sels) -- { -- g_list_foreach(sels, (GFunc)gtk_tree_path_free, NULL); -- g_list_free(sels); -- } -- } -- } -+ if( type != FM_FV_CLICK_NONE ) -+ { -+ sels = fm_folder_view_get_selected_tree_paths(fv); -+ if( sels || type == FM_FV_CONTEXT_MENU ) -+ { -+ item_clicked(fv, sels ? sels->data : NULL, type); -+ if(sels) -+ { -+ g_list_foreach(sels, (GFunc)gtk_tree_path_free, NULL); -+ g_list_free(sels); -+ } -+ } -+ } - return FALSE; - } - -diff --git a/src/gtk/fm-gtk-utils.c b/src/gtk/fm-gtk-utils.c -index 23b6f33..07df7d5 100644 ---- a/src/gtk/fm-gtk-utils.c -+++ b/src/gtk/fm-gtk-utils.c -@@ -149,7 +149,7 @@ FmPath* fm_get_user_input_path(GtkWindow* parent, const char* title, const char* - } - - str = _fm_user_input_dialog_run( dlg, GTK_ENTRY( entry ) ); -- path = fm_path_new(str); -+ path = fm_path_new_for_str(str); - - g_free(path_str); - g_free(str); -@@ -261,11 +261,9 @@ FmPath* fm_select_folder(GtkWindow* parent) - GTK_RESPONSE_OK, NULL); - if( gtk_dialog_run((GtkDialog*)chooser) == GTK_RESPONSE_OK ) - { -- char* file = gtk_file_chooser_get_filename(chooser); -- if(!file) -- file = gtk_file_chooser_get_uri(chooser); -- path = fm_path_new(file); -- g_free(file); -+ GFile* file = gtk_file_chooser_get_file(chooser); -+ path = fm_path_new_for_gfile(file); -+ g_object_unref(file); - } - else - path = NULL; -diff --git a/src/gtk/fm-path-entry.c b/src/gtk/fm-path-entry.c -index a57b58d..af60d03 100644 ---- a/src/gtk/fm-path-entry.c -+++ b/src/gtk/fm-path-entry.c -@@ -163,7 +163,7 @@ static void fm_path_entry_changed(GtkEditable *editable) - if( !fm_path_equal_str(priv->path, original_key, key_dir_len) ) - { - gchar* new_path = g_path_get_dirname(original_key); -- FmPath *new_fm_path = fm_path_new(new_path); -+ FmPath *new_fm_path = fm_path_new_for_str(new_path); - g_free(new_path); - if( new_fm_path != NULL ) - { --- -1.7.0.1 - - diff --git a/community/libfm/PKGBUILD b/community/libfm/PKGBUILD index 3a1d121fd..e0e3ad970 100644 --- a/community/libfm/PKGBUILD +++ b/community/libfm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 49034 2011-06-09 21:26:14Z andrea $ -# Maintainer: Angel Velasquez <angvp@archlinux.org> -# Maintainer: Juergen Hoetzel <juergen@archlinux.org> +# Contributor: Unknown47 <unknown47r@gmail.com> +# Contributor: Angel Velasquez <angvp@archlinux.org> +# Contributor: Juergen Hoetzel <juergen@archlinux.org> pkgname=libfm -pkgver=0.1.14 -pkgrel=5 +pkgver=0.1.16 +pkgrel=2 pkgdesc="the core of next generation file manager PCManFM" url="http://pcmanfm.sourceforge.net/" arch=('i686' 'x86_64' 'mips64el') @@ -12,15 +12,13 @@ license=('GPL') groups=('lxde') options=('!libtool') install=libfm.install -depends=('gtk2' 'menu-cache' 'shared-mime-info' 'udisks') -source=(http://downloads.sourceforge.net/pcmanfm/$pkgname-$pkgver.tar.gz - 0001-filename-with-spaces-not-supported.patch) -md5sums=('d55e51dced6bb9ef46665243b079761f' - '22bf07665db6eb82989cc8111ef5c3bf') +depends=('gtk2' 'menu-cache' 'shared-mime-info' 'udisks' 'desktop-file-utils') +source=(http://downloads.sourceforge.net/pcmanfm/$pkgname-$pkgver.tar.gz) +md5sums=('c09bce415ff6dc2dd835e28aeddeabe3') build() { cd $srcdir/$pkgname-$pkgver - patch -p1 -i $srcdir/0001-filename-with-spaces-not-supported.patch + sed -i -e "s|docs/Makefile docs/reference/Makefile docs/reference/libfm/Makefile ||" configure ./configure --prefix=/usr \ --sysconfdir=/etc \ --enable-udisks \ diff --git a/community/libgdamm/PKGBUILD b/community/libgdamm/PKGBUILD index 021a83bda..dffdf753f 100644 --- a/community/libgdamm/PKGBUILD +++ b/community/libgdamm/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 56138 2011-10-02 09:24:08Z ibiru $ +# $Id: PKGBUILD 56662 2011-10-09 15:04:32Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Jan de Groot <jan@jgc.homeip.net> pkgbase=libgdamm pkgname=(libgdamm libgdamm-docs) -pkgver=4.99.4 +pkgver=4.99.4.1 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') makedepends=('libgda' 'libsigc++' 'glibmm' 'glibmm-docs') url="http://gtkmm.sourceforge.net/" license=('LGPL') options=('!libtool' '!emptydirs') -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgbase/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('08431875745abf85d0a1f0bde5ca273f400395b209fb6c4a5ca87fb87a5f67f0') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgbase/${pkgver%.*.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('7be24b0a7e992724478abda029974f7200a8ef000b8592659dd5068f47b02c6a') build() { cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/community/libmilter/PKGBUILD b/community/libmilter/PKGBUILD new file mode 100644 index 000000000..3154cc8b9 --- /dev/null +++ b/community/libmilter/PKGBUILD @@ -0,0 +1,47 @@ +# $Id: PKGBUILD 56914 2011-10-16 12:39:57Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: mutantmonkey <mutantmonkey@gmail.com> + +pkgname=libmilter +pkgver=8.14.4 +pkgrel=3 +pkgdesc="libmilter" +arch=(i686 x86_64) +url="http://www.postfix.org/MILTER_README.html" +license=('custom:Sendmail open source license') +source="ftp://ftp.sendmail.org/pub/sendmail/sendmail.${pkgver}.tar.gz" +md5sums=('1b23d5000c8e7bfe82ec1a27f2f5fdc5') + +build(){ + cd "${srcdir}/sendmail-${pkgver}" + + # From http://www.j-chkmail.org/wiki/doku.php/doc/installation/start#libmilter + cat >> devtools/Site/site.config.m4 <<EOF +dnl +dnl Enable libmilter with a pool of workers +APPENDDEF(\`conf_libmilter_ENVDEF',\`-D_FFR_WORKERS_POOL=1 -DMIN_WORKERS=4') +dnl +dnl Use poll instead of select +APPENDDEF(\`conf_libmilter_ENVDEF',\`-DSM_CONF_POLL=1') +dnl Enable IPv6 +APPENDDEF(\`conf_libmilter_ENVDEF',\`-DNETINET6=1') +dnl +dnl Include our CFLAGS +APPENDDEF(\`conf_libmilter_ENVDEF',\`${CFLAGS}') +dnl +dnl Add -fPIC +APPENDDEF(\`conf_libmilter_ENVDEF',\`-fPIC') +dnl +EOF + + cd libmilter + ./Build +} + +package(){ + cd "${srcdir}/sendmail-${pkgver}/libmilter" + mkdir -p "${pkgdir}/usr/lib" + ./Build DESTDIR="${pkgdir}" install + install -Dm0644 ../LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE + chown -R root:root $pkgdir +} diff --git a/community/libmirage/PKGBUILD b/community/libmirage/PKGBUILD index e0fc47e16..7f21a13b1 100644 --- a/community/libmirage/PKGBUILD +++ b/community/libmirage/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 27101 2010-09-17 14:57:55Z mherych $ +# $Id: PKGBUILD 56986 2011-10-17 16:29:39Z bpiotrowski $ # Maintainer: Mateusz Herych <heniekk@gmail.com> # Contributor: Charles Lindsay <charles@chaoslizard.org> pkgname=libmirage -pkgver=1.3.0 +pkgver=1.4.0 pkgrel=1 pkgdesc="CD-ROM image (B6T/CCD/CDI/CUE/ISO/MDS/NRG/TOC) access library" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('glib2' 'libsndfile') makedepends=('bison' 'flex') source=(http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.gz) options=(!libtool) -md5sums=('a223f9fd648e194c72f3809fbb0de63d') +md5sums=('cd6cc75e1b76a0ef72821b30168c94d9') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/liboauth/PKGBUILD b/community/liboauth/PKGBUILD deleted file mode 100644 index 967c3c52b..000000000 --- a/community/liboauth/PKGBUILD +++ /dev/null @@ -1,25 +0,0 @@ -# $Id: PKGBUILD 43029 2011-03-23 21:35:04Z kchen $ -# Maintainer: Kaiting Chen <kaitocracy@gmail.com> -# Contributor: Martin Häger <martin.haeger@gmail.com> - -pkgname=liboauth -pkgver=0.9.4 -pkgrel=1 -pkgdesc='C library implementing OAuth Core RFC 5849' -arch=('i686' 'x86_64' 'mips64el') -url='http://liboauth.sourceforge.net/' -license=('MIT') -options=('!libtool') -depends=('curl') - -md5sums=('973ded7a1af348c5bfe4e3b6b7e47bd3') -source=("${url}pool/$pkgname-$pkgver.tar.gz") - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make; make DESTDIR=$pkgdir install - - install -Dm644 COPYING.MIT \ - $pkgdir/usr/share/licenses/$pkgname/COPYING -} diff --git a/community/liboobs/PKGBUILD b/community/liboobs/PKGBUILD deleted file mode 100644 index 746af8e79..000000000 --- a/community/liboobs/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 44470 2011-04-07 19:06:42Z ibiru $ -# Maintainer : Ionut Biru<ibiru@archlinux.org> -# Contributor: Hugo Doria <hugodoria@gmail.com> - -pkgname=liboobs -pkgver=3.0.0 -pkgrel=1 -arch=('i686' 'x86_64' 'mips64el') -pkgdesc="A wrapping library to the System Tools Backends" -url="ftp://ftp.gnome.org/pub/GNOME/sources/liboobs/" -license=('GPL') -depends=('system-tools-backends') -makedepends=('pkgconfig') -options=('!libtool') -source=(http://ftp.gnome.org/pub/GNOME/sources/liboobs/3.0/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('1e7a327df7dcfa30e0cd3e0d2ffcd9a2c91c7870291dd30434b5da907945c00a') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --disable-static - make -} -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR=${pkgdir} install -} diff --git a/community/lua-lzlib/PKGBUILD b/community/lua-lzlib/PKGBUILD deleted file mode 100644 index c766b9f9b..000000000 --- a/community/lua-lzlib/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# Contributor: Anders Bergh <anders1@gmail.com> -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> - -pkgname=lua-lzlib -pkgver=0.4_work2 -pkgrel=4 -pkgdesc="Lua interface to zlib" -arch=('i686' 'x86_64' 'mips64el') -url="http://luaforge.net/projects/lzlib/" -license=('custom') -depends=(lua zlib) -# LuaForge urls have to be updated manually (the ID is different) -source=(http://luaforge.net/frs/download.php/3826/lzlib-0.4-work2.tar.gz - license.txt) -md5sums=('9d29ec26d3ccbd86ea4d95dcc602911a' - 'fc22ecccadddd8ad646aca9c5eb7d23a') -build() { - cd ${srcdir}/lzlib-${pkgver/_/-} - - make || return 1 -} - -package() { - cd ${srcdir}/lzlib-${pkgver/_/-} - - install -Dm644 ${srcdir}/license.txt ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE || return 1 - install -Dm755 zlib.so ${pkgdir}/usr/lib/lua/5.1/zlib.so || return 1 - install -Dm644 gzip.lua ${pkgdir}/usr/share/lua/5.1/gzip.lua || return 1 -} diff --git a/community/lua-lzlib/license.txt b/community/lua-lzlib/license.txt deleted file mode 100644 index 389456d0a..000000000 --- a/community/lua-lzlib/license.txt +++ /dev/null @@ -1,24 +0,0 @@ -************************************************************************* -* Author : Tiago Dionizio <tiago.dionizio@gmail.com> * -* Library : lzlib - Lua 5.1 interface to access zlib library functions* -* * -* Permission is hereby granted, free of charge, to any person obtaining * -* a copy of this software and associated documentation files (the * -* "Software"), to deal in the Software without restriction, including * -* without limitation the rights to use, copy, modify, merge, publish, * -* distribute, sublicense, and/or sell copies of the Software, and to * -* permit persons to whom the Software is furnished to do so, subject to * -* the following conditions: * -* * -* The above copyright notice and this permission notice shall be * -* included in all copies or substantial portions of the Software. * -* * -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * -* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * -* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.* -* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY * -* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, * -* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE * -* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * -************************************************************************* - diff --git a/community/luarocks/PKGBUILD b/community/luarocks/PKGBUILD index 70358f912..a050d0b6a 100644 --- a/community/luarocks/PKGBUILD +++ b/community/luarocks/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 38024 2011-01-20 16:03:49Z cbrannon $ +# $Id: PKGBUILD 56921 2011-10-16 23:25:18Z cbrannon $ # Maintainer: Chris Brannon <cmbrannon79@gmail.com> # Contributor: Geoffroy Carrier <geoffroy@archlinux.org> pkgname=luarocks -pkgver=2.0.4.1 +pkgver=2.0.6 pkgrel=1 pkgdesc='Deployment and management system for Lua modules' arch=('i686' 'x86_64' 'mips64el') @@ -11,12 +11,21 @@ url="http://luarocks.org/" depends=('lua' 'unzip' 'zip' 'curl') optdepends=('cvs: for fetching sources from CVS repositories' 'git: for fetching sources from git repositories' + 'mercurial: for fetching sources from mercurial repositories' + 'luasec: HTTPS support' 'cmake: for building rocks that use the cmake build system') license=('custom') -source=(http://luarocks.org/releases/$pkgname-$pkgver.tar.gz) +source=(http://luarocks.org/releases/$pkgname-$pkgver.tar.gz + packbinary.patch) build() { cd "$srcdir/$pkgname-$pkgver" + + ## The --pack-binary option to the "build" command is broken in the release, + # but it was fixed in upstream's git repo. The following patch goes + # away with the next release: + patch -p1 < "$srcdir/packbinary.patch" + # I added --with-downloader=curl, because luarocks already uses curl # for uploading. May as well use curl for downloading. ./configure --prefix=/usr --sysconfdir=/etc/luarocks --with-downloader=curl @@ -29,4 +38,5 @@ package() { install -D COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } -md5sums=('2c7caccce3cdf236e6f9aca7bec9bdea') +md5sums=('ad3eed4d579552aa91ea49c2bdbc2bb1' + 'f364b5a092a54559408df7431bc14746') diff --git a/community/luarocks/packbinary.patch b/community/luarocks/packbinary.patch new file mode 100644 index 000000000..59a46f6e1 --- /dev/null +++ b/community/luarocks/packbinary.patch @@ -0,0 +1,12 @@ +diff --git a/src/luarocks/build.lua b/src/luarocks/build.lua +index af098f3..3c7f440 100644 +--- a/src/luarocks/build.lua ++++ b/src/luarocks/build.lua +@@ -3,6 +3,7 @@ + -- Builds a rock, compiling its C parts if any. + module("luarocks.build", package.seeall) + ++local pack = require("luarocks.pack") + local path = require("luarocks.path") + local util = require("luarocks.util") + local rep = require("luarocks.rep") diff --git a/community/lxappearance/PKGBUILD b/community/lxappearance/PKGBUILD index 808c66d11..92b897bd2 100644 --- a/community/lxappearance/PKGBUILD +++ b/community/lxappearance/PKGBUILD @@ -1,4 +1,4 @@ -#$Id: PKGBUILD 53436 2011-08-03 17:25:08Z angvp $ +#$Id: PKGBUILD 56899 2011-10-16 07:36:44Z bpiotrowski $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> pkgname=lxappearance diff --git a/community/lxdm/PKGBUILD b/community/lxdm/PKGBUILD index 4384cc31d..553ae283b 100644 --- a/community/lxdm/PKGBUILD +++ b/community/lxdm/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 53431 2011-08-03 17:17:03Z angvp $ +# $Id: PKGBUILD 56900 2011-10-16 07:41:12Z bpiotrowski $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: kiefer <jorgelmadrid@gmail.com> diff --git a/community/lxtask/PKGBUILD b/community/lxtask/PKGBUILD index b3c9a2874..8fa1911f3 100644 --- a/community/lxtask/PKGBUILD +++ b/community/lxtask/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 53426 2011-08-03 17:15:52Z angvp $ +# $Id: PKGBUILD 56901 2011-10-16 07:43:53Z bpiotrowski $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> pkgname=lxtask diff --git a/community/madman/PKGBUILD b/community/madman/PKGBUILD index 766383199..2a6cc72c7 100644 --- a/community/madman/PKGBUILD +++ b/community/madman/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 33413 2010-11-24 16:03:47Z spupykin $ +# $Id: PKGBUILD 56740 2011-10-11 17:41:27Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Eric Belanger <belanger@astro.umontreal.ca> # Contributor: Hugo Ideler <hugoideler@dse.nl> @@ -6,19 +6,19 @@ pkgname=madman pkgver=0.94beta1.20060611 -pkgrel=1 +pkgrel=3 pkgdesc="I-tunes like music player" arch=('i686' 'x86_64' 'mips64el') url="http://madman.sourceforge.net/" license=('GPL') -depends=('qt3' 'xmms' 'libid3tag' 'gtk') -makedepends=('python') -source=(http://arch.pp.ru/~sergej/dl/madman_$pkgver.orig.tar.gz - http://arch.pp.ru/~sergej/dl/madman_$pkgver-2.diff.gz - madman.desktop - madman_logo.png - madman_logo_mini.png - madman_logo_large.png +depends=('qt3' 'xmms' 'gtk' 'taglib') +makedepends=('python2' 'scons') +source=(ftp://ftp.archlinux.org/other/community/madman/madman_$pkgver.orig.tar.gz + ftp://ftp.archlinux.org/other/community/madman/madman_$pkgver-2.diff.gz + ftp://ftp.archlinux.org/other/community/madman/madman.desktop + ftp://ftp.archlinux.org/other/community/madman/madman_logo.png + ftp://ftp.archlinux.org/other/community/madman/madman_logo_mini.png + ftp://ftp.archlinux.org/other/community/madman/madman_logo_large.png fake-g++.sh) md5sums=('36e7a4619ebe83ed939c7ae09c16d535' '26de942ae2465fb805748d3bea9a8a17' @@ -26,7 +26,7 @@ md5sums=('36e7a4619ebe83ed939c7ae09c16d535' 'd4546f77857a6ccdabb2036eb6a0da07' '2d54bb8eceed283edc88a3e4553d2483' '3c2da1b1800fb372e225ae38fa1398e8' - '6882bb5e67e6dea45e2f770d899514c5') + '685a6fb13c861b82950dd6a77fd02120') build() { . /etc/profile.d/qt3.sh @@ -41,19 +41,15 @@ build() { ,build/release/designer/tsonglistview.h \ ,build/release/designer/tsetlistview.h sed -i '26,1i#include <memory>' utility/base.h + sed -i 's|python|python2|' designer/make_imagedata httpd/make_webdata doc/update_format_tag cp $srcdir/fake-g++.sh ./g++ export PATH=.:$PATH - scons || return 1 - scons prefix=$pkgdir/usr install || return 1 + scons + scons install_to=$pkgdir/usr prefix=/usr install - rm $pkgdir/usr/bin/.sconsign - rm $pkgdir/usr/lib/madman/plugins/.sconsign - mkdir -p $pkgdir/usr/share/{applications,icons} - mkdir -p $pkgdir/usr/share/icons/{mini,large} - - cp $srcdir/madman_logo.png $pkgdir/usr/share/icons - cp $srcdir/madman_logo_mini.png $pkgdir/usr/share/icons/mini - cp $srcdir/madman_logo_large.png $pkgdir/usr/share/icons/large - cp $srcdir/madman.desktop $pkgdir/usr/share/applications + install -Dm644 $srcdir/madman_logo.png $pkgdir/usr/share/icons/madman_logo.png + install -Dm644 $srcdir/madman_logo_mini.png $pkgdir/usr/share/icons/mini/madman_logo_mini.png + install -Dm644 $srcdir/madman_logo_large.png $pkgdir/usr/share/icons/large/madman_logo_large.png + install -Dm644 $srcdir/madman.desktop $pkgdir/usr/share/applications/madman.desktop } diff --git a/community/madman/fake-g++.sh b/community/madman/fake-g++.sh index 17da66d5a..af424f5ca 100755 --- a/community/madman/fake-g++.sh +++ b/community/madman/fake-g++.sh @@ -1,7 +1,5 @@ #!/bin/sh -x Q=`echo "$*" | sed 's|- p t h r e a d|-pthread|'` - echo "$Q" | grep 'lmp4ff' && Q="$Q /usr/lib/libmp4ff.a" - -exec /bin/g++ $Q +exec /usr/bin/g++ $Q diff --git a/community/madman/madman.desktop b/community/madman/madman.desktop deleted file mode 100644 index c415a6ee5..000000000 --- a/community/madman/madman.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Name=Madman -Comment=Music Manager -Exec=madman -Icon=/usr/share/icons/madman_logo.png -Miniicon=/usr/share/icons/mini/madman_logo_mini.png -GenericName=Music Manager -Terminal=false -Type=Application -Categories=AudioVideo;Audio diff --git a/community/madman/madman_logo.png b/community/madman/madman_logo.png Binary files differdeleted file mode 100644 index 2128a45d2..000000000 --- a/community/madman/madman_logo.png +++ /dev/null diff --git a/community/madman/madman_logo_large.png b/community/madman/madman_logo_large.png Binary files differdeleted file mode 100644 index 4661b4f4f..000000000 --- a/community/madman/madman_logo_large.png +++ /dev/null diff --git a/community/madman/madman_logo_mini.png b/community/madman/madman_logo_mini.png Binary files differdeleted file mode 100644 index 5bf9f1083..000000000 --- a/community/madman/madman_logo_mini.png +++ /dev/null diff --git a/community/mc/PKGBUILD b/community/mc/PKGBUILD index d7801d8d3..9b7e46910 100644 --- a/community/mc/PKGBUILD +++ b/community/mc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 55445 2011-09-12 20:10:14Z schuay $ +# $Id: PKGBUILD 56569 2011-10-08 17:55:12Z schuay $ # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Maintainer: schuay <jakob.gruber@gmail.com> pkgname=mc -pkgver=4.7.5.4 +pkgver=4.7.5.5 pkgrel=1 pkgdesc="Midnight Commander is a text based filemanager/shell that emulates Norton Commander" arch=('i686' 'x86_64' 'mips64el') @@ -30,8 +30,8 @@ conflicts=('mc-utf8') replaces=('mc-utf8') options=('!emptydirs' '!makeflags') source=("http://www.midnight-commander.org/downloads/${pkgname}-${pkgver}.tar.bz2") -md5sums=('1e53e27fb3bed21c9042689d5777b5aa') -sha1sums=('5deefd15a13782605fa92c0beb635c0664b913cf') +md5sums=('ef1582651115ca8aa52f8d11e99f7da3') +sha1sums=('be428f4c5f0cb180277eed7387e29e69c042aadc') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/mcdp/PKGBUILD b/community/mcdp/PKGBUILD index b7032a942..961480e9c 100644 --- a/community/mcdp/PKGBUILD +++ b/community/mcdp/PKGBUILD @@ -1,22 +1,28 @@ -# $Id: PKGBUILD 5260 2009-11-07 12:48:21Z ibiru $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Tino Reichardt <milky-archlinux@mcmilk.de> +# $Id: PKGBUILD 56613 2011-10-09 07:12:22Z jlichtblau $ +# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> +# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Tino Reichardt <milky-archlinux@mcmilk.de> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=mcdp -pkgver=0.4a -pkgrel=3 -pkgdesc="small console cd player" +pkgver=0.4b +pkgrel=1 +pkgdesc="Small console cd player" arch=('i686' 'x86_64' 'mips64el') url="http://www.mcmilk.de/projects/mcdp/" -license=("GPL") +license=('GPL') makedepends=('dietlibc') -source=(http://www.mcmilk.de/projects/mcdp/dl/$pkgname-$pkgver.tar.bz2) -md5sums=('d52c32df83161b46f451018aeddad0ed') +source=(http://www.mcmilk.de/projects/$pkgname/dl/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('0faa031b07299b0fb2353306a669328c877717e1bc7e274e40c3d2612e103cab') build() { - cd $startdir/src/$pkgname-$pkgver - make mcdp - mkdir -p $startdir/pkg/usr/bin $startdir/pkg/usr/share/man/man1 - cp mcdp $startdir/pkg/usr/bin - cp mcdp.1 $startdir/pkg/usr/share/man/man1 + cd ${srcdir}/${pkgname}-${pkgver} + make $pkgname +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + + install -Dm755 $pkgname ${pkgdir}/usr/bin/$pkgname + install -Dm644 $pkgname.1 ${pkgdir}/usr/share/man/man1/$pkgname.1 } diff --git a/community/mediaproxy/PKGBUILD b/community/mediaproxy/PKGBUILD index 8d53771db..c339165b5 100644 --- a/community/mediaproxy/PKGBUILD +++ b/community/mediaproxy/PKGBUILD @@ -1,19 +1,20 @@ -# $Id: PKGBUILD 33418 2010-11-24 16:05:40Z spupykin $ +# $Id: PKGBUILD 56530 2011-10-07 21:31:08Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Colin Pitrat <colin.pitrat@gmail.com> pkgname=mediaproxy -pkgver=2.4.4 +pkgver=2.5.2 pkgrel=1 pkgdesc="Open-source media proxy for OpenSER" url="http://mediaproxy.ag-projects.com/" arch=('i686' 'x86_64' 'mips64el') license=('GPL') -depends=('python2' 'libnetfilter_conntrack' 'python-application' 'python-cjson' 'python-gnutls') +depends=('python2' 'libnetfilter_conntrack' 'iptables' + 'python-application' 'python-cjson' 'python-gnutls') backup=('opt/mediaproxy/config.ini') source=("http://download.ag-projects.com/MediaProxy/mediaproxy-$pkgver.tar.gz" "mediaproxy.init") -md5sums=('4ae842662702ddd4a5a9db263d261693' +md5sums=('840de8f52e656991be728c15ec30bb5e' '64042f4686de69a9bdd27d51cbe8a548') build() diff --git a/community/mingw32-gcc-base/PKGBUILD b/community/mingw32-gcc-base/PKGBUILD index c25c58f3c..e962d9b25 100644 --- a/community/mingw32-gcc-base/PKGBUILD +++ b/community/mingw32-gcc-base/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 56196 2011-10-03 10:57:31Z spupykin $ +# $Id: PKGBUILD 56384 2011-10-07 07:19:05Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Ondrej Jirman <megous@megous.com> @@ -8,7 +8,7 @@ _w32apiver=3.17 _runtimever=3.20 _uprel=2 _upw32rel=1 -pkgrel=1 +pkgrel=2 arch=(i686 x86_64 'mips64el') pkgdesc="A C cross-compiler for building Windows executables on Linux" depends=(mingw32-binutils) @@ -18,11 +18,13 @@ options=(!strip) license=(GPL LGPL) url="http://mingw.sf.net" source=(gcc-$pkgver-${_uprel}-mingw32-src.tar.lzma::http://downloads.sourceforge.net/project/mingw/MinGW/BaseSystem/GCC/Version4/gcc-$pkgver-${_uprel}/gcc-$pkgver-${_uprel}-mingw32-src.tar.lzma - http://downloads.sourceforge.net/project/mingw/MinGW/BaseSystem/RuntimeLibrary/Win32-API/w32api-${_w32apiver}/w32api-${_w32apiver}-${_upw32rel}-mingw32-src.tar.lzma - http://downloads.sourceforge.net/project/mingw/MinGW/BaseSystem/RuntimeLibrary/MinGW-RT/mingwrt-${_runtimever}/mingwrt-${_runtimever}-mingw32-src.tar.gz) + http://downloads.sourceforge.net/project/mingw/MinGW/BaseSystem/RuntimeLibrary/Win32-API/w32api-${_w32apiver}/w32api-${_w32apiver}-${_upw32rel}-mingw32-src.tar.lzma + http://downloads.sourceforge.net/project/mingw/MinGW/BaseSystem/RuntimeLibrary/MinGW-RT/mingwrt-${_runtimever}/mingwrt-${_runtimever}-mingw32-src.tar.gz + gcc-1-mingw-float.patch) md5sums=('f8b09b7e51223e1ae1c1e466af3ac82e' '89e5800096aa334009f98e7c1743d825' - '26c0886cc60729b94956cc6d81cd076c') + '26c0886cc60729b94956cc6d81cd076c' + '2407123c35c0aa92ee5ffc27decca9a7') build() { @@ -39,6 +41,8 @@ build() cd $srcdir tar xjf gcc-$pkgver-${_uprel}-mingw32-src/gcc-$pkgver.tar.bz2 + patch -d $srcdir/gcc-$pkgver -Np1 < $srcdir/gcc-1-mingw-float.patch + mkdir -p $srcdir/build cd $srcdir/build diff --git a/community/mingw32-gcc-base/gcc-1-mingw-float.patch b/community/mingw32-gcc-base/gcc-1-mingw-float.patch new file mode 100644 index 000000000..365949ad7 --- /dev/null +++ b/community/mingw32-gcc-base/gcc-1-mingw-float.patch @@ -0,0 +1,18 @@ +This file is part of mingw-cross-env. +See doc/index.html for further information. + +This patch has been taken from: +http://gcc.gnu.org/ml/gcc-patches/2010-06/msg00387.html +http://sourceforge.net/tracker/?func=detail&atid=302435&aid=3011968&group_id=2435 + +diff -urN a/gcc/ginclude/float.h b/gcc/ginclude/float.h +--- a/gcc/ginclude/float.h 2009-04-09 17:00:19.000000000 +0200 ++++ b/gcc/ginclude/float.h 2010-06-05 12:03:41.887724045 +0200 +@@ -275,3 +275,7 @@ + #endif /* __STDC_WANT_DEC_FP__ */ + + #endif /* _FLOAT_H___ */ ++ ++#ifdef __MINGW32__ ++#include_next<float.h> ++#endif diff --git a/community/mingw32-gcc/PKGBUILD b/community/mingw32-gcc/PKGBUILD index 987626089..3cb0db859 100644 --- a/community/mingw32-gcc/PKGBUILD +++ b/community/mingw32-gcc/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 56194 2011-10-03 10:55:24Z spupykin $ +# $Id: PKGBUILD 56382 2011-10-07 07:18:59Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Ondrej Jirman <megous@megous.com> pkgname=mingw32-gcc pkgver=4.6.1 -pkgrel=1 +pkgrel=2 _uprel=2 arch=(i686 x86_64 mips64el) pkgdesc="A C and C++ cross-compilers for building Windows executables on Linux" @@ -15,13 +15,17 @@ provides=('mingw32-gcc-base') options=(!strip) url="http://sourceforge.net/projects/mingw/files/MinGW/BaseSystem/GCC/Version4/" license=(GPL LGPL) -source=(gcc-$pkgver-${_uprel}-mingw32-src.tar.lzma::http://downloads.sourceforge.net/project/mingw/MinGW/BaseSystem/GCC/Version4/gcc-$pkgver-1/gcc-$pkgver-${_uprel}-mingw32-src.tar.lzma) -md5sums=('f8b09b7e51223e1ae1c1e466af3ac82e') +source=(gcc-$pkgver-${_uprel}-mingw32-src.tar.lzma::http://downloads.sourceforge.net/project/mingw/MinGW/BaseSystem/GCC/Version4/gcc-$pkgver-${_uprel}/gcc-$pkgver-${_uprel}-mingw32-src.tar.lzma + gcc-1-mingw-float.patch) +md5sums=('f8b09b7e51223e1ae1c1e466af3ac82e' + '2407123c35c0aa92ee5ffc27decca9a7') build() { [ $NOEXTRACT -eq 1 ] || tar xjf gcc-$pkgver-${_uprel}-mingw32-src/gcc-$pkgver.tar.bz2 + patch -d $srcdir/gcc-$pkgver -Np1 < $srcdir/gcc-1-mingw-float.patch + mkdir -p $srcdir/build cd $srcdir/build diff --git a/community/mingw32-gcc/gcc-1-mingw-float.patch b/community/mingw32-gcc/gcc-1-mingw-float.patch new file mode 100644 index 000000000..365949ad7 --- /dev/null +++ b/community/mingw32-gcc/gcc-1-mingw-float.patch @@ -0,0 +1,18 @@ +This file is part of mingw-cross-env. +See doc/index.html for further information. + +This patch has been taken from: +http://gcc.gnu.org/ml/gcc-patches/2010-06/msg00387.html +http://sourceforge.net/tracker/?func=detail&atid=302435&aid=3011968&group_id=2435 + +diff -urN a/gcc/ginclude/float.h b/gcc/ginclude/float.h +--- a/gcc/ginclude/float.h 2009-04-09 17:00:19.000000000 +0200 ++++ b/gcc/ginclude/float.h 2010-06-05 12:03:41.887724045 +0200 +@@ -275,3 +275,7 @@ + #endif /* __STDC_WANT_DEC_FP__ */ + + #endif /* _FLOAT_H___ */ ++ ++#ifdef __MINGW32__ ++#include_next<float.h> ++#endif diff --git a/community/mingw32-runtime/PKGBUILD b/community/mingw32-runtime/PKGBUILD deleted file mode 100644 index 8ed0c0ffa..000000000 --- a/community/mingw32-runtime/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 39755 2011-02-15 23:16:01Z svenstaro $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Ondrej Jirman <megous@megous.com> - -pkgname=mingw32-runtime -pkgver=3.18 -pkgrel=3 -arch=(i686 x86_64 'mips64el') -pkgdesc="mingw32 run-time library" -makedepends=(mingw32-w32api mingw32-gcc) -options=(!strip) -license=(LGPL) -url="http://www.mingw.org/" -source=(http://downloads.sourceforge.net/mingw/mingwrt-$pkgver-mingw32-src.tar.gz) -md5sums=('34b54cb3379f871f0dcd5c20b69b0350') - -build() -{ - cd $srcdir/mingwrt-$pkgver-mingw32 - - sed -i "s%\r%%g" `find . -type f` - sed -i -e "s%^W32API_INCLUDE=.*%W32API_INCLUDE=-I/usr/i486-mingw32/include%" `find -type f -name 'configure'` - - export CFLAGS="-mms-bitfields" - - ./configure \ - --prefix=/usr/i486-mingw32 \ - --target=i486-mingw32 \ - --host=i486-mingw32 \ - --build=$CHOST - - make - mkdir -p $pkgdir/usr/i486-mingw32/bin - make install prefix=$pkgdir/usr/i486-mingw32 - - cd $pkgdir - rm -rf usr/i486-mingw32/{doc,man} - find . -name '*.a' | xargs -rtl1 i486-mingw32-strip -g -} diff --git a/community/monit/PKGBUILD b/community/monit/PKGBUILD index e42aac786..75e53a90c 100644 --- a/community/monit/PKGBUILD +++ b/community/monit/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 52027 2011-07-19 19:44:05Z jlichtblau $ +# $Id: PKGBUILD 56616 2011-10-09 07:21:54Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org> # Contributor: Marco Bartholomew <marco@marcobartholomew.com> pkgname=monit -pkgver=5.2.5 +pkgver=5.3 pkgrel=1 pkgdesc="Utility for managing and monitoring, processes, files, directories and devices on a *NIX system" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ backup=('etc/monitrc') changelog=$pkgname.changelog source=(http://mmonit.com/$pkgname/dist/$pkgname-$pkgver.tar.gz \ monitd) -sha256sums=('3c2496e9f653ff8a46b75b61126a86cb3861ad35e4eeb7379d64a0fc55c1fd8d' +sha256sums=('a336d275ac8176c6cdf50f971d2e42325e74af713ae77afa9f005a29db06981e' 'b235b2fdeec49015d6b74f028d161b289663692f9ee2d2d78cf52d8db87ca496') build() { diff --git a/community/monit/monit.changelog b/community/monit/monit.changelog index 0a0d6d223..d9ffcfafe 100644 --- a/community/monit/monit.changelog +++ b/community/monit/monit.changelog @@ -1,3 +1,6 @@ +2011-10-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * monit 5.3-1 + 2011-07-19 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * monit 5.2.5-1 diff --git a/community/mplayer2/PKGBUILD b/community/mplayer2/PKGBUILD index 054faa0c4..9500dd9f4 100644 --- a/community/mplayer2/PKGBUILD +++ b/community/mplayer2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 56005 2011-09-28 18:33:51Z stephane $ +# $Id: PKGBUILD 56845 2011-10-14 19:26:53Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Bartek Piotrowski <barthalion@gmail.com> pkgname=mplayer2 pkgver=2.0 -pkgrel=14 +pkgrel=15 pkgdesc="A movie player" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -17,9 +17,11 @@ backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf') provides=('mplayer') conflicts=('mplayer') source=(http://ftp.mplayer2.org/pub/release/${pkgname}-${pkgver/_/-}.tar.xz - mplayer2-remove-mp3lib.patch) + mplayer2-remove-mp3lib.patch + mplayer2-SAMI-subs.patch) sha1sums=('0df8d4e5484128b7b28029273b7704ab5d5419bc' - 'c55128a99406a5e01ab077555b7b24aa7b54110c') + 'c55128a99406a5e01ab077555b7b24aa7b54110c' + '4059d5d0564004feb55d25b5f62f7f4672e40fb1') options=('!emptydirs') build() { @@ -33,6 +35,11 @@ build() { rm -fr mp3lib patch -Np1 -i ../mplayer2-remove-mp3lib.patch + # SAMI subtitle parsing buffer overflow + # http://mplayerhq.hu/pipermail/mplayer-cvslog/2011-May/042075.html + # http://labs.mwrinfosecurity.com/files/Advisories/mwri_mplayer-sami-subtitles_2011-08-12.pdf + patch -Np1 -i ../mplayer2-SAMI-subs.patch + if [ "$CARCH" = "mips64el" ]; then ./configure --prefix=/usr \ --disable-arts \ diff --git a/community/mplayer2/mplayer2-SAMI-subs.patch b/community/mplayer2/mplayer2-SAMI-subs.patch new file mode 100644 index 000000000..8238167e2 --- /dev/null +++ b/community/mplayer2/mplayer2-SAMI-subs.patch @@ -0,0 +1,12 @@ +diff -Naur mplayer2-2.0.ori/sub/subreader.c mplayer2-2.0/sub/subreader.c +--- mplayer2-2.0.ori/sub/subreader.c 2011-03-24 17:40:29.000000000 -0400 ++++ mplayer2-2.0/sub/subreader.c 2011-10-14 15:04:47.196477670 -0400 +@@ -179,6 +179,8 @@ + break; + + case 3: /* get all text until '<' appears */ ++ if (p - text >= LINE_LEN) ++ sami_add_line(current, text, &p); + if (*s == '\0') break; + else if (!strncasecmp (s, "<br>", 4)) { + sami_add_line(current, text, &p); diff --git a/community/musepack-tools/ChangeLog b/community/musepack-tools/ChangeLog deleted file mode 100644 index a02319ee1..000000000 --- a/community/musepack-tools/ChangeLog +++ /dev/null @@ -1,9 +0,0 @@ -2010-02-04 Corrado Primier <bardo@aur.archlinux.org> - - * ChangeLog: added - - * PKGBUILD: removed unnecessary esd dependency; added libcuefile and - libreplaygain dependencies; rewritten build function to usa cmake; added - cmake makedepend - - * math.patch: added diff --git a/community/musepack-tools/PKGBUILD b/community/musepack-tools/PKGBUILD index 5e976394a..21c8bf360 100644 --- a/community/musepack-tools/PKGBUILD +++ b/community/musepack-tools/PKGBUILD @@ -1,32 +1,41 @@ -# $Id: PKGBUILD 11191 2010-02-06 17:49:24Z dgriffiths $ -# Maintainer: Corrado Primier <bardo@aur.archlinux.org> +# $Id: PKGBUILD 56848 2011-10-14 21:03:20Z schiv $ +# Maintainer: +# Contributor: Corrado Primier <bardo@aur.archlinux.org> # Contributor: Eric Belanger <belanger@astro.umontreal.ca> pkgname=musepack-tools -pkgver=435 -pkgrel=2 +pkgver=475 +pkgrel=1 pkgdesc="Musepack decoder/encoder" arch=('i686' 'x86_64' 'mips64el') url="http://www.musepack.net/" license=('LGPL') depends=('libcuefile' 'libreplaygain') makedepends=('cmake') -source=(http://files.musepack.net/source/musepack_src_r${pkgver}.tar.gz math.patch) -md5sums=('0e858972978fe480fd1400b7331061de' 'f9d51d2d7ba46fbdc4d038596871f9e0') +source=("http://files.musepack.net/source/musepack_src_r$pkgver.tar.gz" + "math.patch") +md5sums=('754d67be67f713e54baf70fcfdb2817e' + '9de31f07a3492c7b1db1248b055fbdc8') build() { - export LDFLAGS="${LDFLAGS} -lm" - cd ${srcdir}/musepack_src_r${pkgver} + cd "$srcdir/musepack_src_r$pkgver" - patch -Np0 -i ${srcdir}/math.patch || return 1 + #export LDFLAGS+="-lm" - mkdir build - cd build - cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_SKIP_RPATH=ON .. || return 1 - make DESTDIR="${pkgdir}" install || return 1 + patch -Np1 -i "$srcdir/math.patch" + + cmake . -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_SKIP_RPATH=ON +} + +package() { + cd "$srcdir/musepack_src_r$pkgver" + + make DESTDIR="$pkgdir" install for bin in chap cut dec enc gain 2sv8; do - install -Dm755 ${srcdir}/musepack_src_r${pkgver}/build/mpc${bin}/mpc${bin} \ - ${pkgdir}/usr/bin/mpc${bin} + install -Dm755 mpc$bin/mpc$bin "$pkgdir/usr/bin/mpc$bin" done } + +# vim:set ts=2 sw=2 et: diff --git a/community/musepack-tools/math.patch b/community/musepack-tools/math.patch index 11588cbbf..61b3d07ec 100644 --- a/community/musepack-tools/math.patch +++ b/community/musepack-tools/math.patch @@ -1,22 +1,12 @@ ---- include/mpc/mpcmath.h.orig 2009-07-25 16:49:10.000000000 +0300 -+++ include/mpc/mpcmath.h 2009-07-31 15:33:45.000000000 +0300 -@@ -16,6 +16,8 @@ - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -+#include <math.h> -+ - #include <mpc/mpc_types.h> - - typedef union mpc_floatint ---- CMakeLists.txt.orig 2008-03-29 20:23:23.000000000 +0100 -+++ CMakeLists.txt 2010-02-04 12:31:27.498930581 +0100 -@@ -9,7 +9,7 @@ +diff -aur musepack_src_r475.old/CMakeLists.txt musepack_src_r475/CMakeLists.txt +--- musepack_src_r475.old/CMakeLists.txt 2011-10-14 16:31:05.536450109 +0800 ++++ musepack_src_r475/CMakeLists.txt 2011-10-14 16:31:34.022962450 +0800 +@@ -16,7 +16,7 @@ add_definitions(-DFAST_MATH -DCVD_FASTLOG) if(NOT MSVC) --set(CMAKE_C_FLAGS "-O3 -fomit-frame-pointer -pipe") -+set(CMAKE_C_FLAGS "-O3 -fomit-frame-pointer -pipe -lm") +- set(CMAKE_C_FLAGS "-O3 -Wall -fomit-frame-pointer -pipe") ++ set(CMAKE_C_FLAGS "-O3 -Wall -fomit-frame-pointer -pipe -lm") endif(NOT MSVC) add_subdirectory(libmpcdec) diff --git a/community/myodbc/PKGBUILD b/community/myodbc/PKGBUILD index 54d8ac4d5..d6716bf70 100644 --- a/community/myodbc/PKGBUILD +++ b/community/myodbc/PKGBUILD @@ -1,31 +1,24 @@ -# $Id: PKGBUILD 51657 2011-07-12 14:22:18Z spupykin $ +# $Id: PKGBUILD 56720 2011-10-11 09:17:30Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=myodbc -pkgver=5.1.8 -pkgrel=2 +pkgver=5.1.9 +pkgrel=1 pkgdesc="ODBC driver/connector for MySQL" arch=(i686 x86_64 'mips64el') url="http://dev.mysql.com/downloads/connector/odbc/" depends=('unixodbc' 'libmysqlclient') license=('GPL') +options=('libtool') source=("http://mysql.cce.usp.br/Downloads/Connector-ODBC/5.1/mysql-connector-odbc-${pkgver}.tar.gz" - myodbc-64bit.patch - myodbc-add-mysys.patch - myodbc-my-free.patch - myodbc-shutdown.patch) -md5sums=('c64d8cec9de453bdf48fcb168643b943' - '142a985fa0d3273df04399148ef27533' - '8d019f9b6a10a6a56d835e7e4e22d215' - '2d1636160af606323014b112c9481cf2' - 'ec43ad7b5c887a7de4b6024899ff886c') + myconf.h.in) +md5sums=('80f146bd384a9011d968aa67df27e68e' + '6c99c83e309b18d15ef0f07f0b461241') build() { cd $srcdir/mysql-connector-odbc-${pkgver} - [ $NOEXTRACT -eq 1 ] || patch -p1 <$srcdir/myodbc-64bit.patch - [ $NOEXTRACT -eq 1 ] || patch -p1 <$srcdir/myodbc-add-mysys.patch - [ $NOEXTRACT -eq 1 ] || patch -p1 <$srcdir/myodbc-my-free.patch - [ $NOEXTRACT -eq 1 ] || patch -p1 <$srcdir/myodbc-shutdown.patch + cp $srcdir/myconf.h.in driver/myconf.h.in + [ -x configure ] || { aclocal; libtoolize; automake --add-missing; autoreconf; } [ -f Makefile ] || CFLAGS="$CFLAGS -DTHREAD" \ ./configure --prefix=/usr --sysconfdir=/etc --with-unixODBC=/usr --with-odbc-ini=/etc/odbc.ini \ --with-mysql-path=/usr --without-x --disable-gui --disable-test diff --git a/community/myodbc/myconf.h.in b/community/myodbc/myconf.h.in new file mode 100644 index 000000000..2a04eebba --- /dev/null +++ b/community/myodbc/myconf.h.in @@ -0,0 +1,165 @@ +/* driver/myconf.h.in. Generated from configure.in by autoheader. */ + +/* Define to 1 if you have the <dlfcn.h> header file. */ +#undef HAVE_DLFCN_H + +/* Define to 1 if you have the <inttypes.h> header file. */ +#undef HAVE_INTTYPES_H + +/* Define to 1 if you have the <iodbcinst.h> header file. */ +#undef HAVE_IODBCINST_H + +/* Define to 1 if you have the <isqlext.h> header file. */ +#undef HAVE_ISQLEXT_H + +/* Define to 1 if you have the <isqltypes.h> header file. */ +#undef HAVE_ISQLTYPES_H + +/* Define to 1 if you have the <isql.h> header file. */ +#undef HAVE_ISQL_H + +/* Define to 1 if you have the `z' library (-lz). */ +#undef HAVE_LIBZ + +/* Define to 1 if you have the `localtime_r' function. */ +#undef HAVE_LOCALTIME_R + +/* Define to 1 if you have the <memory.h> header file. */ +#undef HAVE_MEMORY_H + +/* Define to 1 if you have the <odbcinst.h> header file. */ +#undef HAVE_ODBCINST_H + +/* Define to 1 if you have the <sqlext.h> header file. */ +#undef HAVE_SQLEXT_H + +/* Define if SQLGetPrivateProfileString is defined */ +#undef HAVE_SQLGETPRIVATEPROFILESTRING + +/* Define to 1 if you have the `SQLGetPrivateProfileStringW' function. */ +#undef HAVE_SQLGETPRIVATEPROFILESTRINGW + +/* Define to 1 if you have the <sqltypes.h> header file. */ +#undef HAVE_SQLTYPES_H + +/* Define to 1 if you have the <sql.h> header file. */ +#undef HAVE_SQL_H + +/* Define to 1 if you have the <stdint.h> header file. */ +#undef HAVE_STDINT_H + +/* Define to 1 if you have the <stdlib.h> header file. */ +#undef HAVE_STDLIB_H + +/* Define to 1 if you have the <strings.h> header file. */ +#undef HAVE_STRINGS_H + +/* Define to 1 if you have the <string.h> header file. */ +#undef HAVE_STRING_H + +/* Define to 1 if you have the `strndup' function. */ +#undef HAVE_STRNDUP + +/* Define to 1 if you have the <sys/stat.h> header file. */ +#undef HAVE_SYS_STAT_H + +/* Define to 1 if you have the <sys/types.h> header file. */ +#undef HAVE_SYS_TYPES_H + +/* Define to 1 if you have the <unistd.h> header file. */ +#undef HAVE_UNISTD_H + +/* Define to the sub-directory in which libtool stores uninstalled libraries. + */ +#undef LT_OBJDIR + +/* Name of package */ +#undef PACKAGE + +/* Define to the address where bug reports for this package should be sent. */ +#undef PACKAGE_BUGREPORT + +/* Define to the full name of this package. */ +#undef PACKAGE_NAME + +/* Define to the full name and version of this package. */ +#undef PACKAGE_STRING + +/* Define to the one symbol short name of this package. */ +#undef PACKAGE_TARNAME + +/* Define to the version of this package. */ +#undef PACKAGE_VERSION + +/* Define if SQLCHAR is undefined */ +#undef SQLCHAR + +/* Define if SQLHDBC is undefined */ +#undef SQLHDBC + +/* Define if SQLHENV is undefined */ +#undef SQLHENV + +/* Define if SQLHSTMT is undefined */ +#undef SQLHSTMT + +/* Define if SQLHWND is undefined */ +#undef SQLHWND + +/* Define if SQLINTEGER is undefined */ +#undef SQLINTEGER + +/* Define if SQLPOINTER is undefined */ +#undef SQLPOINTER + +/* Define if SQLRETURN is undefined */ +#undef SQLRETURN + +/* Define if SQLSMALLINT is undefined */ +#undef SQLSMALLINT + +/* Define if SQLUINTEGER is undefined */ +#undef SQLUINTEGER + +/* Define if SQLUSMALLINT is undefined */ +#undef SQLUSMALLINT + +/* Define to 1 if you have the ANSI C header files. */ +#undef STDC_HEADERS + +/* Define path to system ODBC.INI file */ +#undef SYSTEM_ODBC_INI + +/* Define if compiler defines C99 __func__ macro */ +#undef USE_C99_FUNC_MACRO + +/* Define if compiler defines __FUNCTION__ */ +#undef USE_GNU_FUNC_MACRO + +/* use iODBC */ +#undef USE_IODBC + +/* Define if SQLColAttribute() last arg is compatible with SQLLEN* */ +#undef USE_SQLCOLATTRIBUTE_SQLLEN_PTR + +/* Define if SQLColAttribute() last arg is compatible with SQLPOINTER */ +#undef USE_SQLCOLATTRIBUTE_SQLPOINTER + +/* Define if SQLParamOptions() 2nd and 3rd arg is compatible with SQLUINTEGER + */ +#undef USE_SQLPARAMOPTIONS_SQLUINTEGER_PTR + +/* Define if SQLParamOptions() 2nd and 3rd arg is compatible with SQLULEN */ +#undef USE_SQLPARAMOPTIONS_SQLULEN_PTR + +/* use unixODBC */ +#undef USE_UNIXODBC + +/* Version number of package */ +#undef VERSION + +/* Define to 1 if the X Window System is missing or not being used. */ +#undef X_DISPLAY_MISSING + +/* Define if we are using unix build environment */ +#undef _UNIX_ diff --git a/community/mysql-workbench/PKGBUILD b/community/mysql-workbench/PKGBUILD index 8310c6382..73dd0a9f3 100644 --- a/community/mysql-workbench/PKGBUILD +++ b/community/mysql-workbench/PKGBUILD @@ -1,23 +1,23 @@ -# $Id: PKGBUILD 49744 2011-06-20 20:11:17Z ibiru $ +# $Id: PKGBUILD 56797 2011-10-12 23:37:11Z ibiru $ # Maintainer: # Contributor : Ionut Biru <ibiru@archlinux.org> # Contributor: totoloco <totoloco at gmail _dot_com> pkgname=mysql-workbench epoch=1 -pkgver=5.2.34 -pkgrel=2 +pkgver=5.2.35 +pkgrel=1 pkgdesc="A cross-platform, visual database design tool developed by MySQL" arch=('i686' 'x86_64' 'mips64el') url="http://wb.mysql.com/" license=('GPL2') depends=('libzip' 'libmysqlclient' 'lua' 'gtkmm' 'libgl' 'libsigc++' 'python-paramiko' 'python-pexpect' 'libgnome-keyring') -makedepends=('boost' 'curl' 'mesa') +makedepends=('boost' 'curl' 'mesa' 'python-sphinx') options=('!libtool') source=(ftp://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQLGUITools/${pkgname}-gpl-${pkgver}-src.tar.gz ArchLinux.xml arch.patch python27.patch gcc46.patch) -md5sums=('781a4e9f6b5573b06a838d53ddb9136d' +md5sums=('e8b158d2ba0413f5659cda7da9cec63e' 'c2f986cd5737413d020c55db32713c48' '23430d24400fd65c9fd872bd8e2411e5' '47bc4cdfaa035a0132392e94c462ebf7' @@ -38,17 +38,32 @@ build() { rm -rf ext/boost rm -rf ext/libsigc++ - export CPPFLAGS=$(pkg-config --cflags sigc++-2.0) - export CXXFLAGS="$CXXFLAGS -fpermissive" - ./autogen.sh --prefix=/usr --disable-debug --disable-static make + + pushd ext/mysql-utilities + python2 setup.py build + popd + + pushd ext/connector-python + python2 setup.py build + popd } package() { cd "${srcdir}/${pkgname}-gpl-${pkgver}-src" make DESTDIR="${pkgdir}" install - sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" $pkgdir/usr/share/mysql-workbench/sshtunnel.py - sed -i -e "s|python|python2|" $pkgdir/usr/lib/mysql-workbench/modules/wb_utils_grt.py + + pushd ext/mysql-utilities + python2 setup.py install --skip-profile --root $pkgdir --prefix=/usr --optimize=1 + popd + + pushd ext/connector-python + python2 setup.py install --root $pkgdir --prefix=/usr --optimize=1 + + sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \ + -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \ + -e "s|#![ ]*/bin/env python$|#!/usr/bin/env python2|" \ + $(find ${pkgdir} -name '*.py') } diff --git a/community/namazu/PKGBUILD b/community/namazu/PKGBUILD index 3498ffd3d..2ac8903a7 100644 --- a/community/namazu/PKGBUILD +++ b/community/namazu/PKGBUILD @@ -1,16 +1,18 @@ +# $Id: PKGBUILD 56480 2011-10-07 10:10:22Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Benjamin Andresen <bandresen gmail com> pkgname=namazu -pkgver=2.0.20 -pkgrel=3 +pkgver=2.0.21 +pkgrel=1 pkgdesc="Namazu is a full-text search engine intended for easy use." url="http://namazu.org/" license=('GPL') arch=('i686' 'x86_64' 'mips64el') depends=(perl-file-mmagic) -source=(http://namazu.org/stable/$pkgname-$pkgver.tar.gz) options=(!libtool) -md5sums=('ecac296bfe7d4df01a097a13e34023c6') +source=(http://namazu.org/stable/$pkgname-$pkgver.tar.gz) +md5sums=('8865d912a3de9c94f5ce01d0de5ccad9') build() { cd $srcdir/$pkgname-$pkgver @@ -21,6 +23,6 @@ build() { --mandir=/usr/share/man \ --libexecdir=/usr/lib/namazu \ --libdir=/usr/lib/namazu - make || return 1 + make make DESTDIR=$pkgdir install } diff --git a/community/ncmpcpp/PKGBUILD b/community/ncmpcpp/PKGBUILD index 40ffbb985..e900a2bbc 100644 --- a/community/ncmpcpp/PKGBUILD +++ b/community/ncmpcpp/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 45584 2011-04-24 17:56:50Z mherych $ +# $Id: PKGBUILD 56902 2011-10-16 07:46:55Z bpiotrowski $ # Maintainer: Mateusz Herych <heniekk@gmail.com> # Contributor: Army <uli[dot]armbruster[at]gmail[dot]com> pkgname=ncmpcpp -pkgver=0.5.7 +pkgver=0.5.8 pkgrel=1 pkgdesc="An almost exact clone of ncmpc with some new features." arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('GPL') depends=('curl' 'libmpdclient' 'taglib' 'ncurses') install=ncmpcpp.install source=(http://unkart.ovh.org/ncmpcpp/${pkgname}-${pkgver}.tar.bz2) -md5sums=('6632c76f2f0836c5aa5a1a2fbb1c921c') +md5sums=('288952c6b4cf4fa3683f3f83a58da37c') build() { cd "$srcdir/${pkgname}-${pkgver}" diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD index 2d692e416..d3502a637 100644 --- a/community/nginx/PKGBUILD +++ b/community/nginx/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 56187 2011-10-03 07:27:47Z spupykin $ +# $Id: PKGBUILD 56357 2011-10-06 09:08:20Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Miroslaw Szot <mss@czlug.icis.pcz.pl> @@ -12,7 +12,7 @@ _group=http pkgname=nginx pkgver=1.0.8 -pkgrel=1 +pkgrel=2 pkgdesc="lightweight HTTP server and IMAP/POP3 proxy server" arch=('i686' 'x86_64' 'mips64el') depends=('pcre' 'zlib' 'openssl') @@ -55,7 +55,9 @@ build() { --with-http_dav_module \ --with-http_gzip_static_module \ --with-ipv6 \ - --add-module=/usr/lib/passenger/ext/nginx + --add-module=/usr/lib/passenger/ext/nginx \ + --http-scgi-temp-path=${_tmp_path} \ + --http-uwsgi-temp-path=${_tmp_path} #--with-http_mp4_module \ #--with-http_realip_module \ #--with-http_addition_module \ diff --git a/community/ngircd/PKGBUILD b/community/ngircd/PKGBUILD index 64123e350..d2079fd86 100644 --- a/community/ngircd/PKGBUILD +++ b/community/ngircd/PKGBUILD @@ -1,7 +1,8 @@ -# $Id: PKGBUILD 40090 2011-02-20 00:03:13Z mherych $ +# $Id: PKGBUILD 56891 2011-10-16 05:54:18Z bpiotrowski $ # Maintainer: Mateusz Herych <heniekk@gmail.com> + pkgname=ngircd -pkgver=17.1 +pkgver=18 pkgrel=1 pkgdesc="Next Generation IRC Daemon" arch=('i686' 'x86_64' 'mips64el') @@ -9,12 +10,12 @@ backup=(etc/ngircd.conf) url="http://ngircd.barton.de/" license=('GPL') depends=('openssl' 'libident') -source=(ftp://ftp.berlios.de/pub/ngircd/ngircd-$pkgver.tar.gz ngircd.sh) -md5sums=('b4ad0b1f18875ff3f2e92f076e64496b' - '6d2e9f1bbb4a3a7349da0dcd3f6d8dc3') +source=(http://ngircd.barton.de/pub/ngircd/ngircd-$pkgver.tar.gz ngircd.sh) +md5sums=('4958c8b2d128cf3e9888af3f782892a1' + '6d2e9f1bbb4a3a7349da0dcd3f6d8dc3') build() { - cd $startdir/src/$pkgname-$pkgver + cd $srcdir/$pkgname-$pkgver ./configure --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ diff --git a/community/nmon/PKGBUILD b/community/nmon/PKGBUILD new file mode 100644 index 000000000..9cf278e07 --- /dev/null +++ b/community/nmon/PKGBUILD @@ -0,0 +1,20 @@ +# $Id$ +# Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> + +pkgname=nmon +pkgver=14g +pkgrel=2 +pkgdesc="AIX & Linux Performance Monitoring tool" +arch=('i686' 'x86_64') +url="http://nmon.sourceforge.net" +license=("GPL") +depends=("ncurses") +source=("http://downloads.sourceforge.net/${pkgname}/lmon$pkgver.c") + +build() { + cd ${srcdir} + cc -o nmon lmon$pkgver.c -g -O2 -D JFS -D GETUSER -Wall -D LARGEMEM -lncurses -g + install -D -m 0755 nmon "${pkgdir}/usr/bin/nmon" +} + +md5sums=('e537f51446fb375140368b115dc8278b') diff --git a/community/ogmrip/PKGBUILD b/community/ogmrip/PKGBUILD index 2f523f47e..59464ecff 100644 --- a/community/ogmrip/PKGBUILD +++ b/community/ogmrip/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 54604 2011-08-21 13:02:10Z jelle $ +# $Id: PKGBUILD 56646 2011-10-09 12:12:21Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Daenyth # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Vrob (Markus Heuser) mheuser@mi.fu-berlin.de pkgname=ogmrip -pkgver=0.13.6 -pkgrel=3 +pkgver=0.13.7 +pkgrel=2 pkgdesc="Libraries and GTK2 interface for DVD ripping using mencoder" arch=('i686' 'x86_64' 'mips64el') url="http://ogmrip.sourceforge.net/" @@ -25,16 +25,12 @@ optdepends=('faac: support for the AAC audio codec' 'tesseract: support for the SRT subtitle format') options=('!libtool' '!makeflags') changelog=$pkgname.changelog -source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz - ogmrip-0.13.6-libnotify-0.7.patch) -md5sums=('e094c49cdf758883293dd44513fb37e8' - 'a7f2c64c9f1d96664d29200e461bb36e') +source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz) +sha256sums=('362060e4c1944f020f9a491d9a8af53cd3bf4f94d4f5beb8d3d855ebf17d9c2a') build() { cd ${srcdir}/${pkgname}-${pkgver} - patch -Np0 -i "$srcdir/ogmrip-0.13.6-libnotify-0.7.patch" - ./configure --prefix=/usr --sysconfdir=/usr/share make } diff --git a/community/ogmrip/ogmrip-0.13.6-libnotify-0.7.patch b/community/ogmrip/ogmrip-0.13.6-libnotify-0.7.patch deleted file mode 100644 index 64cfbf0ff..000000000 --- a/community/ogmrip/ogmrip-0.13.6-libnotify-0.7.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- src/ogmrip-progress-dialog.c -+++ src/ogmrip-progress-dialog.c -@@ -32,6 +32,9 @@ - - #ifdef HAVE_LIBNOTIFY_SUPPORT - #include <libnotify/notify.h> -+#ifndef NOTIFY_CHECK_VERSION -+#define NOTIFY_CHECK_VERSION(x,y,z) 0 -+#endif - #endif /* HAVE_LIBNOTIFY_SUPPORT */ - - #define OGMRIP_PROGRESS_DIALOG_GET_PRIVATE(o) \ -@@ -418,8 +421,12 @@ - g_signal_connect_swapped (dialog->priv->status_icon, "popup_menu", - G_CALLBACK (ogmrip_progress_dialog_status_icon_popup_menu), dialog); - -+#if NOTIFY_CHECK_VERSION (0, 7, 0) -+ /* notify_notification_new_with_status_icon was removed */ -+#else - dialog->priv->notification = notify_notification_new_with_status_icon ("Dummy", "Dummy", - OGMRIP_DATA_DIR G_DIR_SEPARATOR_S OGMRIP_ICON_FILE, dialog->priv->status_icon); -+#endif - g_signal_connect (dialog, "window-state-event", - G_CALLBACK (ogmrip_progress_dialog_state_changed), NULL); - diff --git a/community/ogmrip/ogmrip.changelog b/community/ogmrip/ogmrip.changelog index 79aca2bba..922355602 100644 --- a/community/ogmrip/ogmrip.changelog +++ b/community/ogmrip/ogmrip.changelog @@ -1,6 +1,8 @@ +2011-10-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * ogmrip O.13.7-1 + 2010-08-29 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * ogmrip O.13.6-1 - * new upstream release 2010-06-29 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * Update to major release O.13.5 diff --git a/community/oolite/PKGBUILD b/community/oolite/PKGBUILD index 574bcb2d5..9bad89c5d 100644 --- a/community/oolite/PKGBUILD +++ b/community/oolite/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Lone_Wolf <lonewolf@xs4all.nl> pkgname=oolite pkgver=1.75.3 -pkgrel=1 +pkgrel=2 pkgdesc="A space-sim based on the classic Elite" arch=('i686' 'x86_64' 'mips64el') url="http://oolite-linux.berlios.de" @@ -20,6 +20,7 @@ build() { cp -r ${srcdir}/oolite-dev-source-${pkgver} ${srcdir}/${pkgname}-build cd ${srcdir}/${pkgname}-build + sed -i "/ADDITIONAL_OBJCFLAGS/s/=/= -fobjc-exceptions/" GNUmakefile make -f libjs.make debug=no make -f Makefile release } diff --git a/community/open-vm-tools-modules/PKGBUILD b/community/open-vm-tools-modules/PKGBUILD index a3125638c..752b13b19 100644 --- a/community/open-vm-tools-modules/PKGBUILD +++ b/community/open-vm-tools-modules/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 54998 2011-08-29 21:00:59Z spupykin $ +# $Id: PKGBUILD 56484 2011-10-07 10:16:01Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Krzysztof Raczkowski <raczkow@gmail.com> pkgname=open-vm-tools-modules -pkgver=2011.08.21 -_pkgsubver=471295 +pkgver=2011.09.23 +_pkgsubver=491607 pkgrel=1 pkgdesc="The Open Virtual Machine Tools (open-vm-tools) are the open source implementation of VMware Tools" arch=('i686' 'x86_64' 'mips64el') @@ -14,11 +14,11 @@ makedepends=('libdnet' 'icu' 'uriparser' 'linux-headers') depends=("linux") install=$pkgname.install source=("http://downloads.sourceforge.net/open-vm-tools/open-vm-tools-$pkgver-${_pkgsubver}.tar.gz") -md5sums=('fd32f03ab6068c265597a74b916ca81e') +md5sums=('599342eee8d531b35ca1cc948b61868f') build() { cd "$srcdir/open-vm-tools-${pkgver}-${_pkgsubver}" - sed -i 's#-lproc-3.2.7#-lproc-3.2.8#' configure +# sed -i 's#-lproc-3.2.7#-lproc-3.2.8#' configure [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr --without-x (cd modules && make modules) } diff --git a/community/open-vm-tools/PKGBUILD b/community/open-vm-tools/PKGBUILD index da6c7950a..3ebc7b806 100644 --- a/community/open-vm-tools/PKGBUILD +++ b/community/open-vm-tools/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 54996 2011-08-29 20:59:45Z spupykin $ +# $Id: PKGBUILD 56482 2011-10-07 10:14:48Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Krzysztof Raczkowski <raczkow@gmail.com> pkgname=open-vm-tools -pkgver=2011.08.21 -_pkgsubver=471295 +pkgver=2011.09.23 +_pkgsubver=491607 pkgrel=1 pkgdesc="The Open Virtual Machine Tools (open-vm-tools) are the open source implementation of VMware Tools." arch=('i686' 'x86_64' 'mips64el') @@ -24,7 +24,7 @@ source=(http://switch.dl.sourceforge.net/$pkgname/$pkgname-$pkgver-${_pkgsubver} tools.conf vmware-guestd xautostart.conf) -md5sums=('fd32f03ab6068c265597a74b916ca81e' +md5sums=('599342eee8d531b35ca1cc948b61868f' '06f7448e274db2a911f582e276088fc9' 'b183ec265200d68431a5e4eb1b0c8cf5' '8c333a979578bdc0c3134c1dd6bb7353' @@ -37,7 +37,7 @@ md5sums=('fd32f03ab6068c265597a74b916ca81e' build() { cd "$srcdir/$pkgname-${pkgver}-${_pkgsubver}" [ $NOEXTRACT -eq 1 ] || { - sed -i 's#3.2.7#3.2.8#' configure configure.ac +# sed -i 's#3.2.7#3.2.8#' configure configure.ac sed -i 's#CFLAGS="$CFLAGS -Werror"##' configure configure.ac } [ -f Makefile ] || ./configure --prefix=/usr --without-kernel-modules diff --git a/community/open-vm-tools/xautostart.conf b/community/open-vm-tools/xautostart.conf new file mode 100644 index 000000000..829f379ce --- /dev/null +++ b/community/open-vm-tools/xautostart.conf @@ -0,0 +1,6 @@ +gnome-panel +ksmserver +startkde +kwrapper +panel +xfce4-panel diff --git a/community/pari/PKGBUILD b/community/pari/PKGBUILD index 1e34764b7..01d2fc6d9 100644 --- a/community/pari/PKGBUILD +++ b/community/pari/PKGBUILD @@ -1,35 +1,35 @@ +# $Id: PKGBUILD 56828 2011-10-14 00:16:01Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=pari pkgver=2.5.0 -pkgrel=1 +pkgrel=2 pkgdesc='Computer algebra system designed for fast computations in number theory' arch=('i686' 'x86_64' 'mips64el') url='http://pari.math.u-bordeaux.fr/' license=('GPL') -depends=('gmp' 'readline') +depends=('gmp' 'readline' 'libx11') makedepends=('perl' 'texlive-core') -optdepends=('perl: gphelp, tex2mail' - 'libx11: high precision plots') -source=("${url}pub/pari/unix/$pkgname-$pkgver.tar.gz") +optdepends=('perl: gphelp, tex2mail') +source=("${url}pub/pari/unix/${pkgname}-${pkgver}.tar.gz") sha1sums=('d96250cd8b3e426f548a832f2f44fdfd30fd32b6') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "${srcdir}/${pkgname}-${pkgver}" ./Configure --prefix=/usr --with-gmp --with-readline make all } check() { - cd "$srcdir/$pkgname-$pkgver" + cd "${srcdir}/${pkgname}-${pkgver}" make bench } package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install # symlink pointing to a symlink that is going to be moved by zipman - rm "$pkgdir"/usr/share/man/man1/pari.1 - ln -s gp.1.gz "$pkgdir"/usr/share/man/man1/pari.1.gz + rm "${pkgdir}"/usr/share/man/man1/pari.1 + ln -s gp.1.gz "${pkgdir}"/usr/share/man/man1/pari.1.gz } diff --git a/community/pcmanfm/PKGBUILD b/community/pcmanfm/PKGBUILD index 09a833e6d..7d2be84e7 100644 --- a/community/pcmanfm/PKGBUILD +++ b/community/pcmanfm/PKGBUILD @@ -1,25 +1,22 @@ -# $Id: PKGBUILD 49034 2011-06-09 21:26:14Z andrea $ -# Maintainer: Angel Velasquez <angvp@archlinux.org> -# Maintainer: Juergen Hoetzel <juergen@archlinux.org> +# Contributor: Unknown47 <unknown47r@gmail.com> +# Contributor: Angel Velasquez <angvp@archlinux.org> +# Contributor: Juergen Hoetzel <juergen@archlinux.org> pkgname=pcmanfm -pkgver=0.9.8 -pkgrel=6 +pkgver=0.9.9 +pkgrel=1 pkgdesc="File manager of the LXDE Desktop" arch=('i686' 'x86_64' 'mips64el') url="http://pcmanfm.sourceforge.net/" license=('GPL') groups=('lxde') -depends=('gtk2' 'desktop-file-utils' 'libfm' 'lxmenu-data') +depends=('gtk2' 'desktop-file-utils' 'libfm=0.1.16' 'lxmenu-data') makedepends=('intltool' 'pkgconfig') -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-$pkgver.tar.gz - revert-new-IPC.patch) -md5sums=('4a7fdc0526ed14e3293d784c0ce27dea' - '4bedb071a83ba5a7af1aa43b71a262a9') +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-$pkgver.tar.gz) +md5sums=('f31ed6defb600f7046a456220d8efa3a') build() { cd "$srcdir/$pkgname-$pkgver" - patch -Np1 -i $srcdir/revert-new-IPC.patch ./configure --sysconfdir=/etc --prefix=/usr make } diff --git a/community/pcmanfm/revert-new-IPC.patch b/community/pcmanfm/revert-new-IPC.patch deleted file mode 100644 index fa64fde42..000000000 --- a/community/pcmanfm/revert-new-IPC.patch +++ /dev/null @@ -1,432 +0,0 @@ -diff -Naur pcmanfm-20101030_10ae31a.orig/src/Makefile.am pcmanfm-20101030_10ae31a/src/Makefile.am ---- pcmanfm-20101030_10ae31a.orig/src/Makefile.am 2010-10-30 20:36:02.000000000 +0200 -+++ pcmanfm-20101030_10ae31a/src/Makefile.am 2010-10-31 09:13:48.000000000 +0100 -@@ -16,7 +16,6 @@ - pref.c pref.h \ - utils.c utils.h \ - gseal-gtk-compat.h \ -- single-inst.c single-inst.h \ - $(NULL) - - EXTRA_DIST= \ -diff -Naur pcmanfm-20101030_10ae31a.orig/src/pcmanfm.c pcmanfm-20101030_10ae31a/src/pcmanfm.c ---- pcmanfm-20101030_10ae31a.orig/src/pcmanfm.c 2010-10-30 20:36:02.000000000 +0200 -+++ pcmanfm-20101030_10ae31a/src/pcmanfm.c 2010-10-31 09:25:45.000000000 +0100 -@@ -31,6 +31,8 @@ - #include <string.h> - /* socket is used to keep single instance */ - #include <sys/types.h> -+#include <sys/socket.h> -+#include <sys/un.h> - #include <signal.h> - #include <unistd.h> /* for getcwd */ - -@@ -41,13 +43,14 @@ - #include "volume-manager.h" - #include "pref.h" - #include "pcmanfm.h" --#include "single-inst.h" -+ -+static int sock; -+GIOChannel* io_channel = NULL; - - static int signal_pipe[2] = {-1, -1}; - gboolean daemon_mode = FALSE; - - static char** files_to_open = NULL; --static int n_files_to_open = 0; - static char* profile = NULL; - static gboolean no_desktop = FALSE; - static gboolean show_desktop = FALSE; -@@ -80,25 +83,13 @@ - { NULL } - }; - --/* single instance command id */ --enum { -- CMD_INVALID, -- CMD_CWD, -- CMD_PROFILE, -- CMD_DESKTOP, -- CMD_DESKTOP_OFF, -- CMD_DAEMON_MODE, -- CMD_DESKTOP_PREF, -- CMD_SET_WALLPAPER, -- CMD_WALLPAPER_MODE, -- CMD_SHOW_PREF, -- CMD_FILES_TO_OPEN, -- CMD_EOF --}; -- - static const char* valid_wallpaper_modes[] = {"color", "stretch", "fit", "center", "tile"}; - -+static gboolean single_instance_check(); -+static void single_instance_finalize(); -+static void get_socket_name(char* buf, int len); - static gboolean pcmanfm_run(); -+static gboolean on_socket_event(GIOChannel* ioc, GIOCondition cond, gpointer data); - - /* it's not safe to call gtk+ functions in unix signal handler - * since the process is interrupted here and the state of gtk+ is unpredictable. */ -@@ -121,97 +112,6 @@ - return TRUE; - } - --static gboolean on_single_inst_command(int cmd, SingleInstCmdData* data) --{ -- switch(cmd) -- { -- case CMD_CWD: -- g_free(ipc_cwd); -- ipc_cwd = single_inst_get_str(data, NULL); -- break; -- case CMD_PROFILE: -- /* Not supported */ -- break; -- case CMD_DESKTOP: -- single_inst_get_bool(data, &show_desktop); -- break; -- case CMD_DESKTOP_OFF: -- single_inst_get_bool(data, &desktop_off); -- break; -- case CMD_DAEMON_MODE: -- /* Not supported */ -- break; -- case CMD_DESKTOP_PREF: -- single_inst_get_bool(data, &desktop_pref); -- break; -- case CMD_SET_WALLPAPER: -- g_free(set_wallpaper); -- set_wallpaper = single_inst_get_str(data, NULL); -- break; -- case CMD_WALLPAPER_MODE: -- g_free(wallpaper_mode); -- wallpaper_mode = single_inst_get_str(data, NULL); -- break; -- case CMD_SHOW_PREF: -- single_inst_get_int(data, &show_pref); -- break; -- case CMD_FILES_TO_OPEN: -- { -- g_strfreev(files_to_open); -- n_files_to_open = 0; -- files_to_open = single_inst_get_strv(data, &n_files_to_open); -- } -- break; -- case CMD_EOF: -- { -- int i; -- /* canonicalize filename if needed. */ -- for(i = 0; i < n_files_to_open; ++i) -- { -- char* file = files_to_open[i]; -- char* scheme = g_uri_parse_scheme(file); -- if(scheme) /* a valid URI */ -- { -- /* FIXME: should we canonicalize URIs? and how about file:///? */ -- g_free(scheme); -- } -- else /* a file path */ -- { -- files_to_open[i] = fm_canonicalize_filename(file, ipc_cwd); -- g_free(file); -- } -- } -- -- /* handle the parsed result and run the main program */ -- pcmanfm_run(); -- } -- break; -- } -- return TRUE; --} -- --/* we're not the first instance. pass the argv to the existing one. */ --static void pass_args_to_existing_instance() --{ -- /* send our current working dir to existing instance via IPC. */ -- ipc_cwd = g_get_current_dir(); -- single_inst_send_str(CMD_CWD, ipc_cwd); -- g_free(ipc_cwd); -- -- single_inst_send_bool(CMD_DESKTOP, show_desktop); -- single_inst_send_bool(CMD_DESKTOP_OFF, desktop_off); -- single_inst_send_bool(CMD_DESKTOP_PREF, desktop_pref); -- single_inst_send_str(CMD_SET_WALLPAPER, set_wallpaper); -- single_inst_send_str(CMD_WALLPAPER_MODE, wallpaper_mode); -- single_inst_send_int(CMD_SHOW_PREF, show_pref); -- /* single_inst_send_bool(CMD_FIND_FILES, find_files); */ -- -- single_inst_send_strv(CMD_FILES_TO_OPEN, files_to_open); -- single_inst_send_bool(CMD_EOF, TRUE); /* all args have been sent. */ -- -- single_inst_finalize(); --} -- - int main(int argc, char** argv) - { - FmConfig* config; -@@ -230,17 +130,10 @@ - return 1; - } - -- /* ensure that there is only one instance of pcmanfm. */ -- switch(single_inst_init("pcmanfm", on_single_inst_command)) -- { -- case SINGLE_INST_CLIENT: /* we're not the first instance. */ -- pass_args_to_existing_instance(); -- gdk_notify_startup_complete(); -- return 0; -- case SINGLE_INST_ERROR: /* error happened. */ -- single_inst_finalize(); -- return 1; -- } -+ /* ensure that there is only one instance of pcmanfm. -+ if there is an existing instance, command line arguments -+ will be passed to the existing instance, and exit() will be called here. */ -+ single_instance_check(); - - if(pipe(signal_pipe) == 0) - { -@@ -274,13 +167,240 @@ - fm_volume_manager_finalize(); - } - -- single_inst_finalize(); -+ single_instance_finalize(); -+ - fm_gtk_finalize(); - - g_object_unref(config); - return 0; - } - -+inline static void buf_append_str(GByteArray* buf, const char* str) -+{ -+ int len; -+ if(G_LIKELY(str)) -+ { -+ len = strlen(str) + 1; -+ g_byte_array_append(buf, (guint8*)&len, sizeof(len)); -+ g_byte_array_append(buf, (guint8*)str, len); -+ } -+ else -+ { -+ len = 0; -+ g_byte_array_append(buf, (guint8*)&len, sizeof(len)); -+ } -+} -+ -+inline static GByteArray* args_to_ipc_buf() -+{ -+ int i, len; -+ GByteArray* buf = g_byte_array_sized_new(4096); -+ /* send our current working dir to existing instance via IPC. */ -+ ipc_cwd = g_get_current_dir(); -+ buf_append_str(buf, ipc_cwd); -+ g_free(ipc_cwd); -+ -+ /* g_byte_array_append(buf, (guint8*)&new_tab, sizeof(new_tab)); */ -+ g_byte_array_append(buf, (guint8*)&show_desktop, sizeof(show_desktop)); -+ g_byte_array_append(buf, (guint8*)&desktop_off, sizeof(desktop_off)); -+ g_byte_array_append(buf, (guint8*)&desktop_pref, sizeof(desktop_pref)); -+ buf_append_str(buf, set_wallpaper); -+ buf_append_str(buf, wallpaper_mode); -+ g_byte_array_append(buf, (guint8*)&show_pref, sizeof(show_pref)); -+ g_byte_array_append(buf, (guint8*)&find_files, sizeof(find_files)); -+ g_byte_array_append(buf, (guint8*)&no_desktop, sizeof(no_desktop)); -+ -+ len = files_to_open ? g_strv_length(files_to_open) : 0; -+ g_byte_array_append(buf, (guint8*)&len, sizeof(len)); -+ for(i = 0; i < len; ++i) -+ buf_append_str(buf, files_to_open[i]); -+ -+ return buf; -+} -+ -+inline static gboolean buf_read_bool(const char**p) -+{ -+ gboolean ret; -+ memcpy(&ret, *p, sizeof(ret)); -+ *p += sizeof(ret); -+ return ret; -+} -+ -+inline static int buf_read_int(const char**p) -+{ -+ int ret; -+ memcpy(&ret, *p, sizeof(ret)); -+ *p += sizeof(ret); -+ return ret; -+} -+ -+inline static char* buf_read_str(const char**p) -+{ -+ char* ret; -+ int len = buf_read_int(p); -+ if(len > 0) -+ { -+ ret = g_malloc(len); -+ memcpy(ret, *p, len); -+ *p += len; -+ } -+ else -+ ret = NULL; -+ return ret; -+} -+ -+inline static void ipc_buf_to_args(GByteArray* buf) -+{ -+ int i, len; -+ char* p = buf->data; -+ char* cwd = buf_read_str(&p); -+ /* new_tab = buf_read_bool(&p); */ -+ show_desktop = buf_read_bool(&p); -+ desktop_off = buf_read_bool(&p); -+ desktop_pref = buf_read_bool(&p); -+ g_free(set_wallpaper); -+ set_wallpaper = buf_read_str(&p); -+ g_free(wallpaper_mode); -+ wallpaper_mode = buf_read_str(&p); -+ show_pref = buf_read_int(&p); -+ find_files = buf_read_bool(&p); -+ no_desktop = buf_read_bool(&p); -+ -+ len = buf_read_int(&p); -+ /* g_debug("len = %d", len); */ -+ if(len > 0) -+ { -+ files_to_open = g_new(char*, len + 1); -+ for(i = 0; i < len; ++i) -+ { -+ char* file = buf_read_str(&p); -+ char* scheme = g_uri_parse_scheme(file); -+ if(scheme) /* a valid URI */ -+ { -+ /* FIXME: should we canonicalize URIs? and how about file:///? */ -+ files_to_open[i] = file; -+ g_free(scheme); -+ } -+ else /* a file path */ -+ { -+ files_to_open[i] = fm_canonicalize_filename(file, cwd); -+ g_free(file); -+ } -+ } -+ files_to_open[i] = NULL; -+ } -+ else -+ files_to_open = NULL; -+ g_free(cwd); -+} -+ -+gboolean on_socket_event( GIOChannel* ioc, GIOCondition cond, gpointer data ) -+{ -+ int client, r; -+ socklen_t addr_len = 0; -+ struct sockaddr_un client_addr ={ 0 }; -+ static char buf[ 1024 ]; -+ GByteArray* args; -+ -+ if ( cond & G_IO_IN ) -+ { -+ client = accept( g_io_channel_unix_get_fd( ioc ), (struct sockaddr *)&client_addr, &addr_len ); -+ if ( client != -1 ) -+ { -+ args = g_byte_array_sized_new(4096); -+ while( (r = read( client, buf, sizeof(buf) )) > 0 ) -+ g_byte_array_append( args, (guint8*)buf, r); -+ shutdown( client, 2 ); -+ close( client ); -+ ipc_buf_to_args(args); -+ g_byte_array_free( args, TRUE ); -+ pcmanfm_run(); -+ } -+ } -+ return TRUE; -+} -+ -+void get_socket_name( char* buf, int len ) -+{ -+ char* dpy = gdk_get_display(); -+ g_snprintf( buf, len, "/tmp/.pcmanfm-socket%s-%s", dpy, g_get_user_name() ); -+ g_free( dpy ); -+} -+ -+gboolean single_instance_check() -+{ -+ struct sockaddr_un addr; -+ int addr_len; -+ int ret; -+ int reuse; -+ -+ if((sock = socket(AF_UNIX, SOCK_STREAM, 0)) == -1) -+ { -+ ret = 1; -+ goto _exit; -+ } -+ -+ /* FIXME: use abstract socket */ -+ addr.sun_family = AF_UNIX; -+ get_socket_name(addr.sun_path, sizeof( addr.sun_path )); -+#ifdef SUN_LEN -+ addr_len = SUN_LEN(&addr); -+#else -+ addr_len = strlen( addr.sun_path ) + sizeof( addr.sun_family ); -+#endif -+ -+ /* try to connect to existing instance */ -+ if(connect(sock, (struct sockaddr*)&addr, addr_len) == 0) -+ { -+ /* connected successfully */ -+ GByteArray* buf = args_to_ipc_buf(); -+ write(sock, buf->data, buf->len); -+ g_byte_array_free(buf, TRUE); -+ -+ shutdown( sock, 2 ); -+ close( sock ); -+ ret = 0; -+ goto _exit; -+ } -+ -+ /* There is no existing server, and we are in the first instance. */ -+ unlink( addr.sun_path ); /* delete old socket file if it exists. */ -+ reuse = 1; -+ ret = setsockopt( sock, SOL_SOCKET, SO_REUSEADDR, &reuse, sizeof(reuse) ); -+ if(bind(sock, (struct sockaddr*)&addr, addr_len) == -1) -+ { -+ ret = 1; -+ goto _exit; -+ } -+ -+ io_channel = g_io_channel_unix_new(sock); -+ g_io_channel_set_encoding(io_channel, NULL, NULL); -+ g_io_channel_set_buffered(io_channel, FALSE); -+ g_io_add_watch(io_channel, G_IO_IN, -+ (GIOFunc)on_socket_event, NULL); -+ if(listen(sock, 5) == -1) -+ { -+ ret = 1; -+ goto _exit; -+ } -+ return TRUE; -+ -+_exit: -+ -+ gdk_notify_startup_complete(); -+ exit( ret ); -+} -+ -+void single_instance_finalize() -+{ -+ char lock_file[256]; -+ shutdown(sock, 2); -+ g_io_channel_unref(io_channel); -+ close(sock); -+ get_socket_name(lock_file, sizeof( lock_file )); -+ unlink(lock_file); -+} -+ - static FmJobErrorAction on_file_info_job_error(FmFileInfoJob* job, GError* err, FmJobErrorSeverity severity, gpointer user_data) - { - if(err->domain == G_IO_ERROR) diff --git a/community/pdf2djvu/PKGBUILD b/community/pdf2djvu/PKGBUILD index f759b1922..9d4db9737 100644 --- a/community/pdf2djvu/PKGBUILD +++ b/community/pdf2djvu/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 45044 2011-04-14 15:13:18Z jelle $ +# $Id: PKGBUILD 56949 2011-10-17 08:21:01Z ibiru $ # Contributor: Paulo Matias <matiasΘarchlinux-br·org> # Maintainer: Jelle van der Waa <jelle@vdwaa.nl> pkgname=pdf2djvu -pkgver=0.7.7 +pkgver=0.7.11 pkgrel=1 pkgdesc="Creates DjVu files from PDF files" arch=('i686' 'x86_64' 'mips64el') url="http://pdf2djvu.googlecode.com" license=('GPL') -depends=('poppler' 'djvulibre' 'libxslt') +depends=('poppler' 'djvulibre' 'libxslt' 'gcc-libs') makedepends=('pstreams') source=("http://pdf2djvu.googlecode.com/files/${pkgname}_${pkgver}.tar.gz") -md5sums=('85c594881ff864d5aceaa88e833d3107') +md5sums=('cdc0cbb46512aaf7109d6ebc7aef1a7a') build() { cd ${srcdir}/${pkgname}-${pkgver} @@ -25,3 +25,4 @@ package() { make install DESTDIR=${pkgdir} install -Dm644 doc/${pkgname}.1 ${pkgdir}/usr/share/man/man1/${pkgname}.1 } +md5sums=('37c3d5a31c155bc65a39912da4c6bce1') diff --git a/community/pdf2svg/PKGBUILD b/community/pdf2svg/PKGBUILD index 556b6e754..c20098d2a 100644 --- a/community/pdf2svg/PKGBUILD +++ b/community/pdf2svg/PKGBUILD @@ -4,14 +4,13 @@ pkgname=pdf2svg pkgver=0.2.1 -pkgrel=5 -pkgdesc="A pdf to svg convertor" +pkgrel=6 +pkgdesc="A pdf to svg converter" arch=('i686' 'x86_64' 'mips64el') url="http://www.cityinthesky.co.uk/pdf2svg.html" license=('GPL') -depends=('poppler-glib') -source=("http://www.cityinthesky.co.uk/files/$pkgname-$pkgver.tar.gz") -md5sums=('59b3b9768166f73b77215e95d91f0a9d') +depends=('poppler-glib' 'gtk2' 'glib2') +source=("http://www.cityinthesky.co.uk/_media/opensource/$pkgname-$pkgver.tar.gz") build() { cd "$srcdir/$pkgname-$pkgver" @@ -25,3 +24,4 @@ package() { } +md5sums=('59b3b9768166f73b77215e95d91f0a9d') diff --git a/community/perl-crypt-openssl-rsa/PKGBUILD b/community/perl-crypt-openssl-rsa/PKGBUILD index 6ceca5e7a..9fe5c09c8 100644 --- a/community/perl-crypt-openssl-rsa/PKGBUILD +++ b/community/perl-crypt-openssl-rsa/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 51051 2011-07-04 15:35:36Z spupykin $ +# $Id: PKGBUILD 56403 2011-10-07 09:48:48Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=perl-crypt-openssl-rsa -pkgver=0.27 +pkgver=0.28 pkgrel=1 pkgdesc="Interface to OpenSSL RSA methods" arch=('i686' 'x86_64' 'mips64el') @@ -10,8 +10,8 @@ url="http://search.cpan.org/dist/Crypt-OpenSSL-RSA" depends=('perl-crypt-openssl-random' 'perl-crypt-openssl-bignum') license=('GPL') options=('!emptydirs') -source=("http://search.cpan.org/CPAN/authors/id/T/TO/TODDR/Crypt-OpenSSL-RSA-$pkgver.tar.gz") -md5sums=('08ed5352354116a88a7922ba2da57efa') +source=("http://search.cpan.org/CPAN/authors/id/P/PE/PERLER/Crypt-OpenSSL-RSA-$pkgver.tar.gz") +md5sums=('86217a5036fc63779c30420b5fd84129') build() { cd $srcdir/Crypt-OpenSSL-RSA-$pkgver diff --git a/community/perl-data-dumper/PKGBUILD b/community/perl-data-dumper/PKGBUILD deleted file mode 100644 index 1c884c85b..000000000 --- a/community/perl-data-dumper/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id$ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: AUR Perl <aurperl@juster.info> - -pkgname='perl-data-dumper' -pkgver=2.131 -pkgrel=1 -pkgdesc="Convert data structure into perl code" -arch=('i686' 'x86_64' 'mips64el') -license=('PerlArtistic' 'GPL') -options=('!emptydirs') -depends=('perl') -makedepends=() -url='http://search.cpan.org/dist/Data-Dumper' -source=("http://search.cpan.org/CPAN/authors/id/S/SM/SMUELLER/Data-Dumper-$pkgver.tar.gz") -md5sums=('653ac6576e6916446419ae4ba786073f') - -build() { - ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ - PERL_AUTOINSTALL=--skipdeps \ - PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'" \ - PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \ - MODULEBUILDRC=/dev/null - cd "${srcdir}/Data-Dumper-$pkgver" - /usr/bin/perl Makefile.PL - make - ) -} - -check() { - cd "${srcdir}/Data-Dumper-$pkgver" - ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" make test ) -} - -package() { - cd "${srcdir}/Data-Dumper-$pkgver" - make install - find "$pkgdir" -name .packlist -o -name perllocal.pod -delete -} diff --git a/community/perl-dbd-odbc/PKGBUILD b/community/perl-dbd-odbc/PKGBUILD index f277fb388..93ae7f6a5 100644 --- a/community/perl-dbd-odbc/PKGBUILD +++ b/community/perl-dbd-odbc/PKGBUILD @@ -1,10 +1,9 @@ -# $Id: PKGBUILD 47750 2011-05-25 13:23:38Z tdziedzic $ +# $Id: PKGBUILD 56488 2011-10-07 10:18:28Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# This PKGBUILD was generated by cpan4pacman via CPANPLUS::Dist::Pacman # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-dbd-odbc -pkgver=1.29 +pkgver=1.31 pkgrel=1 pkgdesc="ODBC Driver for DBI" arch=('i686' 'x86_64' 'mips64el') @@ -13,21 +12,17 @@ license=('GPL' 'PerlArtistic') depends=('perl-dbi' 'perl' 'unixodbc') options=('!emptydirs') source=("http://search.cpan.org/CPAN/authors/id/M/MJ/MJEVANS/DBD-ODBC-${pkgver}.tar.gz") -md5sums=('66fee532cab75a1e5ffa81dfd26b2367') +md5sums=('a6700d6ad8164e783d973de3b79b769d') build() { cd DBD-ODBC-${pkgver} - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make } package() { cd DBD-ODBC-${pkgver} - make install DESTDIR=${pkgdir} - find ${pkgdir} -name '.packlist' -delete find ${pkgdir} -name '*.pod' -delete } diff --git a/community/perl-dbd-sybase/PKGBUILD b/community/perl-dbd-sybase/PKGBUILD index 39ffc195a..e6b72e091 100644 --- a/community/perl-dbd-sybase/PKGBUILD +++ b/community/perl-dbd-sybase/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 47759 2011-05-25 13:32:36Z tdziedzic $ +# $Id: PKGBUILD 56416 2011-10-07 09:53:00Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=perl-dbd-sybase -pkgver=1.12 +pkgver=1.14 pkgrel=1 pkgdesc="Sybase Driver for DBI" arch=('i686' 'x86_64' 'mips64el') @@ -11,23 +11,18 @@ license=('GPL' 'PerlArtistic') depends=('perl-dbi>=1.52' 'perl>=5.10.0' 'freetds') options=('!emptydirs') source=("http://search.cpan.org/CPAN/authors/id/M/ME/MEWP/DBD-Sybase-${pkgver}.tar.gz") -md5sums=('fc01efe30102e801f6fdc1c96352fcde') +md5sums=('db6662d710b3adffe37bd8aec8060eda') build() { cd $srcdir/DBD-Sybase-${pkgver} - export SYBASE=/usr - echo -e "\n\n\n\n\n\n" | PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make } package() { cd $srcdir/DBD-Sybase-${pkgver} - make install DESTDIR=${pkgdir} - find ${pkgdir} -name '.packlist' -delete find ${pkgdir} -name '*.pod' -delete } diff --git a/community/perl-digest-md5/PKGBUILD b/community/perl-digest-md5/PKGBUILD deleted file mode 100644 index 55b57db22..000000000 --- a/community/perl-digest-md5/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 48561 2011-06-02 06:48:37Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Ashok `ScriptDevil` Gautham <ScriptDevil@gmail.com> - -pkgname=perl-digest-md5 -pkgver=2.51 -pkgrel=2 -pkgdesc="Digest::MD5::Perl - Perl implementation of Ron Rivests MD5 Algorithm" -arch=('i686' 'x86_64' 'mips64el') -url="http://search.cpan.org/dist/Digest-MD5" -license=('GPL' 'PerlArtistic') -depends=('perl>=5.10.0') -options=(!emptydirs) -source=(http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/Digest-MD5-$pkgver.tar.gz) -md5sums=('73967d50b9d19990a1d609fe2b1e36c3') - -build() { - cd "$srcdir/Digest-MD5-$pkgver" - # install module in vendor directories. - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make -} - -package() { - cd "$srcdir/Digest-MD5-$pkgver" - make install DESTDIR="$pkgdir/" - # remove perllocal.pod and .packlist - find "$pkgdir" -name perllocal.pod -delete - find "$pkgdir" -name .packlist -delete -} diff --git a/community/perl-fuse/PKGBUILD b/community/perl-fuse/PKGBUILD index f9738fcd0..907db9b9f 100644 --- a/community/perl-fuse/PKGBUILD +++ b/community/perl-fuse/PKGBUILD @@ -1,18 +1,17 @@ -# $Id: PKGBUILD 47546 2011-05-23 19:23:45Z jelle $ +# $Id: PKGBUILD 56424 2011-10-07 09:55:09Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Tom K <tomk@runbox.com> pkgname=perl-fuse -pkgver=0.11 -pkgrel=2 +pkgver=0.14 +pkgrel=1 pkgdesc="write filesystems in Perl using FUSE" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/Fuse" depends=('perl' 'fuse') license=('GPL') source=(http://www.cpan.org/authors/id/D/DP/DPAVLIN/Fuse-$pkgver.tar.gz) -md5sums=('4b4cb2399dc409015779af0940513c97') -options=('!emptydirs') +md5sums=('df72f17bf03e1a31c1a834816a3a59f1') build() { cd $srcdir/Fuse-$pkgver diff --git a/community/perl-io-tty/PKGBUILD b/community/perl-io-tty/PKGBUILD index 53a039d70..6afc5da89 100644 --- a/community/perl-io-tty/PKGBUILD +++ b/community/perl-io-tty/PKGBUILD @@ -1,25 +1,26 @@ +# $Id: PKGBUILD 56440 2011-10-07 09:59:16Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Charles Mauch <cmauch@gmail.com> pkgname=perl-io-tty -_realname=IO-Tty -pkgver=1.08 -pkgrel=4 +pkgver=1.10 +pkgrel=1 pkgdesc="Provide an interface to TTYs and PTYs" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/IO-Tty/" license=("GPL" "PerlArtistic") depends=('glibc') -source=("http://www.cpan.org/authors/id/R/RG/RGIERSIG/${_realname}-$pkgver.tar.gz") -md5sums=('e99d819a6f8c11ae105b770cc508a4fc') options=('!emptydirs') +source=("http://search.cpan.org/CPAN/authors/id/T/TO/TODDR/IO-Tty-$pkgver.tar.gz") +md5sums=('46baec86a145e57f0ec661fa412b097c') build() { - cd $srcdir/${_realname}-$pkgver - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + cd $srcdir/IO-Tty-$pkgver + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make } -package(){ - cd $srcdir/${_realname}-$pkgver +package(){ + cd $srcdir/IO-Tty-$pkgver make install DESTDIR=$pkgdir find $pkgdir -name '.packlist' -delete find $pkgdir -name '*.pod' -delete diff --git a/community/perl-json-xs/PKGBUILD b/community/perl-json-xs/PKGBUILD index 7c278daa4..18a78f161 100644 --- a/community/perl-json-xs/PKGBUILD +++ b/community/perl-json-xs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 47516 2011-05-23 18:15:13Z jelle $ +# $Id: PKGBUILD 56442 2011-10-07 09:59:59Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Tor Krill <tor@krill.nu> pkgname=perl-json-xs -pkgver=2.3 -pkgrel=3 +pkgver=2.32 +pkgrel=1 pkgdesc="JSON::XS - JSON serialising/deserialising, done correctly and fast" url="http://search.cpan.org/dist/JSON-XS/" license=("GPL") @@ -12,7 +12,7 @@ arch=('i686' 'x86_64' 'mips64el') depends=('perl' 'perl-common-sense') options=('!emptydirs') source=(http://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/JSON-XS-$pkgver.tar.gz) -md5sums=('4dc2a968e41f8cf330d46be12f221a12') +md5sums=('87f71c78010083ad4d158b5765c4a609') build() { cd $srcdir/JSON-XS-$pkgver diff --git a/community/perl-net-dbus/PKGBUILD b/community/perl-net-dbus/PKGBUILD index 75363cb98..b22530497 100644 --- a/community/perl-net-dbus/PKGBUILD +++ b/community/perl-net-dbus/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 47599 2011-05-23 20:48:03Z tdziedzic $ +# $Id: PKGBUILD 56450 2011-10-07 10:02:33Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Francois Charette <firmicus@gmx.net> pkgname=perl-net-dbus -pkgver=0.33.6 -pkgrel=6 +pkgver=1.0.0 +pkgrel=1 pkgdesc="Binding for DBus messaging protocol" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/Net-DBus" @@ -12,21 +12,17 @@ license=('GPL' 'PerlArtistic') depends=('dbus' 'perl-xml-twig') options=('!emptydirs') source=("http://www.cpan.org/authors/id/D/DA/DANBERR/Net-DBus-${pkgver}.tar.gz") -md5sums=('a1dbce89b1b839fd0e46d74067ae2e35') +md5sums=('b17e32976d1a3b56feb908ebd7fed7f1') build() { cd Net-DBus-${pkgver} - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make } package() { cd Net-DBus-${pkgver} - make install DESTDIR=${pkgdir} - find ${pkgdir} -name '.packlist' -delete find ${pkgdir} -name '*.pod' -delete } diff --git a/community/perl-params-classify/PKGBUILD b/community/perl-params-classify/PKGBUILD new file mode 100644 index 000000000..476e3d378 --- /dev/null +++ b/community/perl-params-classify/PKGBUILD @@ -0,0 +1,23 @@ +# $Id: PKGBUILD 56695 2011-10-10 17:08:45Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> + +pkgname=perl-params-classify +pkgver=0.009 +pkgrel=1 +pkgdesc="argument type classification" +arch=(i686 x86_64) +license=('PerlArtistic') +url="http://search.cpan.org/~zefram/Params-Classify" +options=(!emptydirs) +depends=('perl>=5.10.1') +source=("http://search.cpan.org/CPAN/authors/id/Z/ZE/ZEFRAM/Params-Classify-$pkgver.tar.gz") +md5sums=('57114b9272df5c4dba1aeb3c4b4d2984') + +build() { + cd $srcdir/Params-Classify-$pkgver + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make + make install DESTDIR=${pkgdir} + find ${pkgdir} -name perllocal.pod -delete + find ${pkgdir} -name .packlist -delete +} diff --git a/community/perl-params-validate/PKGBUILD b/community/perl-params-validate/PKGBUILD index 6f8974d00..def2a8d1b 100644 --- a/community/perl-params-validate/PKGBUILD +++ b/community/perl-params-validate/PKGBUILD @@ -1,9 +1,10 @@ -# This PKGBUILD was generated by cpan4pacman via CPANPLUS::Dist::Pacman +# $Id: PKGBUILD 56454 2011-10-07 10:03:49Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-params-validate -pkgver=0.98 -pkgrel=2 +pkgver=1.00 +pkgrel=1 pkgdesc="Validate sub params against a spec" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/Params-Validate" @@ -11,20 +12,16 @@ license=('GPL' 'PerlArtistic') depends=('perl') options=('!emptydirs') source=("http://www.cpan.org/authors/id/D/DR/DROLSKY/Params-Validate-${pkgver}.tar.gz") -md5sums=('6dacb26b1bdb6338b6eed45cd86958bb') +md5sums=('e8989f5686de4cd916cd973ccf097625') build() { cd Params-Validate-${pkgver} - perl ./Build.PL --installdirs=vendor - ./Build } package(){ cd Params-Validate-${pkgver} - ./Build install --destdir=${pkgdir} - find ${pkgdir} -name '.packlist' -delete find ${pkgdir} -name '*.pod' -delete } diff --git a/community/perl-perlio-eol/PKGBUILD b/community/perl-perlio-eol/PKGBUILD deleted file mode 100644 index 3e343c7d9..000000000 --- a/community/perl-perlio-eol/PKGBUILD +++ /dev/null @@ -1,23 +0,0 @@ -# $Id: PKGBUILD 50826 2011-07-01 18:50:47Z bluewind $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Charles Mauch <cmauch@gmail.com> - -pkgname=perl-perlio-eol -pkgver=0.14 -pkgrel=1 -pkgdesc="Perl/CPAN Module PerlIO::eol" -arch=("i686" "x86_64" 'mips64el') -url="http://search.cpan.org/dist/PerlIO-eol" -license=("GPL" "PerlArtistic") -replaces=(perlio-eol) -source=("http://www.cpan.org/authors/id/A/AU/AUDREYT/PerlIO-eol-$pkgver.tar.gz") -md5sums=('55c5d3fafab00a511ff1c2722060235c') - -build() { - cd $srcdir/PerlIO-eol-$pkgver - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1 - make || return 1 - make install DESTDIR=$pkgdir || return 1 - find $pkgdir -name '.packlist' -delete - find $pkgdir -name '*.pod' -delete -} diff --git a/community/perl-xml-libxslt/PKGBUILD b/community/perl-xml-libxslt/PKGBUILD index 2ebf0f050..82e09e9c6 100644 --- a/community/perl-xml-libxslt/PKGBUILD +++ b/community/perl-xml-libxslt/PKGBUILD @@ -1,30 +1,30 @@ -# Id:$ +# $Id: PKGBUILD 56997 2011-10-18 03:35:07Z ebelanger $ # Maintainer: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-xml-libxslt -pkgver=1.70 -pkgrel=6 -pkgdesc="Interface to the gnome libxslt library " +pkgver=1.73 +pkgrel=1 +pkgdesc="Interface to the gnome libxslt library" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/XML-LibXSLT" license=('GPL') depends=('perl-xml-libxml' 'libxslt') -source=(http://www.cpan.org/authors/id/P/PA/PAJAS/XML-LibXSLT-$pkgver.tar.gz) -md5sums=('c63a7913999de076e5c911810f69b392') +options=('!emptydirs') +source=(http://www.cpan.org/authors/id/S/SH/SHLOMIF/XML-LibXSLT-$pkgver.tar.gz) +md5sums=('99b372c85cae773a073d4387e305c29c') build() { - cd $srcdir/XML-LibXSLT-$pkgver + cd "$srcdir/XML-LibXSLT-$pkgver" PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make } -check () { - cd $srcdir/XML-LibXSLT-$pkgver +check() { + cd "$srcdir/XML-LibXSLT-$pkgver" make test } package() { - cd $srcdir/XML-LibXSLT-$pkgver - make install DESTDIR=$pkgdir + cd "$srcdir/XML-LibXSLT-$pkgver" + make install DESTDIR="$pkgdir" } - diff --git a/community/pingus/PKGBUILD b/community/pingus/PKGBUILD index 36e16a77a..046cfcd1e 100644 --- a/community/pingus/PKGBUILD +++ b/community/pingus/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 52474 2011-07-25 20:35:38Z jelle $ +# $Id: PKGBUILD 56752 2011-10-11 20:37:22Z lcarlier $ # Maintainer: Eric Belanger <eric@archlinux.org> pkgname=pingus -pkgver=0.7.3 -pkgrel=5 +pkgver=0.7.4 +pkgrel=2 pkgdesc="A Lemmings clone, i.e. a level-based puzzle game." arch=('i686' 'x86_64' 'mips64el') url="http://pingus.seul.org" license=('GPL') -depends=('gcc-libs' 'sdl_image' 'sdl_mixer' 'boost-libs>=1.46') -makedepends=('scons' 'boost>=1.46') +depends=('gcc-libs' 'sdl_image' 'sdl_mixer' 'libgl' 'boost-libs>=1.47') +makedepends=('scons' 'boost>=1.47' 'mesa') source=(http://pingus.seul.org/files/${pkgname}-${pkgver}.tar.bz2 pingus.desktop) -md5sums=('7d1a0b0d658cc46dd09d6274f39acc7d' - 'b94efaa6e2de959de7fdb50cfc7dbdea') -sha1sums=('ca7fe5cea65fb3392d1e81056a879831925502f2' - 'f35649f3b0b2bfcb01ce75085cf719dcaa609a54') +md5sums=('82742bc9906cad98338cfd3ea700b396' + '9eec34047bdcff49e08f41e81764e20c') +sha1sums=('e61e5ffefcecebed83286c25b3626f70ed75d2a5' + '579a1144f161ce89e6e024cea37210149b89c0c0') build() { cd ${pkgname}-${pkgver} @@ -25,7 +25,10 @@ build() { package() { cd ${pkgname}-${pkgver} - ./install.sh "${pkgdir}/usr" + # fix launcher + sed -i 's/echo/echo -e/g' ./Makefile + + make install DESTDIR="${pkgdir}" PREFIX="/usr" install -D -m644 "${srcdir}/pingus.desktop" "${pkgdir}/usr/share/applications/pingus.desktop" } diff --git a/community/pingus/pingus.desktop b/community/pingus/pingus.desktop index 158eaa820..276db36a4 100644 --- a/community/pingus/pingus.desktop +++ b/community/pingus/pingus.desktop @@ -6,4 +6,4 @@ Exec=pingus Terminal=false Type=Application Categories=Application;Game;LogicGame -Icon=/usr/share/pingus/data/images/core/editor/actions.png +Icon=/usr/share/pingus/images/core/editor/actions.png diff --git a/community/python-cherrypy/837.2049.patch b/community/python-cherrypy/837.2049.patch deleted file mode 100644 index 20cc0dd36..000000000 --- a/community/python-cherrypy/837.2049.patch +++ /dev/null @@ -1,554 +0,0 @@ -Index: cherrypy/test/test_tools.py -=================================================================== ---- cherrypy/test/test_tools.py (revision 2049) -+++ cherrypy/test/test_tools.py (working copy) -@@ -3,6 +3,7 @@ - import gzip - import StringIO - import sys -+from httplib import IncompleteRead - import time - timeout = 0.2 - -@@ -272,8 +273,12 @@ - # Because this error is raised after the response body has - # started, and because it's chunked output, an error is raised by - # the HTTP client when it encounters incomplete output. -- self.assertRaises(ValueError, self.getPage, -- "/demo/errinstream?id=5") -+ if sys.version_info[:2] >= (2, 6): -+ self.assertRaises(IncompleteRead, self.getPage, -+ "/demo/errinstream?id=5") -+ else: -+ self.assertRaises(ValueError, self.getPage, -+ "/demo/errinstream?id=5") - # If this fails, then on_end_request isn't being called at all. - time.sleep(0.1) - self.getPage("/demo/ended/5") -Index: cherrypy/test/webtest.py -=================================================================== ---- cherrypy/test/webtest.py (revision 2049) -+++ cherrypy/test/webtest.py (working copy) -@@ -491,7 +491,7 @@ - # IN6ADDR_ANY, which should respond on localhost. - host = "::1" - conn = http_conn(host, port) -- -+ - conn._http_vsn_str = protocol - conn._http_vsn = int("".join([x for x in protocol if x.isdigit()])) - -Index: cherrypy/test/test_encoding.py -=================================================================== ---- cherrypy/test/test_encoding.py (revision 2049) -+++ cherrypy/test/test_encoding.py (working copy) -@@ -1,7 +1,9 @@ - from cherrypy.test import test - test.prefer_parent_path() - -+import sys - import gzip, StringIO -+from httplib import IncompleteRead - import cherrypy - europoundUnicode = u'\x80\xa3' - europoundUtf8 = u'\x80\xa3'.encode('utf-8') -@@ -160,10 +162,13 @@ - else: - # The wsgiserver will simply stop sending data, and the HTTP client - # will error due to an incomplete chunk-encoded stream. -- self.assertRaises(ValueError, self.getPage, '/gzip/noshow_stream', -- headers=[("Accept-Encoding", "gzip")]) -+ if sys.version_info[:2] >= (2, 6): -+ self.assertRaises(IncompleteRead, self.getPage, '/gzip/noshow_stream', -+ headers=[("Accept-Encoding", "gzip")]) -+ else: -+ self.assertRaises(ValueError, self.getPage, '/gzip/noshow_stream', -+ headers=[("Accept-Encoding", "gzip")]) - -- - if __name__ == "__main__": - setup_server() - helper.testmain() -Index: cherrypy/test/test_core.py -=================================================================== ---- cherrypy/test/test_core.py (revision 2049) -+++ cherrypy/test/test_core.py (working copy) -@@ -7,6 +7,7 @@ - localDir = os.path.dirname(__file__) - import sys - import types -+from httplib import IncompleteRead - - import cherrypy - from cherrypy import _cptools, tools -@@ -760,8 +761,12 @@ - else: - # Under HTTP/1.1, the chunked transfer-coding is used. - # The HTTP client will choke when the output is incomplete. -- self.assertRaises(ValueError, self.getPage, -- "/error/page_streamed") -+ if sys.version_info[:2] >= (2, 6): -+ self.assertRaises(IncompleteRead, self.getPage, -+ "/error/page_streamed") -+ else: -+ self.assertRaises(ValueError, self.getPage, -+ "/error/page_streamed") - - # No traceback should be present - self.getPage("/error/cause_err_in_finalize") -Index: cherrypy/wsgiserver/__init__.py -=================================================================== ---- cherrypy/wsgiserver/__init__.py (revision 2049) -+++ cherrypy/wsgiserver/__init__.py (working copy) -@@ -713,148 +713,325 @@ - """Exception raised when the SSL implementation signals a fatal alert.""" - pass - -+if sys.version_info[:2] >= (2, 6) or sys.version_info[:3] >= (2, 5, 2): -+ class CP_fileobject(socket._fileobject): -+ """Faux file object attached to a socket object.""" - --class CP_fileobject(socket._fileobject): -- """Faux file object attached to a socket object.""" -- -- def sendall(self, data): -- """Sendall for non-blocking sockets.""" -- while data: -- try: -- bytes_sent = self.send(data) -- data = data[bytes_sent:] -- except socket.error, e: -- if e.args[0] not in socket_errors_nonblocking: -- raise -- -- def send(self, data): -- return self._sock.send(data) -- -- def flush(self): -- if self._wbuf: -- buffer = "".join(self._wbuf) -- self._wbuf = [] -- self.sendall(buffer) -- -- def recv(self, size): -- while True: -- try: -- return self._sock.recv(size) -- except socket.error, e: -- if e.args[0] not in socket_errors_nonblocking: -- raise -- -- def read(self, size=-1): -- if size < 0: -- # Read until EOF -- buffers = [self._rbuf] -- self._rbuf = "" -- if self._rbufsize <= 1: -- recv_size = self.default_bufsize -+ def sendall(self, data): -+ """Sendall for non-blocking sockets.""" -+ while data: -+ try: -+ bytes_sent = self.send(data) -+ data = data[bytes_sent:] -+ except socket.error, e: -+ if e.args[0] not in socket_errors_nonblocking: -+ raise -+ -+ def send(self, data): -+ return self._sock.send(data) -+ -+ def flush(self): -+ if self._wbuf: -+ buffer = "".join(self._wbuf) -+ self._wbuf = [] -+ self.sendall(buffer) -+ -+ def recv(self, size): -+ while True: -+ try: -+ return self._sock.recv(size) -+ except socket.error, e: -+ if e.args[0] not in socket_errors_nonblocking: -+ raise -+ -+ def read(self, size=-1): -+ # Use max, disallow tiny reads in a loop as they are very inefficient. -+ # We never leave read() with any leftover data from a new recv() call -+ # in our internal buffer. -+ rbufsize = max(self._rbufsize, self.default_bufsize) -+ # Our use of StringIO rather than lists of string objects returned by -+ # recv() minimizes memory usage and fragmentation that occurs when -+ # rbufsize is large compared to the typical return value of recv(). -+ buf = self._rbuf -+ buf.seek(0, 2) # seek end -+ if size < 0: -+ # Read until EOF -+ self._rbuf = StringIO.StringIO() # reset _rbuf. we consume it via buf. -+ while True: -+ data = self.recv(rbufsize) -+ if not data: -+ break -+ buf.write(data) -+ return buf.getvalue() - else: -- recv_size = self._rbufsize -- -+ # Read until size bytes or EOF seen, whichever comes first -+ buf_len = buf.tell() -+ if buf_len >= size: -+ # Already have size bytes in our buffer? Extract and return. -+ buf.seek(0) -+ rv = buf.read(size) -+ self._rbuf = StringIO.StringIO() -+ self._rbuf.write(buf.read()) -+ return rv -+ -+ self._rbuf = StringIO.StringIO() # reset _rbuf. we consume it via buf. -+ while True: -+ left = size - buf_len -+ # recv() will malloc the amount of memory given as its -+ # parameter even though it often returns much less data -+ # than that. The returned data string is short lived -+ # as we copy it into a StringIO and free it. This avoids -+ # fragmentation issues on many platforms. -+ data = self.recv(left) -+ if not data: -+ break -+ n = len(data) -+ if n == size and not buf_len: -+ # Shortcut. Avoid buffer data copies when: -+ # - We have no data in our buffer. -+ # AND -+ # - Our call to recv returned exactly the -+ # number of bytes we were asked to read. -+ return data -+ if n == left: -+ buf.write(data) -+ del data # explicit free -+ break -+ assert n <= left, "recv(%d) returned %d bytes" % (left, n) -+ buf.write(data) -+ buf_len += n -+ del data # explicit free -+ #assert buf_len == buf.tell() -+ return buf.getvalue() -+ -+ def readline(self, size=-1): -+ buf = self._rbuf -+ buf.seek(0, 2) # seek end -+ if buf.tell() > 0: -+ # check if we already have it in our buffer -+ buf.seek(0) -+ bline = buf.readline(size) -+ if bline.endswith('\n') or len(bline) == size: -+ self._rbuf = StringIO.StringIO() -+ self._rbuf.write(buf.read()) -+ return bline -+ del bline -+ if size < 0: -+ # Read until \n or EOF, whichever comes first -+ if self._rbufsize <= 1: -+ # Speed up unbuffered case -+ buf.seek(0) -+ buffers = [buf.read()] -+ self._rbuf = StringIO.StringIO() # reset _rbuf. we consume it via buf. -+ data = None -+ recv = self.recv -+ while data != "\n": -+ data = recv(1) -+ if not data: -+ break -+ buffers.append(data) -+ return "".join(buffers) -+ -+ buf.seek(0, 2) # seek end -+ self._rbuf = StringIO.StringIO() # reset _rbuf. we consume it via buf. -+ while True: -+ data = self.recv(self._rbufsize) -+ if not data: -+ break -+ nl = data.find('\n') -+ if nl >= 0: -+ nl += 1 -+ buf.write(data[:nl]) -+ self._rbuf.write(data[nl:]) -+ del data -+ break -+ buf.write(data) -+ return buf.getvalue() -+ else: -+ # Read until size bytes or \n or EOF seen, whichever comes first -+ buf.seek(0, 2) # seek end -+ buf_len = buf.tell() -+ if buf_len >= size: -+ buf.seek(0) -+ rv = buf.read(size) -+ self._rbuf = StringIO.StringIO() -+ self._rbuf.write(buf.read()) -+ return rv -+ self._rbuf = StringIO.StringIO() # reset _rbuf. we consume it via buf. -+ while True: -+ data = self.recv(self._rbufsize) -+ if not data: -+ break -+ left = size - buf_len -+ # did we just receive a newline? -+ nl = data.find('\n', 0, left) -+ if nl >= 0: -+ nl += 1 -+ # save the excess data to _rbuf -+ self._rbuf.write(data[nl:]) -+ if buf_len: -+ buf.write(data[:nl]) -+ break -+ else: -+ # Shortcut. Avoid data copy through buf when returning -+ # a substring of our first recv(). -+ return data[:nl] -+ n = len(data) -+ if n == size and not buf_len: -+ # Shortcut. Avoid data copy through buf when -+ # returning exactly all of our first recv(). -+ return data -+ if n >= left: -+ buf.write(data[:left]) -+ self._rbuf.write(data[left:]) -+ break -+ buf.write(data) -+ buf_len += n -+ #assert buf_len == buf.tell() -+ return buf.getvalue() -+ -+else: -+ class CP_fileobject(socket._fileobject): -+ """Faux file object attached to a socket object.""" -+ -+ def sendall(self, data): -+ """Sendall for non-blocking sockets.""" -+ while data: -+ try: -+ bytes_sent = self.send(data) -+ data = data[bytes_sent:] -+ except socket.error, e: -+ if e.args[0] not in socket_errors_nonblocking: -+ raise -+ -+ def send(self, data): -+ return self._sock.send(data) -+ -+ def flush(self): -+ if self._wbuf: -+ buffer = "".join(self._wbuf) -+ self._wbuf = [] -+ self.sendall(buffer) -+ -+ def recv(self, size): - while True: -- data = self.recv(recv_size) -- if not data: -- break -- buffers.append(data) -- return "".join(buffers) -- else: -- # Read until size bytes or EOF seen, whichever comes first -- data = self._rbuf -- buf_len = len(data) -- if buf_len >= size: -- self._rbuf = data[size:] -- return data[:size] -- buffers = [] -- if data: -- buffers.append(data) -- self._rbuf = "" -- while True: -- left = size - buf_len -- recv_size = max(self._rbufsize, left) -- data = self.recv(recv_size) -- if not data: -- break -- buffers.append(data) -- n = len(data) -- if n >= left: -- self._rbuf = data[left:] -- buffers[-1] = data[:left] -- break -- buf_len += n -- return "".join(buffers) -+ try: -+ return self._sock.recv(size) -+ except socket.error, e: -+ if e.args[0] not in socket_errors_nonblocking: -+ raise - -- def readline(self, size=-1): -- data = self._rbuf -- if size < 0: -- # Read until \n or EOF, whichever comes first -- if self._rbufsize <= 1: -- # Speed up unbuffered case -- assert data == "" -+ def read(self, size=-1): -+ if size < 0: -+ # Read until EOF -+ buffers = [self._rbuf] -+ self._rbuf = "" -+ if self._rbufsize <= 1: -+ recv_size = self.default_bufsize -+ else: -+ recv_size = self._rbufsize -+ -+ while True: -+ data = self.recv(recv_size) -+ if not data: -+ break -+ buffers.append(data) -+ return "".join(buffers) -+ else: -+ # Read until size bytes or EOF seen, whichever comes first -+ data = self._rbuf -+ buf_len = len(data) -+ if buf_len >= size: -+ self._rbuf = data[size:] -+ return data[:size] - buffers = [] -- while data != "\n": -- data = self.recv(1) -+ if data: -+ buffers.append(data) -+ self._rbuf = "" -+ while True: -+ left = size - buf_len -+ recv_size = max(self._rbufsize, left) -+ data = self.recv(recv_size) - if not data: - break - buffers.append(data) -+ n = len(data) -+ if n >= left: -+ self._rbuf = data[left:] -+ buffers[-1] = data[:left] -+ break -+ buf_len += n - return "".join(buffers) -- nl = data.find('\n') -- if nl >= 0: -- nl += 1 -- self._rbuf = data[nl:] -- return data[:nl] -- buffers = [] -- if data: -- buffers.append(data) -- self._rbuf = "" -- while True: -- data = self.recv(self._rbufsize) -- if not data: -- break -- buffers.append(data) -+ -+ def readline(self, size=-1): -+ data = self._rbuf -+ if size < 0: -+ # Read until \n or EOF, whichever comes first -+ if self._rbufsize <= 1: -+ # Speed up unbuffered case -+ assert data == "" -+ buffers = [] -+ while data != "\n": -+ data = self.recv(1) -+ if not data: -+ break -+ buffers.append(data) -+ return "".join(buffers) - nl = data.find('\n') - if nl >= 0: - nl += 1 - self._rbuf = data[nl:] -- buffers[-1] = data[:nl] -- break -- return "".join(buffers) -- else: -- # Read until size bytes or \n or EOF seen, whichever comes first -- nl = data.find('\n', 0, size) -- if nl >= 0: -- nl += 1 -- self._rbuf = data[nl:] -- return data[:nl] -- buf_len = len(data) -- if buf_len >= size: -- self._rbuf = data[size:] -- return data[:size] -- buffers = [] -- if data: -- buffers.append(data) -- self._rbuf = "" -- while True: -- data = self.recv(self._rbufsize) -- if not data: -- break -- buffers.append(data) -- left = size - buf_len -- nl = data.find('\n', 0, left) -+ return data[:nl] -+ buffers = [] -+ if data: -+ buffers.append(data) -+ self._rbuf = "" -+ while True: -+ data = self.recv(self._rbufsize) -+ if not data: -+ break -+ buffers.append(data) -+ nl = data.find('\n') -+ if nl >= 0: -+ nl += 1 -+ self._rbuf = data[nl:] -+ buffers[-1] = data[:nl] -+ break -+ return "".join(buffers) -+ else: -+ # Read until size bytes or \n or EOF seen, whichever comes first -+ nl = data.find('\n', 0, size) - if nl >= 0: - nl += 1 - self._rbuf = data[nl:] -- buffers[-1] = data[:nl] -- break -- n = len(data) -- if n >= left: -- self._rbuf = data[left:] -- buffers[-1] = data[:left] -- break -- buf_len += n -- return "".join(buffers) -+ return data[:nl] -+ buf_len = len(data) -+ if buf_len >= size: -+ self._rbuf = data[size:] -+ return data[:size] -+ buffers = [] -+ if data: -+ buffers.append(data) -+ self._rbuf = "" -+ while True: -+ data = self.recv(self._rbufsize) -+ if not data: -+ break -+ buffers.append(data) -+ left = size - buf_len -+ nl = data.find('\n', 0, left) -+ if nl >= 0: -+ nl += 1 -+ self._rbuf = data[nl:] -+ buffers[-1] = data[:nl] -+ break -+ n = len(data) -+ if n >= left: -+ self._rbuf = data[left:] -+ buffers[-1] = data[:left] -+ break -+ buf_len += n -+ return "".join(buffers) - - - class SSL_fileobject(CP_fileobject): diff --git a/community/python-cherrypy/ChangeLog b/community/python-cherrypy/ChangeLog deleted file mode 100644 index 90276417c..000000000 --- a/community/python-cherrypy/ChangeLog +++ /dev/null @@ -1,26 +0,0 @@ - -2009-04-15 Douglas Soares de Andrade <douglas@archlinux.org> - - * Updated for i686: 3.1.2 - -2008-12-14 Douglas Soares de Andrade <douglas@archlinux.org> - - * Updated for i686: 3.1.1 - -2008-11-04 Douglas Soares de Andrade <douglas@archlinux.org> - - * Updated for python 2.6 - * Thanks to David Moore - -2008-07-09 Mateusz Herych <heniekk@gmail.com> - - * Updating for x86_64: 3.1.0 - -2008-07-09 Douglas Soares de Andrade <douglas@archlinux.org> - - * Updating for i686: 3.1.0 - -2008-02-28 Douglas Soares de Andrade <dsa@aur.archlinux.org> - - * Updating in i686: 3.0.3 - diff --git a/community/python-cherrypy/PKGBUILD b/community/python-cherrypy/PKGBUILD deleted file mode 100644 index 7ef14f07d..000000000 --- a/community/python-cherrypy/PKGBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# $Id: PKGBUILD 45860 2011-04-30 05:41:24Z kchen $ -# Maintainer: Angel Velasquez <angvp@archlinux.org> -# Contributor: Kaiting Chen <kaitocracy@gmail.com> -# Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> -# Contributor: Armando M. Baratti <amblistas@ajato.com.br> -# Contributor: Florian Richter <Florian_Richter@gmx.de> -pkgname=python-cherrypy -pkgver=3.2.0 -pkgrel=1 -pkgdesc="A pythonic, object-oriented web development framework" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.cherrypy.org" -license=('BSD') -depends=('python3') -source=(http://download.cherrypy.org/cherrypy/$pkgver/CherryPy-$pkgver.tar.gz - license) -md5sums=('e5c1322bf5ce962c16283ab7a6dcca3f' - '22365dc6b0e6835b53da009aa36af017') - -build() { - cd $srcdir/CherryPy-$pkgver - python ./setup.py install --root=$pkgdir - install -D -m644 $srcdir/license $pkgdir/usr/share/licenses/$pkgname/license -} diff --git a/community/python-cherrypy/license b/community/python-cherrypy/license deleted file mode 100644 index 32e9cf6bd..000000000 --- a/community/python-cherrypy/license +++ /dev/null @@ -1,25 +0,0 @@ -Copyright (c) 2004, CherryPy Team (team@cherrypy.org) -All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, -are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of the CherryPy Team nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/community/python-gnutls/PKGBUILD b/community/python-gnutls/PKGBUILD index 9c8c0296d..2542cf2dc 100644 --- a/community/python-gnutls/PKGBUILD +++ b/community/python-gnutls/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 50668 2011-06-29 11:39:49Z spupykin $ +# $Id: PKGBUILD 56532 2011-10-07 21:32:13Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Hugo Doria <hugo@archlinux.org> # Contributor: N3RD3X <n3rd3x@linuxmail.org> pkgname=python-gnutls -pkgver=1.2.1 -pkgrel=2 +pkgver=1.2.2 +pkgrel=1 pkgdesc="Python wrapper for the GNUTLS library" arch=('i686' 'x86_64' 'mips64el') url="http://cheeseshop.python.org/pypi/python-gnutls" depends=('python2' 'gnutls') license=('LGPL') source=(http://pypi.python.org/packages/source/p/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('b02d29b47830bbd8aec0b13206c2800e') +md5sums=('1ca32b3e2d22ca33a15222191efc04aa') build() { cd ${srcdir}/${pkgname}-${pkgver} - sed -i "s|openpgp_\(privkey_sign_hash\)|\1|g" gnutls/library/functions.py +# sed -i "s|openpgp_\(privkey_sign_hash\)|\1|g" gnutls/library/functions.py python2 setup.py install --root=${pkgdir} } diff --git a/community/python-pexpect/PKGBUILD b/community/python-pexpect/PKGBUILD deleted file mode 100644 index 49ec5c17c..000000000 --- a/community/python-pexpect/PKGBUILD +++ /dev/null @@ -1,21 +0,0 @@ -# Maintainer: Aaron Schaefer <aaron@elasticdog.com> -pkgname=python-pexpect -pkgver=2.3 -pkgrel=4 -pkgdesc='A pure Python Expect-like module' -arch=('i686' 'x86_64' 'mips64el') -url='http://pexpect.sourceforge.net/' -license=('MIT') -depends=('python2') -source=("http://downloads.sourceforge.net/sourceforge/pexpect/pexpect-$pkgver.tar.gz") -md5sums=('bf107cf54e67bc6dec5bea1f3e6a65c3') - -build() { - cd $srcdir/pexpect-$pkgver - - # python2 fix - sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' FSM.py - - python2 setup.py install --root=$pkgdir - install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE -} diff --git a/community/python-pyro/ChangeLog b/community/python-pyro/ChangeLog index 7152cb3db..aa691dd88 100644 --- a/community/python-pyro/ChangeLog +++ b/community/python-pyro/ChangeLog @@ -1,3 +1,8 @@ +2011-10-07 Angel Velasquez <angvp@archlinux.org> + * updated to 4.9 + * Adding support for python 3 + * Splitted PKGBUILD + 2010-01-12 Andrea Scarpino <andrea@archlinux.org> * update package: 3.10 diff --git a/community/python-pyro/PKGBUILD b/community/python-pyro/PKGBUILD index 70418c94d..c978da9a2 100755 --- a/community/python-pyro/PKGBUILD +++ b/community/python-pyro/PKGBUILD @@ -1,25 +1,28 @@ -# $Id: PKGBUILD 26298 2010-09-14 17:18:19Z schuay $ +# $Id: PKGBUILD 56634 2011-10-09 10:13:09Z angvp $ +# Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.br> - -pkgname=python-pyro -pkgver=3.10 -pkgrel=2 +pkgbase=python-pyro +pkgname=('python-pyro' 'python2-pyro') +pkgver=4.9 +pkgrel=1 pkgdesc="Python Remote Objects" -url="http://pyro.sourceforge.net" +url="http://irmen.home.xs4all.nl/pyro/" arch=('i686' 'x86_64' 'mips64el') license=('MIT') -depends=('python2') -source=(http://www.xs4all.nl/~irmen/pyro3/download/Pyro-${pkgver}.tar.gz) -md5sums=('7fc6b8b939073d4adb0e8939c59aaf1e') - -build() { - cd $srcdir/Pyro-${pkgver} +depends=('python' 'python2') +source=(http://pypi.python.org/packages/source/P/Pyro4/Pyro4-${pkgver}.tar.gz) +md5sums=('00bf604303898ee920975a8ddd76bae1') - # python2 fix - for file in Pyro/wxnsc.py Pyro/ext/daemonizer.py; do - sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file - done +package_python-pyro() { + depends=('python') + cd $srcdir/Pyro4-${pkgver} + python setup.py install --root=$pkgdir + install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE +} +package_python2-pyro() { + depends=('python2') + cd $srcdir/Pyro4-${pkgver} python2 setup.py install --root=$pkgdir install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE } diff --git a/community/python-pyxmpp/PKGBUILD b/community/python-pyxmpp/PKGBUILD index dacd3827e..bc07b6259 100644 --- a/community/python-pyxmpp/PKGBUILD +++ b/community/python-pyxmpp/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 26298 2010-09-14 17:18:19Z schuay $ +# $Id: PKGBUILD 56515 2011-10-07 20:09:45Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> pkgname=python-pyxmpp -pkgver=1.1.1 -pkgrel=2 +pkgver=1.1.2 +pkgrel=1 pkgdesc="A Python XMPP and Jabber implementation based on libxml2" arch=('i686' 'x86_64' 'mips64el') url="http://pyxmpp.jajcus.net/" license=('LGPL') depends=('python-dnspython' 'libxml2' 'python-m2crypto') source=(http://pyxmpp.jajcus.net/downloads/pyxmpp-$pkgver.tar.gz) -md5sums=('5f1f5472c3e2360fa49552cc49861bd4') +md5sums=('a38abf032aca0408b6055cd94296eb75') build() { cd $startdir/src/pyxmpp-$pkgver diff --git a/community/python-cheetah/PKGBUILD b/community/python2-cheetah/PKGBUILD index 2d8dc25e1..fd6ebf4ed 100755 --- a/community/python-cheetah/PKGBUILD +++ b/community/python2-cheetah/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 40317 2011-02-22 19:44:06Z foutrelis $ +# $Id: PKGBUILD 56977 2011-10-17 13:24:23Z jelle $ # Contributor: James Rayner <james@archlinux.org> # Contributor: Todd Maynard <arch@toddmaynard.com> -pkgname=python-cheetah +pkgname=python2-cheetah pkgver=2.4.4 -pkgrel=2 +pkgrel=3 pkgdesc="A Python-powered template engine and code generator" arch=('i686' 'x86_64' 'mips64el') url="http://www.cheetahtemplate.org/" @@ -12,8 +12,8 @@ license=('custom') depends=('python2' 'python-markdown') makedepends=('python2-distribute') optdepends=('python2-pygments: for the CodeHighlighter filter') -provides=('cheetah') -conflicts=('cheetah') +provides=('cheetah' 'python-cheetah') +conflicts=('cheetah' 'python-cheetah') source=(http://pypi.python.org/packages/source/C/Cheetah/Cheetah-${pkgver}.tar.gz) md5sums=('853917116e731afbc8c8a43c37e6ddba') diff --git a/community/python2-cherrypy/837.2049.patch b/community/python2-cherrypy/837.2049.patch deleted file mode 100644 index 20cc0dd36..000000000 --- a/community/python2-cherrypy/837.2049.patch +++ /dev/null @@ -1,554 +0,0 @@ -Index: cherrypy/test/test_tools.py -=================================================================== ---- cherrypy/test/test_tools.py (revision 2049) -+++ cherrypy/test/test_tools.py (working copy) -@@ -3,6 +3,7 @@ - import gzip - import StringIO - import sys -+from httplib import IncompleteRead - import time - timeout = 0.2 - -@@ -272,8 +273,12 @@ - # Because this error is raised after the response body has - # started, and because it's chunked output, an error is raised by - # the HTTP client when it encounters incomplete output. -- self.assertRaises(ValueError, self.getPage, -- "/demo/errinstream?id=5") -+ if sys.version_info[:2] >= (2, 6): -+ self.assertRaises(IncompleteRead, self.getPage, -+ "/demo/errinstream?id=5") -+ else: -+ self.assertRaises(ValueError, self.getPage, -+ "/demo/errinstream?id=5") - # If this fails, then on_end_request isn't being called at all. - time.sleep(0.1) - self.getPage("/demo/ended/5") -Index: cherrypy/test/webtest.py -=================================================================== ---- cherrypy/test/webtest.py (revision 2049) -+++ cherrypy/test/webtest.py (working copy) -@@ -491,7 +491,7 @@ - # IN6ADDR_ANY, which should respond on localhost. - host = "::1" - conn = http_conn(host, port) -- -+ - conn._http_vsn_str = protocol - conn._http_vsn = int("".join([x for x in protocol if x.isdigit()])) - -Index: cherrypy/test/test_encoding.py -=================================================================== ---- cherrypy/test/test_encoding.py (revision 2049) -+++ cherrypy/test/test_encoding.py (working copy) -@@ -1,7 +1,9 @@ - from cherrypy.test import test - test.prefer_parent_path() - -+import sys - import gzip, StringIO -+from httplib import IncompleteRead - import cherrypy - europoundUnicode = u'\x80\xa3' - europoundUtf8 = u'\x80\xa3'.encode('utf-8') -@@ -160,10 +162,13 @@ - else: - # The wsgiserver will simply stop sending data, and the HTTP client - # will error due to an incomplete chunk-encoded stream. -- self.assertRaises(ValueError, self.getPage, '/gzip/noshow_stream', -- headers=[("Accept-Encoding", "gzip")]) -+ if sys.version_info[:2] >= (2, 6): -+ self.assertRaises(IncompleteRead, self.getPage, '/gzip/noshow_stream', -+ headers=[("Accept-Encoding", "gzip")]) -+ else: -+ self.assertRaises(ValueError, self.getPage, '/gzip/noshow_stream', -+ headers=[("Accept-Encoding", "gzip")]) - -- - if __name__ == "__main__": - setup_server() - helper.testmain() -Index: cherrypy/test/test_core.py -=================================================================== ---- cherrypy/test/test_core.py (revision 2049) -+++ cherrypy/test/test_core.py (working copy) -@@ -7,6 +7,7 @@ - localDir = os.path.dirname(__file__) - import sys - import types -+from httplib import IncompleteRead - - import cherrypy - from cherrypy import _cptools, tools -@@ -760,8 +761,12 @@ - else: - # Under HTTP/1.1, the chunked transfer-coding is used. - # The HTTP client will choke when the output is incomplete. -- self.assertRaises(ValueError, self.getPage, -- "/error/page_streamed") -+ if sys.version_info[:2] >= (2, 6): -+ self.assertRaises(IncompleteRead, self.getPage, -+ "/error/page_streamed") -+ else: -+ self.assertRaises(ValueError, self.getPage, -+ "/error/page_streamed") - - # No traceback should be present - self.getPage("/error/cause_err_in_finalize") -Index: cherrypy/wsgiserver/__init__.py -=================================================================== ---- cherrypy/wsgiserver/__init__.py (revision 2049) -+++ cherrypy/wsgiserver/__init__.py (working copy) -@@ -713,148 +713,325 @@ - """Exception raised when the SSL implementation signals a fatal alert.""" - pass - -+if sys.version_info[:2] >= (2, 6) or sys.version_info[:3] >= (2, 5, 2): -+ class CP_fileobject(socket._fileobject): -+ """Faux file object attached to a socket object.""" - --class CP_fileobject(socket._fileobject): -- """Faux file object attached to a socket object.""" -- -- def sendall(self, data): -- """Sendall for non-blocking sockets.""" -- while data: -- try: -- bytes_sent = self.send(data) -- data = data[bytes_sent:] -- except socket.error, e: -- if e.args[0] not in socket_errors_nonblocking: -- raise -- -- def send(self, data): -- return self._sock.send(data) -- -- def flush(self): -- if self._wbuf: -- buffer = "".join(self._wbuf) -- self._wbuf = [] -- self.sendall(buffer) -- -- def recv(self, size): -- while True: -- try: -- return self._sock.recv(size) -- except socket.error, e: -- if e.args[0] not in socket_errors_nonblocking: -- raise -- -- def read(self, size=-1): -- if size < 0: -- # Read until EOF -- buffers = [self._rbuf] -- self._rbuf = "" -- if self._rbufsize <= 1: -- recv_size = self.default_bufsize -+ def sendall(self, data): -+ """Sendall for non-blocking sockets.""" -+ while data: -+ try: -+ bytes_sent = self.send(data) -+ data = data[bytes_sent:] -+ except socket.error, e: -+ if e.args[0] not in socket_errors_nonblocking: -+ raise -+ -+ def send(self, data): -+ return self._sock.send(data) -+ -+ def flush(self): -+ if self._wbuf: -+ buffer = "".join(self._wbuf) -+ self._wbuf = [] -+ self.sendall(buffer) -+ -+ def recv(self, size): -+ while True: -+ try: -+ return self._sock.recv(size) -+ except socket.error, e: -+ if e.args[0] not in socket_errors_nonblocking: -+ raise -+ -+ def read(self, size=-1): -+ # Use max, disallow tiny reads in a loop as they are very inefficient. -+ # We never leave read() with any leftover data from a new recv() call -+ # in our internal buffer. -+ rbufsize = max(self._rbufsize, self.default_bufsize) -+ # Our use of StringIO rather than lists of string objects returned by -+ # recv() minimizes memory usage and fragmentation that occurs when -+ # rbufsize is large compared to the typical return value of recv(). -+ buf = self._rbuf -+ buf.seek(0, 2) # seek end -+ if size < 0: -+ # Read until EOF -+ self._rbuf = StringIO.StringIO() # reset _rbuf. we consume it via buf. -+ while True: -+ data = self.recv(rbufsize) -+ if not data: -+ break -+ buf.write(data) -+ return buf.getvalue() - else: -- recv_size = self._rbufsize -- -+ # Read until size bytes or EOF seen, whichever comes first -+ buf_len = buf.tell() -+ if buf_len >= size: -+ # Already have size bytes in our buffer? Extract and return. -+ buf.seek(0) -+ rv = buf.read(size) -+ self._rbuf = StringIO.StringIO() -+ self._rbuf.write(buf.read()) -+ return rv -+ -+ self._rbuf = StringIO.StringIO() # reset _rbuf. we consume it via buf. -+ while True: -+ left = size - buf_len -+ # recv() will malloc the amount of memory given as its -+ # parameter even though it often returns much less data -+ # than that. The returned data string is short lived -+ # as we copy it into a StringIO and free it. This avoids -+ # fragmentation issues on many platforms. -+ data = self.recv(left) -+ if not data: -+ break -+ n = len(data) -+ if n == size and not buf_len: -+ # Shortcut. Avoid buffer data copies when: -+ # - We have no data in our buffer. -+ # AND -+ # - Our call to recv returned exactly the -+ # number of bytes we were asked to read. -+ return data -+ if n == left: -+ buf.write(data) -+ del data # explicit free -+ break -+ assert n <= left, "recv(%d) returned %d bytes" % (left, n) -+ buf.write(data) -+ buf_len += n -+ del data # explicit free -+ #assert buf_len == buf.tell() -+ return buf.getvalue() -+ -+ def readline(self, size=-1): -+ buf = self._rbuf -+ buf.seek(0, 2) # seek end -+ if buf.tell() > 0: -+ # check if we already have it in our buffer -+ buf.seek(0) -+ bline = buf.readline(size) -+ if bline.endswith('\n') or len(bline) == size: -+ self._rbuf = StringIO.StringIO() -+ self._rbuf.write(buf.read()) -+ return bline -+ del bline -+ if size < 0: -+ # Read until \n or EOF, whichever comes first -+ if self._rbufsize <= 1: -+ # Speed up unbuffered case -+ buf.seek(0) -+ buffers = [buf.read()] -+ self._rbuf = StringIO.StringIO() # reset _rbuf. we consume it via buf. -+ data = None -+ recv = self.recv -+ while data != "\n": -+ data = recv(1) -+ if not data: -+ break -+ buffers.append(data) -+ return "".join(buffers) -+ -+ buf.seek(0, 2) # seek end -+ self._rbuf = StringIO.StringIO() # reset _rbuf. we consume it via buf. -+ while True: -+ data = self.recv(self._rbufsize) -+ if not data: -+ break -+ nl = data.find('\n') -+ if nl >= 0: -+ nl += 1 -+ buf.write(data[:nl]) -+ self._rbuf.write(data[nl:]) -+ del data -+ break -+ buf.write(data) -+ return buf.getvalue() -+ else: -+ # Read until size bytes or \n or EOF seen, whichever comes first -+ buf.seek(0, 2) # seek end -+ buf_len = buf.tell() -+ if buf_len >= size: -+ buf.seek(0) -+ rv = buf.read(size) -+ self._rbuf = StringIO.StringIO() -+ self._rbuf.write(buf.read()) -+ return rv -+ self._rbuf = StringIO.StringIO() # reset _rbuf. we consume it via buf. -+ while True: -+ data = self.recv(self._rbufsize) -+ if not data: -+ break -+ left = size - buf_len -+ # did we just receive a newline? -+ nl = data.find('\n', 0, left) -+ if nl >= 0: -+ nl += 1 -+ # save the excess data to _rbuf -+ self._rbuf.write(data[nl:]) -+ if buf_len: -+ buf.write(data[:nl]) -+ break -+ else: -+ # Shortcut. Avoid data copy through buf when returning -+ # a substring of our first recv(). -+ return data[:nl] -+ n = len(data) -+ if n == size and not buf_len: -+ # Shortcut. Avoid data copy through buf when -+ # returning exactly all of our first recv(). -+ return data -+ if n >= left: -+ buf.write(data[:left]) -+ self._rbuf.write(data[left:]) -+ break -+ buf.write(data) -+ buf_len += n -+ #assert buf_len == buf.tell() -+ return buf.getvalue() -+ -+else: -+ class CP_fileobject(socket._fileobject): -+ """Faux file object attached to a socket object.""" -+ -+ def sendall(self, data): -+ """Sendall for non-blocking sockets.""" -+ while data: -+ try: -+ bytes_sent = self.send(data) -+ data = data[bytes_sent:] -+ except socket.error, e: -+ if e.args[0] not in socket_errors_nonblocking: -+ raise -+ -+ def send(self, data): -+ return self._sock.send(data) -+ -+ def flush(self): -+ if self._wbuf: -+ buffer = "".join(self._wbuf) -+ self._wbuf = [] -+ self.sendall(buffer) -+ -+ def recv(self, size): - while True: -- data = self.recv(recv_size) -- if not data: -- break -- buffers.append(data) -- return "".join(buffers) -- else: -- # Read until size bytes or EOF seen, whichever comes first -- data = self._rbuf -- buf_len = len(data) -- if buf_len >= size: -- self._rbuf = data[size:] -- return data[:size] -- buffers = [] -- if data: -- buffers.append(data) -- self._rbuf = "" -- while True: -- left = size - buf_len -- recv_size = max(self._rbufsize, left) -- data = self.recv(recv_size) -- if not data: -- break -- buffers.append(data) -- n = len(data) -- if n >= left: -- self._rbuf = data[left:] -- buffers[-1] = data[:left] -- break -- buf_len += n -- return "".join(buffers) -+ try: -+ return self._sock.recv(size) -+ except socket.error, e: -+ if e.args[0] not in socket_errors_nonblocking: -+ raise - -- def readline(self, size=-1): -- data = self._rbuf -- if size < 0: -- # Read until \n or EOF, whichever comes first -- if self._rbufsize <= 1: -- # Speed up unbuffered case -- assert data == "" -+ def read(self, size=-1): -+ if size < 0: -+ # Read until EOF -+ buffers = [self._rbuf] -+ self._rbuf = "" -+ if self._rbufsize <= 1: -+ recv_size = self.default_bufsize -+ else: -+ recv_size = self._rbufsize -+ -+ while True: -+ data = self.recv(recv_size) -+ if not data: -+ break -+ buffers.append(data) -+ return "".join(buffers) -+ else: -+ # Read until size bytes or EOF seen, whichever comes first -+ data = self._rbuf -+ buf_len = len(data) -+ if buf_len >= size: -+ self._rbuf = data[size:] -+ return data[:size] - buffers = [] -- while data != "\n": -- data = self.recv(1) -+ if data: -+ buffers.append(data) -+ self._rbuf = "" -+ while True: -+ left = size - buf_len -+ recv_size = max(self._rbufsize, left) -+ data = self.recv(recv_size) - if not data: - break - buffers.append(data) -+ n = len(data) -+ if n >= left: -+ self._rbuf = data[left:] -+ buffers[-1] = data[:left] -+ break -+ buf_len += n - return "".join(buffers) -- nl = data.find('\n') -- if nl >= 0: -- nl += 1 -- self._rbuf = data[nl:] -- return data[:nl] -- buffers = [] -- if data: -- buffers.append(data) -- self._rbuf = "" -- while True: -- data = self.recv(self._rbufsize) -- if not data: -- break -- buffers.append(data) -+ -+ def readline(self, size=-1): -+ data = self._rbuf -+ if size < 0: -+ # Read until \n or EOF, whichever comes first -+ if self._rbufsize <= 1: -+ # Speed up unbuffered case -+ assert data == "" -+ buffers = [] -+ while data != "\n": -+ data = self.recv(1) -+ if not data: -+ break -+ buffers.append(data) -+ return "".join(buffers) - nl = data.find('\n') - if nl >= 0: - nl += 1 - self._rbuf = data[nl:] -- buffers[-1] = data[:nl] -- break -- return "".join(buffers) -- else: -- # Read until size bytes or \n or EOF seen, whichever comes first -- nl = data.find('\n', 0, size) -- if nl >= 0: -- nl += 1 -- self._rbuf = data[nl:] -- return data[:nl] -- buf_len = len(data) -- if buf_len >= size: -- self._rbuf = data[size:] -- return data[:size] -- buffers = [] -- if data: -- buffers.append(data) -- self._rbuf = "" -- while True: -- data = self.recv(self._rbufsize) -- if not data: -- break -- buffers.append(data) -- left = size - buf_len -- nl = data.find('\n', 0, left) -+ return data[:nl] -+ buffers = [] -+ if data: -+ buffers.append(data) -+ self._rbuf = "" -+ while True: -+ data = self.recv(self._rbufsize) -+ if not data: -+ break -+ buffers.append(data) -+ nl = data.find('\n') -+ if nl >= 0: -+ nl += 1 -+ self._rbuf = data[nl:] -+ buffers[-1] = data[:nl] -+ break -+ return "".join(buffers) -+ else: -+ # Read until size bytes or \n or EOF seen, whichever comes first -+ nl = data.find('\n', 0, size) - if nl >= 0: - nl += 1 - self._rbuf = data[nl:] -- buffers[-1] = data[:nl] -- break -- n = len(data) -- if n >= left: -- self._rbuf = data[left:] -- buffers[-1] = data[:left] -- break -- buf_len += n -- return "".join(buffers) -+ return data[:nl] -+ buf_len = len(data) -+ if buf_len >= size: -+ self._rbuf = data[size:] -+ return data[:size] -+ buffers = [] -+ if data: -+ buffers.append(data) -+ self._rbuf = "" -+ while True: -+ data = self.recv(self._rbufsize) -+ if not data: -+ break -+ buffers.append(data) -+ left = size - buf_len -+ nl = data.find('\n', 0, left) -+ if nl >= 0: -+ nl += 1 -+ self._rbuf = data[nl:] -+ buffers[-1] = data[:nl] -+ break -+ n = len(data) -+ if n >= left: -+ self._rbuf = data[left:] -+ buffers[-1] = data[:left] -+ break -+ buf_len += n -+ return "".join(buffers) - - - class SSL_fileobject(CP_fileobject): diff --git a/community/python2-cherrypy/ChangeLog b/community/python2-cherrypy/ChangeLog deleted file mode 100644 index 90276417c..000000000 --- a/community/python2-cherrypy/ChangeLog +++ /dev/null @@ -1,26 +0,0 @@ - -2009-04-15 Douglas Soares de Andrade <douglas@archlinux.org> - - * Updated for i686: 3.1.2 - -2008-12-14 Douglas Soares de Andrade <douglas@archlinux.org> - - * Updated for i686: 3.1.1 - -2008-11-04 Douglas Soares de Andrade <douglas@archlinux.org> - - * Updated for python 2.6 - * Thanks to David Moore - -2008-07-09 Mateusz Herych <heniekk@gmail.com> - - * Updating for x86_64: 3.1.0 - -2008-07-09 Douglas Soares de Andrade <douglas@archlinux.org> - - * Updating for i686: 3.1.0 - -2008-02-28 Douglas Soares de Andrade <dsa@aur.archlinux.org> - - * Updating in i686: 3.0.3 - diff --git a/community/python2-cherrypy/PKGBUILD b/community/python2-cherrypy/PKGBUILD deleted file mode 100644 index 8ab94f0c9..000000000 --- a/community/python2-cherrypy/PKGBUILD +++ /dev/null @@ -1,25 +0,0 @@ -# $Id: PKGBUILD 45860 2011-04-30 05:41:24Z kchen $ -# Maintainer: Angel Velasquez <angvp@archlinux.org> -# Contributor: Kaiting Chen <kaitocracy@gmail.com> -# Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> -# Contributor: Armando M. Baratti <amblistas@ajato.com.br> -# Contributor: Florian Richter <Florian_Richter@gmx.de> -pkgname=python2-cherrypy -pkgver=3.2.0 -pkgrel=1 -pkgdesc="A pythonic, object-oriented web development framework" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.cherrypy.org" -license=('BSD') -replaces=('cherrypy') -depends=('python2') -source=(http://download.cherrypy.org/cherrypy/$pkgver/CherryPy-$pkgver.tar.gz - license) -md5sums=('e5c1322bf5ce962c16283ab7a6dcca3f' - '22365dc6b0e6835b53da009aa36af017') - -build() { - cd $srcdir/CherryPy-$pkgver - python2 ./setup.py install --root=$pkgdir - install -D -m644 $srcdir/license $pkgdir/usr/share/licenses/$pkgname/license -} diff --git a/community/python2-cherrypy/license b/community/python2-cherrypy/license deleted file mode 100644 index 32e9cf6bd..000000000 --- a/community/python2-cherrypy/license +++ /dev/null @@ -1,25 +0,0 @@ -Copyright (c) 2004, CherryPy Team (team@cherrypy.org) -All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, -are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of the CherryPy Team nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/community/python2-matplotlib/PKGBUILD b/community/python2-matplotlib/PKGBUILD index 842c480fb..45a512959 100644 --- a/community/python2-matplotlib/PKGBUILD +++ b/community/python2-matplotlib/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 40554 2011-02-25 11:55:09Z stephane $ +# $Id: PKGBUILD 56824 2011-10-13 21:31:09Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> pkgname=python2-matplotlib -pkgver=1.0.1 -pkgrel=2 +pkgver=1.1.0 +pkgrel=1 pkgdesc="A python plotting library, making publication quality plots" arch=('i686' 'x86_64' 'mips64el') url="http://matplotlib.sourceforge.net/" backup=(usr/lib/python2.7/site-packages/matplotlib/mpl-data/matplotlibrc) -depends=('python-dateutil' 'python2-pytz' 'python2-numpy' 'python2-pyparsing' 'python2-qt') +depends=('python2-dateutil' 'python2-pytz' 'python2-numpy' 'python2-pyparsing' 'python2-qt') optdepends=('pygtk: for use with the GTK or GTKAgg backend' 'tk: used by the TkAgg backend' 'wxpython: for use with the WXAgg backend') @@ -21,7 +21,7 @@ replaces=('python-matplotlib') conflicts=('python-matplotlib') source=("http://downloads.sourceforge.net/matplotlib/matplotlib-${pkgver}.tar.gz" setup.cfg) -sha1sums=('c7a832f28a66817626e7a8af21e14ea0e15f4008' +sha1sums=('435b4f04a7e099b79f66451d69ad0b5ce66030ae' 'bcb5a83db9d95c96a57ca518fa6bd1897b23558f') license=('custom') @@ -48,5 +48,5 @@ package() { python2 setup.py install -O1 --skip-build --root "${pkgdir}" --prefix=/usr install -dm755 "${pkgdir}/usr/share/licenses/${pkgname}" - mv license "${pkgdir}/usr/share/licenses/${pkgname}" + install -m 644 doc/users/license.rst "${pkgdir}/usr/share/licenses/${pkgname}" } diff --git a/community/python2-poppler/PKGBUILD b/community/python2-poppler/PKGBUILD index dbcca36f1..4d33bd215 100644 --- a/community/python2-poppler/PKGBUILD +++ b/community/python2-poppler/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 42185 2011-03-15 10:57:39Z jelle $ +# $Id: PKGBUILD 56953 2011-10-17 08:21:15Z ibiru $ # Maintainer: Ray Rashif <schiv@archlinux.org # Contributor: György Balló <ballogy@freestart.hu> pkgname=python2-poppler _realname=pypoppler pkgver=0.12.1 -pkgrel=4 +pkgrel=5 pkgdesc="Python 2.x bindings for Poppler" arch=('i686' 'x86_64' 'mips64el') url="https://launchpad.net/poppler-python" license=('GPL') -depends=('pygtk' 'poppler-glib') +depends=('pygtk' 'poppler-glib' 'glib2' 'freetype2') provides=('pypoppler' 'python-poppler') conflicts=('python-poppler') replaces=('python-poppler') -options=(!libtool force) +options=(!libtool) source=(http://launchpad.net/poppler-python/trunk/development/+download/$_realname-$pkgver.tar.gz pypoppler-0.12.1-poppler-0.16.0.patch) md5sums=('1a89e5ed3042afc81bbd4d02e0cf640a' diff --git a/community/qbittorrent/PKGBUILD b/community/qbittorrent/PKGBUILD index 39299f5a9..444494714 100644 --- a/community/qbittorrent/PKGBUILD +++ b/community/qbittorrent/PKGBUILD @@ -3,8 +3,8 @@ # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> pkgname=qbittorrent -pkgver=2.8.5 -pkgrel=2 +pkgver=2.9.0 +pkgrel=1 pkgdesc="A bittorrent client written in C++ / Qt4 using the good libtorrent library" arch=('i686' 'x86_64' 'mips64el') url="http://www.qbittorrent.org/" @@ -15,7 +15,7 @@ optdepends=('python2: needed for search' 'geoip: improves peer country resolution') install='qbittorrent.install' source=("http://downloads.sourceforge.net/sourceforge/qbittorrent/qbittorrent-${pkgver}.tar.gz") -md5sums=('5f081231537d53e4295483eb9a8f94b1') +md5sums=('a13e199ebbc3411688683e587814d6aa') build() { cd qbittorrent-${pkgver} diff --git a/community/qemu-launcher/PKGBUILD b/community/qemu-launcher/PKGBUILD index af43be222..076b51b3d 100644 --- a/community/qemu-launcher/PKGBUILD +++ b/community/qemu-launcher/PKGBUILD @@ -5,7 +5,7 @@ pkgname=qemu-launcher pkgver=1.7.4 pkgrel=2 pkgdesc="GNOME/Gtk front-end for the Qemu x86 PC emulator" -url="http://emeitner.f2o.org/qemu_launcher" +url="http://gna.org/projects/qemulaunch" license=('GPL') arch=('i686' 'x86_64' 'mips64el') source=(http://download.gna.org/qemulaunch/1.7.x/${pkgname}_$pkgver.tar.gz) diff --git a/community/qgo/qgo-gcc43-iostream.patch b/community/qgo/qgo-gcc43-iostream.patch deleted file mode 100644 index 6cd9fc1ec..000000000 --- a/community/qgo/qgo-gcc43-iostream.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- qgo-1.5.4/src/matrix.cpp.orig 2008-02-15 16:47:04.000000000 -0500 -+++ qgo-1.5.4/src/matrix.cpp 2008-02-15 16:47:58.000000000 -0500 -@@ -5,7 +5,10 @@ - #include "matrix.h" - #include <stdlib.h> - #ifndef NO_DEBUG --#include <iostream.h> -+#include <iostream> -+ -+using namespace std; -+ - #endif - - Matrix::Matrix(int s) ---- qgo-1.5.4/src/tree.cpp.orig 2008-02-15 17:01:49.000000000 -0500 -+++ qgo-1.5.4/src/tree.cpp 2008-02-15 17:03:06.000000000 -0500 -@@ -5,7 +5,10 @@ - #include "tree.h" - #include "move.h" - #include "qgo.h" --#include <iostream.h> -+#include <iostream> -+ -+using namespace std; -+ - #include <qptrstack.h> - - Tree::Tree(int board_size) diff --git a/community/qlandkartegt/PKGBUILD b/community/qlandkartegt/PKGBUILD index e78990bea..c43e11098 100644 --- a/community/qlandkartegt/PKGBUILD +++ b/community/qlandkartegt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 55314 2011-09-09 20:35:12Z jlichtblau $ +# $Id: PKGBUILD 56621 2011-10-09 07:51:45Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Matthias Maennich <arch@maennich.net> # Contributor: <boenki@gmx.de> pkgname=qlandkartegt -pkgver=1.2.3 +pkgver=1.2.4 pkgrel=1 pkgdesc="Use your GPS with Linux" arch=('i686' 'x86_64' 'mips64el') @@ -17,7 +17,7 @@ install=$pkgname.install changelog=$pkgname.changelog source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz $pkgname-mimetypes.xml) -sha256sums=('d3b676f6a9f14e18eadc2c18de743a666b70b9ba28f2b6772c9484e277e03be8' +sha256sums=('3f87667ceffde60a7c533df7e25f375793a093970d89bfa1cd842b3595c58f2c' 'e8d33948831f8a66edd752c71c653085d6c4d9f1969e70dd8c40b9c7ca37fba0') build() { diff --git a/community/qlandkartegt/qlandkartegt.changelog b/community/qlandkartegt/qlandkartegt.changelog index 4e71ad105..531d2ebe5 100644 --- a/community/qlandkartegt/qlandkartegt.changelog +++ b/community/qlandkartegt/qlandkartegt.changelog @@ -1,3 +1,6 @@ +2011-10-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * qlandkartegt 1.2.4-1 + 2011-09-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * qlandkartegt 1.2.3-1 diff --git a/community/qmmp/PKGBUILD b/community/qmmp/PKGBUILD index bd67d6036..d366771fc 100644 --- a/community/qmmp/PKGBUILD +++ b/community/qmmp/PKGBUILD @@ -1,8 +1,8 @@ -#$Id: PKGBUILD 52220 2011-07-21 20:27:20Z jlichtblau $ +#$Id: PKGBUILD 56625 2011-10-09 08:59:56Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> pkgname=qmmp -pkgver=0.5.1 +pkgver=0.5.2 pkgrel=1 pkgdesc="Qt4 based audio-player" arch=('i686' 'x86_64' 'mips64el') @@ -22,7 +22,7 @@ optdepends=('flac: native FLAC support' 'ffmpeg' 'libsamplerate' 'wavpack') install=$pkgname.install source=(http://qmmp.ylsoftware.com/files/$pkgname-$pkgver.tar.bz2) -sha256sums=('16ab0334f368a5ef14d631a1d43d7cae876ee06b7185643377b5e9cfd6143099') +sha256sums=('6391dec020d2a381d7f4b7890fae6c49eadf88b3c9aef571fe3c5e96140822ec') build() { cd ${srcdir}/$pkgname-$pkgver diff --git a/community/qmmp/qmmp.changelog b/community/qmmp/qmmp.changelog index 92c7a2c27..31050d69e 100644 --- a/community/qmmp/qmmp.changelog +++ b/community/qmmp/qmmp.changelog @@ -1,3 +1,6 @@ +2011-10-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * qmmp 0.5.2-1 + 2011-07-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * qmmp 0.5.1-1 diff --git a/community/qtractor/PKGBUILD b/community/qtractor/PKGBUILD index a191bf2f6..d73696ef5 100644 --- a/community/qtractor/PKGBUILD +++ b/community/qtractor/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 52272 2011-07-22 23:53:54Z schiv $ +# $Id: PKGBUILD 56375 2011-10-06 21:35:18Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Philipp Ãœberbacher <hollunder at gmx dot at> pkgname=qtractor -pkgver=0.5.0 +pkgver=0.5.1 pkgrel=1 pkgdesc="Audio/MIDI multitrack sequencer" arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +16,7 @@ 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=('6dcc05532f71eaaa1aa0f336bcd265b0') +md5sums=('c54adf974fd363a9f2151a802f170e6d') build() { cd "$srcdir/$pkgname-$pkgver" @@ -28,7 +28,7 @@ build() { package () { cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir/" install + make DESTDIR="$pkgdir" install } # vim:set ts=2 sw=2 et: diff --git a/community/radvd/PKGBUILD b/community/radvd/PKGBUILD index 33aa26c4c..29a200129 100644 --- a/community/radvd/PKGBUILD +++ b/community/radvd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 38596 2011-01-28 17:42:11Z kchen $ +# $Id: PKGBUILD 56578 2011-10-09 01:59:34Z tdziedzic $ # Maintainer: Kaiting Chen <kaitocracy@gmail.com> # Contributor: Mark Smith <markzzzsmith@yahoo.com.au> pkgname=radvd -pkgver=1.7 +pkgver=1.8.2 pkgrel=1 pkgdesc='IPv6 Router Advertisement / Router Solicitation daemon' url='http://www.litech.org/radvd/' @@ -11,16 +11,24 @@ license=('custom') depends=('glibc') arch=('i686' 'x86_64' 'mips64el') install=radvd.install -source=("${url}dist/$pkgname-$pkgver.tar.gz" 'radvd.rc.d') -md5sums=('5ec417bde33964a07231ddf6353177c8' +source=("http://www.litech.org/radvd/dist/$pkgname-$pkgver.tar.gz" 'radvd.rc.d') +md5sums=('ac8a862d2b232d25ea2622274a2da8a4' '65a585f5850a1ac2a0c2c2a7096ec92a') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} + ./configure --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man - make; make DESTDIR=$pkgdir install + + make +} + +package() { + cd ${pkgname}-${pkgver} + + make DESTDIR=$pkgdir install install -Dm644 radvd.conf.example \ $pkgdir/usr/share/doc/radvd/radvd.conf.example diff --git a/community/redis/PKGBUILD b/community/redis/PKGBUILD index 2ca77031f..7831c6c90 100644 --- a/community/redis/PKGBUILD +++ b/community/redis/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 56203 2011-10-03 11:01:21Z spupykin $ +# $Id: PKGBUILD 56852 2011-10-14 21:13:51Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jan-Erik Rediger <badboy at archlinux dot us> # Contributor: nofxx <x@<nick>.com> pkgname=redis -pkgver=2.2.14 -pkgrel=2 +pkgver=2.4.0 +pkgrel=1 pkgdesc="Advanced key-value store" arch=('i686' 'x86_64' 'mips64el') url="http://redis.io/" @@ -18,13 +18,13 @@ backup=("etc/redis.conf" source=("http://redis.googlecode.com/files/${pkgname}-${pkgver}.tar.gz" "redis.d" "redis.logrotate") -md5sums=('3605e3d4c9465fdfefa2e96f3a408ef5' +md5sums=('efdfa0d40fc7676199005bd0178cf6a9' '9726d06d0a0c60cb5d55a31b3dc1e55d' '9e2d75b7a9dc421122d673fe520ef17f') build() { cd "$srcdir/${pkgname}-${pkgver}" - CFLAGS="$CFLAGS -std=c99" make + CFLAGS="$CFLAGS -std=c99" make FORCE_LIBC_MALLOC=yes } package() { diff --git a/community/rekonq/PKGBUILD b/community/rekonq/PKGBUILD index 191f8926b..51aecb479 100644 --- a/community/rekonq/PKGBUILD +++ b/community/rekonq/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 44632 2011-04-09 15:53:51Z andrea $ +# $Id: PKGBUILD 56868 2011-10-15 11:22:09Z plewis $ # Maintainer: Peter Lewis <plewis@aur.archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Panagiotis Papadopoulos <pano_90 AT gmx DOT net> pkgname=rekonq -pkgver=0.7.0 +pkgver=0.8.0 pkgrel=1 pkgdesc='A WebKit based web browser for KDE' arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ depends=('kdebase-keditbookmarks') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('73de712f71ea4caf2e66a92c77505da8') +md5sums=('b11003fa833317e5948aa1491e230806') build(){ cd ${srcdir} diff --git a/community/rekonq/rekonq.install b/community/rekonq/rekonq.install index e70c054ec..f80ffb217 100644 --- a/community/rekonq/rekonq.install +++ b/community/rekonq/rekonq.install @@ -1,11 +1,12 @@ post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q + xdg-icon-resource forceupdate --theme hicolor &> /dev/null } post_upgrade() { - post_install + post_install $1 } post_remove() { - post_install + post_install $1 } diff --git a/community/rexima/PKGBUILD b/community/rexima/PKGBUILD index 1da676ad9..47ea0dfb2 100644 --- a/community/rexima/PKGBUILD +++ b/community/rexima/PKGBUILD @@ -1,21 +1,25 @@ -# $Id: PKGBUILD 7502 2010-01-07 03:33:19Z dgriffiths $ -# Maintainer: Jeff Mickey <j@codemac.net> +# $Id: PKGBUILD 56548 2011-10-08 11:58:00Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Jeff Mickey <j@codemac.net> +# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=rexima pkgver=1.4 -pkgrel=3 +pkgrel=4 pkgdesc="A curses-based interactive mixer." arch=('i686' 'x86_64' 'mips64el') -url="http://rus.members.beeb.net/rexima.html" +url="http://www.svgalib.org/rus/rexima.html" license=('GPL') depends=('ncurses') -source=(ftp://ftp.ibiblio.org/pub/Linux/apps/sound/mixers/$pkgname-$pkgver.tar.gz) +source=(http://ftp.ibiblio.org/pub/Linux/apps/sound/mixers/${pkgname}-${pkgver}.tar.gz) md5sums=('333a4db26409b9cca9b9e96ddf42f44c') build() { - cd $startdir/src/$pkgname-$pkgver - ./configure --prefix=/usr - make || return 1 - make PREFIX=$startdir/pkg/usr install - mv $pkgdir/usr/man $pkgdir/usr/share/ + cd ${srcdir}/${pkgname}-${pkgver} + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make PREFIX=$pkgdir/usr MANDIR=$pkgdir/usr/share/man/man1 install } diff --git a/community/roxterm/PKGBUILD b/community/roxterm/PKGBUILD index 7b5c5d2ec..19b42db02 100644 --- a/community/roxterm/PKGBUILD +++ b/community/roxterm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 56034 2011-09-29 09:51:12Z ttopper $ +# $Id: PKGBUILD 56631 2011-10-09 09:38:40Z ttopper $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Contributor: Alexander Fehr <pizzapunk gmail com> pkgname=roxterm -pkgver=2.2.1 +pkgver=2.2.2 pkgrel=1 pkgdesc="Tabbed, VTE-based terminal emulator" arch=('i686' 'x86_64' 'mips64el') @@ -13,8 +13,8 @@ depends=('dbus-glib' 'vte3' 'hicolor-icon-theme' 'dbus' 'dbus-core' 'glib2') makedepends=('docbook-xsl' 'xmlto' 'po4a') install=roxterm.install source=(http://downloads.sourceforge.net/roxterm/roxterm-$pkgver.tar.gz) -sha1sums=('dfa66f3fc5bf44d99fb94115c5d50e16d2b79d19') -md5sums=('ae5870b61deca40f22cdda584f7bc201') +sha1sums=('e51f24e045fb7ecc38ea0f17b06ed2de3aec92cf') +md5sums=('ad3c2e92c588ab312e8b199a9082efcd') build() { diff --git a/community/scite/PKGBUILD b/community/scite/PKGBUILD index 9faad7bd5..3cdb5d823 100644 --- a/community/scite/PKGBUILD +++ b/community/scite/PKGBUILD @@ -4,21 +4,18 @@ # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=scite -pkgver=2.27 +pkgver=2.29 pkgrel=1 pkgdesc='A generally useful editor with facilities for building and running programs.' arch=('i686' 'x86_64' 'mips64el') url='http://www.scintilla.org/SciTE.html' license=('custom:scite') -depends=('desktop-file-utils' 'gtk2') +depends=('desktop-file-utils' 'gtk2' 'glib2') backup=(usr/share/scite/SciTEGlobal.properties) install=scite.install source=("http://downloads.sourceforge.net/sourceforge/scintilla/${pkgname}${pkgver/\./}.tgz" 'SciTE.desktop' 'makefile.patch') -md5sums=('ac5aafa1b47da3792a56d5fd9f383fda' - '48526532ef677982a4b156ae90f25b6f' - '87005d4c7262a1a698cde0628dc7e2a2') build() { sed "s/CXXTFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS)/CXXTFLAGS=-DNDEBUG ${CXXFLAGS} $(CXXBASEFLAGS)/" -i scite/gtk/makefile @@ -45,3 +42,6 @@ build() { ln -sf SciTE ${pkgdir}/usr/bin/scite } +md5sums=('55858b96c4ad64b38503682ff49d184e' + '48526532ef677982a4b156ae90f25b6f' + '87005d4c7262a1a698cde0628dc7e2a2') diff --git a/community/shotwell/PKGBUILD b/community/shotwell/PKGBUILD index a346851b9..13f6fe947 100644 --- a/community/shotwell/PKGBUILD +++ b/community/shotwell/PKGBUILD @@ -1,27 +1,32 @@ -# $Id: PKGBUILD 56349 2011-10-05 19:08:41Z andrea $ +# $Id: PKGBUILD 56880 2011-10-15 22:25:22Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com> pkgname=shotwell -pkgver=0.11.2 +pkgver=0.11.4 pkgrel=2 pkgdesc="A digital photo organizer designed for the GNOME desktop environment" arch=('i686' 'x86_64' 'mips64el') url="http://yorba.org/shotwell/" license=('LGPL2.1') -depends=('gconf' 'libgee' 'libgphoto2' 'libunique3' 'libwebkit3' 'libgexiv2' 'libraw' +depends=('gconf' 'libgee' 'libgphoto2' 'libunique' 'libwebkit' 'libgexiv2' 'libraw' 'librsvg' 'json-glib' 'desktop-file-utils' 'dconf') makedepends=('intltool' 'vala') install=shotwell.install source=("http://yorba.org/download/shotwell/0.11/shotwell-${pkgver}.tar.bz2" - "http://arch.p5n.pp.ru/~sergej/dl/shotwell-gtk3.patch.gz") -md5sums=('bbb479eaa4bbcf67d8ff454b406ed249' - 'e9ac0d9d818242220f0f788c493e453d') + "http://ftp.gnome.org/pub/gnome/sources/vala/0.12/vala-0.12.1.tar.bz2") +md5sums=('150899574f8fd96b6a5b87173a6ef3e0' + 'bf35262cc611de447147d01cbac33767') build() { + cd "${srcdir}/vala-0.12.1" + ./configure --prefix=$srcdir/vala --enable-vapigen + make + make install + export PATH=$srcdir/vala/bin:$PATH + cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 <$srcdir/shotwell-gtk3.patch ./configure --prefix=/usr \ --with-gconf-schema-file-dir=/usr/share/gconf/schemas \ --disable-schemas-install \ diff --git a/community/shp2svg/PKGBUILD b/community/shp2svg/PKGBUILD deleted file mode 100644 index 4d391f7e1..000000000 --- a/community/shp2svg/PKGBUILD +++ /dev/null @@ -1,20 +0,0 @@ -# $Id: PKGBUILD 2514 2009-09-19 12:56:22Z ibiru $ -# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org - -pkgname=shp2svg -pkgver=0.5.1 -pkgrel=2 -pkgdesc="Takes the text input from shp2pgsql and converts it to SVG files" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.carto.net/papers/svg/utils/shp2svg/" -license=('LGPL') -depends=('postgis>=1.4' 'perl-math-round') -source=(http://www.carto.net/papers/svg/utils/shp2svg/ogis2svg.pl) -md5sums=('040103d8c83ee0d7095cad7d703d4e80') - -build() { - mkdir -p $startdir/pkg/usr/bin - install -m755 $startdir/src/ogis2svg.pl $startdir/pkg/usr/bin/ogis2svg.pl - # add a symlink because the name of the script is a little confusing. - ln -sf /usr/bin/ogis2svg.pl $startdir/pkg/usr/bin/shp2svg -} diff --git a/community/skrooge/PKGBUILD b/community/skrooge/PKGBUILD index a3aad49a4..3136ef51f 100644 --- a/community/skrooge/PKGBUILD +++ b/community/skrooge/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 54383 2011-08-17 20:41:29Z schiv $ +# $Id: PKGBUILD 56764 2011-10-11 21:59:15Z ebelanger $ # Maintainer: # Contributor: Ray Rashif <schiv@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: neuromante <lorenzo.nizzi.grifi@gmail.com> pkgname=skrooge -pkgver=0.9.1 +pkgver=1.0.0 pkgrel=1 pkgdesc="A personal finances manager for KDE" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ depends=('kdebase-runtime' 'libofx' 'qca-ossl') makedepends=('cmake' 'automoc4' 'docbook-xsl') install=$pkgname.install source=("http://skrooge.org/files/$pkgname-$pkgver.tar.bz2") -md5sums=('2fa984e250359fd6008d2c601f1209ec') +md5sums=('900da5dd41b940272941ee71e78cf8b4') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/skrooge/skrooge.install b/community/skrooge/skrooge.install index 7edfb0647..5cfbe649e 100644 --- a/community/skrooge/skrooge.install +++ b/community/skrooge/skrooge.install @@ -1,5 +1,7 @@ post_install() { update-mime-database usr/share/mime &> /dev/null + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q kbuildsycoca4 &> /dev/null } diff --git a/community/sleuthkit/PKGBUILD b/community/sleuthkit/PKGBUILD index 0751f43b8..5eb29e6a9 100644 --- a/community/sleuthkit/PKGBUILD +++ b/community/sleuthkit/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 47379 2011-05-22 09:59:29Z jlichtblau $ +# $Id: PKGBUILD 56657 2011-10-09 12:53:32Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> pkgname=sleuthkit -pkgver=3.2.1 +pkgver=3.2.3 pkgrel=1 pkgdesc='File system and media management forensic analysis tools' arch=('i686' 'x86_64' 'mips64el') @@ -11,8 +11,9 @@ url='http://www.sleuthkit.org/sleuthkit' license=('GPL2' 'CPL' 'custom:"IBM Public Licence"') depends=('perl') options=('!libtool') +changelog=$pkgname.changelog source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz) -sha256sums=('e0f257d2c6856dc1c1cd2a704c6cb8906ca688f0cdbb1d0665fd7a5a2f83ad37') +sha256sums=('ba5f63d7fd60d978de03777c72b1571004caa8dfe384f09757b6a8efa890ea62') build() { cd ${pkgname}-${pkgver} diff --git a/community/sleuthkit/sleuthkit.changelog b/community/sleuthkit/sleuthkit.changelog new file mode 100644 index 000000000..8931cc656 --- /dev/null +++ b/community/sleuthkit/sleuthkit.changelog @@ -0,0 +1,2 @@ +2011-10-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * sleuthkit 3.2.3-1 diff --git a/community/snort/PKGBUILD b/community/snort/PKGBUILD index 353258674..cd68816cb 100644 --- a/community/snort/PKGBUILD +++ b/community/snort/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 54743 2011-08-24 08:35:34Z lfleischer $ +# $Id: PKGBUILD 56492 2011-10-07 10:33:31Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Hugo Doria <hugo@archlinux.org> # Contributor: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com> @@ -6,7 +6,7 @@ # Contributor: Gregor Ibic <gregor.ibic@intelicom.si> pkgname=snort -pkgver=2.9.1 +pkgver=2.9.1.1 pkgrel=1 pkgdesc='A lightweight network intrusion detection system.' arch=('i686' 'x86_64' 'mips64el') @@ -21,10 +21,10 @@ backup=('etc/conf.d/snort' 'etc/snort/classification.config') options=('!makeflags' '!libtool') install='snort.install' -source=('http://www.snort.org/downloads/1107' +source=('http://www.snort.org/downloads/1179' 'snort' 'snort.conf.d') -md5sums=('f11e01c7946b7b4e07e6e98bb1645fb5' +md5sums=('7a245c6e7cdf298cab196f0f69108468' '361b8b9e40b9af0164f6b3e3da2e8277' 'b4fb8a68490589cd34df93de7609bfac') diff --git a/community/solfege/solfege.install b/community/solfege/solfege.install deleted file mode 100644 index bf8d22af6..000000000 --- a/community/solfege/solfege.install +++ /dev/null @@ -1,4 +0,0 @@ -post_upgrade() { - echo " lilypond support has been removed" - echo " see http://code.google.com/p/solfege/issues/detail?id=242" -} diff --git a/community/sysprof/PKGBUILD b/community/sysprof/PKGBUILD index f45029e06..65072e103 100644 --- a/community/sysprof/PKGBUILD +++ b/community/sysprof/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 34968 2010-12-14 10:32:56Z spupykin $ +# $Id: PKGBUILD 56814 2011-10-13 17:07:33Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org> # Previous Contributor: Eric Belanger <belanger@astro.umontreal.ca> # Previous Contributor: aeolist <aeolist@hotmail.com> pkgname=sysprof -pkgver=1.1.6 +pkgver=1.1.8 pkgrel=1 pkgdesc="A sampling CPU profiler that uses a Linux kernel module to profile the entire system" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ license=("GPL") source=(http://www.daimi.au.dk/~sandmann/$pkgname/$pkgname-$pkgver.tar.gz) depends=('libglade' 'binutils') makedepends=('libglade' 'binutils' 'kernel26-headers') -md5sums=('219f888777771f3709cb35a64bb008a9') +md5sums=('a46e24250988d96d8fc7b30773d55222') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/system-tools-backends/PKGBUILD b/community/system-tools-backends/PKGBUILD deleted file mode 100644 index 68b15f61e..000000000 --- a/community/system-tools-backends/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# Maintainer : Ionut Biru <ibiru@archlinux.org> -# Contributor: Hugo Doria <hugo@archlinux.org> - -pkgname=system-tools-backends -pkgver=2.10.2 -pkgrel=1 -pkgdesc='Backends for Gnome System Tools.' -arch=('i686' 'x86_64' 'mips64el') -url='http://system-tools-backends.freedesktop.org/' -license=('GPL') -depends=('perl' 'perl-net-dbus' 'dbus' 'polkit' 'dbus-glib') -makedepends=('perlxml' 'pkgconfig' 'intltool') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.10/${pkgname}-${pkgver}.tar.bz2) -install=system-tools-backends.install -sha256sums=('1dbe5177df46a9c7250735e05e77129fe7ec04840771accfa87690111ca2c670') - -build() { - cd ${pkgname}-${pkgver} - - ./configure \ - --prefix=/usr \ - --with-dbus-sys=/etc/dbus-1/system.d \ - --localstatedir=/var \ - --mandir=/usr/share \ - --disable-static - - make -} - -package() { - cd ${pkgname}-${pkgver} - - make DESTDIR=${pkgdir} install - - #clean up man - rm -rf $pkgdir/usr/share/system-tools-backends-2.0/modules/share/ -} diff --git a/community/system-tools-backends/system-tools-backends.install b/community/system-tools-backends/system-tools-backends.install deleted file mode 100644 index e83a93525..000000000 --- a/community/system-tools-backends/system-tools-backends.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - echo "==> Daemon method deprecated. Now is starting automatically at login" - echo "==> Remove stbd from DAEMONS list" -} - -post_upgrade() { - if [ `vercmp $2 2.6.1-2` -eq 0 ]; then - echo "Removing stb-admin group" - groupdel stb-admin &> /dev/null - fi - post_install $1 -} diff --git a/community/systemd/PKGBUILD b/community/systemd/PKGBUILD index 3404835a9..33ea277bb 100644 --- a/community/systemd/PKGBUILD +++ b/community/systemd/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 55861 2011-09-23 23:07:50Z dreisner $ +# $Id: PKGBUILD 56766 2011-10-12 01:06:12Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> pkgname=systemd -pkgver=36 +pkgver=37 pkgrel=1 pkgdesc="Session and Startup manager" arch=('i686' 'x86_64' 'mips64el') @@ -30,9 +30,11 @@ backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf etc/systemd/systemd-logind.conf) install=systemd.install source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.bz2" - "os-release") -md5sums=('e1213338efb697abc8215d9a66a7f082' - '752636def0db3c03f121f8b4f44a63cd') + "os-release" + systemctl-completion.patch) +md5sums=('1435f23be79c8c38d1121c6b150510f3' + '752636def0db3c03f121f8b4f44a63cd' + '8acca6b7be4bfebe4174d89e4625b0ee') build() { cd "$srcdir/$pkgname-$pkgver" @@ -42,6 +44,9 @@ build() { sed -i -e '/^Environ.*LANG/s/^/#/' \ -e '/^ExecStart/s/agetty/& -8/' units/getty@.service.m4 + # fix bash completion + patch -Np1 < "$srcdir"/systemctl-completion.patch + ./configure --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib/systemd \ @@ -49,8 +54,7 @@ build() { --localstatedir=/var \ --with-rootdir= \ --with-rootlibdir=/lib \ - --disable-audit \ - --disable-tcpwrap + --disable-audit make diff --git a/community/systemd/systemctl-completion.patch b/community/systemd/systemctl-completion.patch new file mode 100644 index 000000000..afa1ae73f --- /dev/null +++ b/community/systemd/systemctl-completion.patch @@ -0,0 +1,77 @@ +From 255e63837bc985ce6f3c3b5ce5d2856e2240138b Mon Sep 17 00:00:00 2001 +From: Dave Reisner <dreisner@archlinux.org> +Date: Tue, 11 Oct 2011 20:53:05 -0400 +Subject: [PATCH] systemctl-completion: always invoke with --no-legend + +In the case of completion for the 'restart' verb, passing the invalid +unit name (the colums header) causes completion to cease functioning +entirely, with the error: + + Failed to issue method call: Unit name UNIT is not valid. + +This adds a small wrapper function for systemctl which can have common +options added to it. + +--- + src/systemctl-bash-completion.sh | 20 ++++++++++++-------- + 1 files changed, 12 insertions(+), 8 deletions(-) + +diff --git a/src/systemctl-bash-completion.sh b/src/systemctl-bash-completion.sh +index 6369a6c..6ebb792 100644 +--- a/src/systemctl-bash-completion.sh ++++ b/src/systemctl-bash-completion.sh +@@ -15,6 +15,10 @@ + # You should have received a copy of the GNU General Public License + # along with systemd; If not, see <http://www.gnu.org/licenses/>. + ++__systemctl() { ++ systemctl --no-legend "$@" ++} ++ + __contains_word () { + local word=$1; shift + for w in $*; do [[ $w = $word ]] && return 0; done +@@ -24,7 +28,7 @@ __contains_word () { + __filter_units_by_property () { + local property=$1 value=$2 ; shift ; shift + local -a units=( $* ) +- local -a props=( $(systemctl show --property "$property" -- ${units[*]} | grep -v ^$) ) ++ local -a props=( $(__systemctl show --property "$property" -- ${units[*]} | grep -v ^$) ) + for ((i=0; $i < ${#units[*]}; i++)); do + if [[ "${props[i]}" = "$property=$value" ]]; then + echo "${units[i]}" +@@ -32,10 +36,10 @@ __filter_units_by_property () { + done + } + +-__get_all_units () { systemctl list-units --full --all | awk ' {print $1}' ; } +-__get_active_units () { systemctl list-units --full | awk ' {print $1}' ; } +-__get_inactive_units () { systemctl list-units --full --all | awk '$3 == "inactive" {print $1}' ; } +-__get_failed_units () { systemctl list-units --full | awk '$3 == "failed" {print $1}' ; } ++__get_all_units () { __systemctl list-units --full --all | awk ' {print $1}' ; } ++__get_active_units () { __systemctl list-units --full | awk ' {print $1}' ; } ++__get_inactive_units () { __systemctl list-units --full --all | awk '$3 == "inactive" {print $1}' ; } ++__get_failed_units () { __systemctl list-units --full | awk '$3 == "failed" {print $1}' ; } + + _systemctl () { + local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]} +@@ -134,13 +138,13 @@ _systemctl () { + comps='' + + elif __contains_word "$verb" ${VERBS[JOBS]}; then +- comps=$( systemctl list-jobs | awk '{print $1}' ) ++ comps=$( __systemctl list-jobs | awk '{print $1}' ) + + elif __contains_word "$verb" ${VERBS[SNAPSHOTS]}; then +- comps=$( systemctl list-units --type snapshot --full --all | awk '{print $1}' ) ++ comps=$( __systemctl list-units --type snapshot --full --all | awk '{print $1}' ) + + elif __contains_word "$verb" ${VERBS[ENVS]}; then +- comps=$( systemctl show-environment | sed 's_\([^=]\+=\).*_\1_' ) ++ comps=$( __systemctl show-environment | sed 's_\([^=]\+=\).*_\1_' ) + compopt -o nospace + fi + +-- +1.7.7 + diff --git a/community/tnftp/PKGBUILD b/community/tnftp/PKGBUILD index 02ba38c8b..1dfa52704 100644 --- a/community/tnftp/PKGBUILD +++ b/community/tnftp/PKGBUILD @@ -1,24 +1,23 @@ -# $Id: PKGBUILD 20856 2010-07-12 13:13:46Z spupykin $ +# $Id: PKGBUILD 56963 2011-10-17 10:15:04Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> # Previous Contributor: Baptiste Daroussin <baptiste.daroussin@gmail.com> pkgname=tnftp pkgver=20100108 -pkgrel=1 +pkgrel=2 pkgdesc="NetBSD FTP client with several advanced features" arch=('i686' 'x86_64' 'mips64el') url="ftp://ftp.netbsd.org/pub/NetBSD/misc/tnftp/" license=('BSD') depends=('ncurses' 'dante') -conflicts=('inetutils') source=(ftp://ftp.netbsd.org/pub/NetBSD/misc/tnftp/$pkgname-$pkgver.tar.gz) md5sums=('192aac255abd515d7d4cc9b397dc0cba') build() { cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr --enable-editcomplete - make || return 1 - make install DESTDIR=$pkgdir || return 1 + make + make install DESTDIR=$pkgdir install -Dm755 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING } diff --git a/community/tomoyo-tools/build-fix.patch b/community/tomoyo-tools/build-fix.patch deleted file mode 100644 index ca949072b..000000000 --- a/community/tomoyo-tools/build-fix.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -wbBur tomoyo-tools/usr_lib_tomoyo/tomoyo-editpolicy-agent.c tomoyo-tools.my/usr_lib_tomoyo/tomoyo-editpolicy-agent.c ---- tomoyo-tools/usr_lib_tomoyo/tomoyo-editpolicy-agent.c 2011-08-06 04:00:00.000000000 +0400 -+++ tomoyo-tools.my/usr_lib_tomoyo/tomoyo-editpolicy-agent.c 2011-08-11 21:47:05.000000000 +0400 -@@ -35,6 +35,7 @@ - #include <dirent.h> - #define _GNU_SOURCE - #include <sched.h> -+#include <linux/sched.h> - #include <sys/mount.h> - - static _Bool wait_data(const int fd) diff --git a/community/tracker/PKGBUILD b/community/tracker/PKGBUILD deleted file mode 100644 index 37711e75d..000000000 --- a/community/tracker/PKGBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# $Id: PKGBUILD 55298 2011-09-09 09:43:00Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Alexander Fehr <pizzapunk gmail com> - -pkgname=tracker -pkgver=0.10.26 -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/" -license=('GPL') -depends=('libgee' 'libgnome-keyring' 'upower' 'libexif' 'exempi' 'poppler-glib' - 'libgsf' 'icu' 'enca' 'xdg-utils') -makedepends=('gobject-introspection' 'intltool' 'giflib' 'gstreamer0.10-base' - 'totem-plparser' 'evolution' 'taglib' 'nautilus' 'gnome-panel') -optdepends=('giflib: extractor for GIF data' - 'gstreamer0.10-base: video extractor' - 'totem-plparser: playlist support' - 'evolution: Evolution email data miner' - 'taglib: writeback for audio files' - 'nautilus: nautilus-extension' - 'gnome-panel: tracker-search-bar') -options=('!emptydirs' '!libtool') -conflicts=('libtracker') -provides=('libtracker') -install=tracker.install -source=(http://ftp.gnome.org/pub/GNOME/sources/tracker/0.10/tracker-$pkgver.tar.bz2 - tracker-0.10-gnome3-nautilus-extension.patch) -md5sums=('3a9e9f8f07b0020c9276571e99cfdb66' - '316f1647afe178a87400a476ef1b62a0') - -build() { - cd "$srcdir/$pkgname-$pkgver" - patch -Ni ../tracker-0.10-gnome3-nautilus-extension.patch - ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/$pkgname \ - --disable-unit-tests --enable-video-extractor=gstreamer --disable-network-manager - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} diff --git a/community/tracker/tracker-0.10-gnome3-nautilus-extension.patch b/community/tracker/tracker-0.10-gnome3-nautilus-extension.patch deleted file mode 100644 index 95e1097dd..000000000 --- a/community/tracker/tracker-0.10-gnome3-nautilus-extension.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- configure 2011-08-05 13:04:41.000000000 +0200 -+++ configure.new 2011-08-17 14:02:07.303473086 +0200 -@@ -19120,7 +19120,7 @@ - TRACKER_NAUTILUS_EXTENSION_REQUIRED="glib-2.0 >= $GLIB_REQUIRED - gio-unix-2.0 >= $GLIB_REQUIRED - gthread-2.0 >= $GLIB_REQUIRED -- gtk+-2.0 >= $GTK_REQUIRED -+ gtk+-3.0 >= $GTK_REQUIRED - libnautilus-extension" - - diff --git a/community/tracker/tracker.install b/community/tracker/tracker.install deleted file mode 100644 index b95cc069d..000000000 --- a/community/tracker/tracker.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true -} diff --git a/community/tvision/PKGBUILD b/community/tvision/PKGBUILD index 0d765f31b..0b89dcc1d 100644 --- a/community/tvision/PKGBUILD +++ b/community/tvision/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 23701 2010-08-14 23:06:10Z spupykin $ +# $Id: PKGBUILD 57007 2011-10-18 03:49:00Z ebelanger $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=tvision pkgver=2.2.1_r1 -pkgrel=1 +pkgrel=2 pkgdesc="turbo vision library port (console interface)" arch=(i686 x86_64 'mips64el') url="http://tvision.sourceforge.net" license=("GPL") -depends=(gpm gcc-libs libxmu allegro) +depends=(gpm gcc-libs libxmu) options=('!makeflags') source=("http://downloads.sourceforge.net/project/tvision/UNIX/2.2.1%20CVS20100714%20Source%20and%20Debian%205.0/rhtvision_${pkgver/_r/-}.tar.gz" tvision-build-fix.patch) @@ -18,10 +18,8 @@ md5sums=('46b815d86bbbb2f9b112b11f63e2f5a6' build() { cd $srcdir/$pkgname - patch -p1 <$srcdir/tvision-build-fix.patch - ./configure --prefix=/usr --include=/usr/include - make || return 1 + make make prefix=$pkgdir/usr install } diff --git a/community/uzbl/PKGBUILD b/community/uzbl/PKGBUILD index 0ae669910..8feeabdab 100644 --- a/community/uzbl/PKGBUILD +++ b/community/uzbl/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 53737 2011-08-07 22:05:14Z lcarlier $ +# $Id: PKGBUILD 56503 2011-10-07 11:58:08Z lcarlier $ # Maintainer : Laurent Carlier <lordheavym@gmail.com> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Dieter Plaetinck <dieter@plaetinck.be> pkgbase=uzbl pkgname=('uzbl-core' 'uzbl-browser' 'uzbl-tabbed') -pkgver=2011.07.25 +pkgver=2011.10.01 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.uzbl.org" license=('GPL3') makedepends=('git' 'pkgconfig' 'libwebkit>=1.3.13') source=(uzbl-$pkgver.tar.gz::https://github.com/Dieterbe/uzbl/tarball/$pkgver) -md5sums=('96fed3e0c690df6bf4b46af6a9cd0194') +md5sums=('aadafc08ef56966cdafec00b9d09abd1') build() { cd "$srcdir"/Dieterbe-uzbl-* diff --git a/community/uzbl/uzbl.install b/community/uzbl/uzbl.install index ca5fc814b..500b114e7 100644 --- a/community/uzbl/uzbl.install +++ b/community/uzbl/uzbl.install @@ -3,7 +3,7 @@ post_install() { } post_upgrade() { - echo "Some incompatibily are introduced, please refer to http://www.uzbl.org/news.php?id=32" + echo "Some incompatibily are introduced, please refer to http://www.uzbl.org/news.php?id=38" } pre_remove() { diff --git a/community/v8/PKGBUILD b/community/v8/PKGBUILD index 71b512e3f..84d97951e 100644 --- a/community/v8/PKGBUILD +++ b/community/v8/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 45132 2011-04-17 01:54:09Z kchen $ +# $Id: PKGBUILD 56586 2011-10-09 03:29:08Z tdziedzic $ # Maintainer: Kaiting Chen <kaitocracy@gmail.com> # Contributor: tocer <tocer.deng@gmail.com> pkgname=v8 -pkgver=3.2.10.2 +pkgver=3.6.5.1 pkgrel=1 pkgdesc='A fast and modern javascript engine' arch=('i686' 'x86_64' 'mips64el') diff --git a/community/vifm/PKGBUILD b/community/vifm/PKGBUILD index da557472d..25dea5a74 100644 --- a/community/vifm/PKGBUILD +++ b/community/vifm/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 54568 2011-08-20 17:57:49Z jlichtblau $ +# $Id: PKGBUILD 56645 2011-10-09 12:00:43Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> pkgname=vifm -pkgver=0.6.3 +pkgver=0.7.0 pkgrel=1 pkgdesc="Ncurses based file manager with vi like keybindings" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ license=('GPL') depends=('ncurses' 'gtk2') changelog=$pkgname.changelog source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2) -sha256sums=('7b6ac1056e7fbca46fb8eb1a40f31c92fc5694b19ca4267fc63e9e295d8cb3ec') +sha256sums=('c3e7d677c6f807dc0adefb175c5301ac0bb3cc1d1998d7928878bfe0c5eef139') build() { cd ${srcdir}/$pkgname-$pkgver diff --git a/community/vifm/vifm.changelog b/community/vifm/vifm.changelog index 94305ad1f..add2882b6 100644 --- a/community/vifm/vifm.changelog +++ b/community/vifm/vifm.changelog @@ -1,3 +1,6 @@ +2011-10-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * vifm 0.7.0-1 + 2011-08-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * vifm 0.6.3-1 diff --git a/community/virtualbox/PKGBUILD b/community/virtualbox/PKGBUILD index 6ab863216..57ceb8c7f 100644 --- a/community/virtualbox/PKGBUILD +++ b/community/virtualbox/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 56277 2011-10-04 15:42:56Z ibiru $ +# $Id: PKGBUILD 56770 2011-10-12 05:24:02Z ibiru $ #Maintainer: Ionut Biru <ibiru@archlinux.org> pkgbase=virtualbox pkgname=('virtualbox' 'virtualbox-archlinux-additions' 'virtualbox-archlinux-modules' 'virtualbox-sdk') pkgver=4.1.4 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url='http://virtualbox.org' license=('GPL' 'custom') @@ -152,7 +152,7 @@ package_virtualbox-archlinux-additions(){ "$pkgdir"/usr/bin/VBoxClient-all install -m755 -D "$srcdir"/VirtualBox-${pkgver}_OSE/src/VBox/Additions/x11/Installer/vboxclient.desktop \ "$pkgdir"/etc/xdg/autostart/vboxclient.desktop - install -D vboxvideo_drv_110.so \ + install -D vboxvideo_drv_111.so \ "$pkgdir/usr/lib/xorg/modules/drivers/vboxvideo.so" install -d "$pkgdir/usr/lib/xorg/modules/dri" install -m755 VBoxOGL*.so "$pkgdir/usr/lib" diff --git a/community/virtualbox/vboxdrv.sh b/community/virtualbox/vboxdrv.sh deleted file mode 100755 index aace25edf..000000000 --- a/community/virtualbox/vboxdrv.sh +++ /dev/null @@ -1,92 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/vbox/vbox.cfg - -MODLIST=() -LOG="/var/log/vbox-install.log" - -if [ -n "$INSTALL_DIR" ]; then - VBOXMANAGE="$INSTALL_DIR/VBoxManage" - BUILDVBOXDRV="$INSTALL_DIR/src/vboxdrv/build_in_tmp" - BUILDVBOXNETFLT="$INSTALL_DIR/src/vboxnetflt/build_in_tmp" - BUILDVBOXNETADP="$INSTALL_DIR/src/vboxnetadp/build_in_tmp" - BUILDVBOXPCI="$INSTALL_DIR/src/vboxpci/build_in_tmp" -else - echo "missing vbox.cfg" - exit 0 -fi - -case "$1" in - setup) - stat_busy "Unloading VirtualBox kernel modules" - for module in vbox{pci,netflt,netadp,drv}; do - if grep -q "^${module}" /proc/modules; then - MODLIST+=($module) - modprobe -r $module - fi - done - stat_done - for p in /lib/modules/*; do - if [ ! -d "$p/kernel" ]; then - if [ -e "$p/misc/vboxdrv.ko" ]; then - stat_busy "Removing old VirtualBox kernel modules from $p" - rm -f "$p/misc/vbox"{drv,netadp,netflt,pci}.ko 2>/dev/null - rmdir -p --ignore-fail-on-non-empty "$p/misc/" 2>/dev/null - stat_done - fi - fi - done - if find /lib/modules/`uname -r` -name "vboxnetadp\.*" 2>/dev/null|grep -q vboxnetadp; then - stat_busy "Removing old VirtualBox netadp kernel module" - find /lib/modules/`uname -r` -name "vboxnetadp\.*" 2>/dev/null|xargs rm -f 2>/dev/null - stat_done - fi - if find /lib/modules/`uname -r` -name "vboxnetflt\.*" 2>/dev/null|grep -q vboxnetflt; then - stat_busy "Removing old VirtualBox netflt kernel module" - find /lib/modules/`uname -r` -name "vboxnetflt\.*" 2>/dev/null|xargs rm -f 2>/dev/null - stat_done - fi - if find /lib/modules/`uname -r` -name "vboxdrv\.*" 2>/dev/null|grep -q vboxdrv; then - stat_busy "Removing old VirtualBox kernel module" - find /lib/modules/`uname -r` -name "vboxdrv\.*" 2>/dev/null|xargs rm -f 2>/dev/null - stat_done - fi - if find /lib/modules/`uname -r` -name "vboxpci\.*" 2>/dev/null|grep -q vboxpci; then - stat_busy "Removing old VirtualBox pci kernel module" - find /lib/modules/`uname -r` -name "vboxpci\.*" 2>/dev/null|xargs rm -f 2>/dev/null - stat_done - fi - - stat_busy "Recompiling VirtualBox kernel modules" - if ! $BUILDVBOXDRV \ - --save-module-symvers /tmp/vboxdrv-Module.symvers \ - --no-print-directory install > $LOG 2>&1; then - echo "Look at $LOG to find out what went wrong" - fi - if ! $BUILDVBOXNETFLT \ - --use-module-symvers /tmp/vboxdrv-Module.symvers \ - --no-print-directory install >> $LOG 2>&1; then - echo "Look at $LOG to find out what went wrong" - fi - if ! $BUILDVBOXNETADP \ - --use-module-symvers /tmp/vboxdrv-Module.symvers \ - --no-print-directory install >> $LOG 2>&1; then - echo "Look at $LOG to find out what went wrong" - fi - if ! $BUILDVBOXPCI \ - --use-module-symvers /tmp/vboxdrv-Module.symvers \ - --no-print-directory install >> $LOG 2>&1; then - echo "Look at $LOG to find out what went wrong" - fi - stat_done - stat_busy "Reloading VirtualBox kernel modules" - for module in "${MODLIST[@]}"; do - modprobe $module - done - stat_done - ;; - *) - echo "usage: $0 {setup}" -esac diff --git a/community/vym/PKGBUILD b/community/vym/PKGBUILD index d51526289..c56dbb428 100644 --- a/community/vym/PKGBUILD +++ b/community/vym/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 40005 2011-02-19 13:39:49Z jlichtblau $ +# $Id: PKGBUILD 56624 2011-10-09 08:27:22Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> # Contributor: S�ren Holm <sgh@sgh.dk> pkgname=vym -pkgver=1.12.8 +pkgver=1.99.0 pkgrel=1 pkgdesc="A mindmapping tool" arch=('i686' 'x86_64' 'mips64el') @@ -13,9 +13,10 @@ license=('GPL') depends=('qt' 'unzip' 'zip') options=('!emptydirs') changelog=$pkgname.changelog +install=$pkgname.install source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2 \ $pkgname.desktop) -sha256sums=('0b8a40a61460bef5d6423b3d0efef07d73328f7c789e95b7f3e1ac2f725f0643' +sha256sums=('0393aca3d88103bdfe4bce829a41664510dd0f6b8599299bf58ea797a913e583' 'e299c69c213e7aac3f5b5d0ab088132b4ec7cb63a391f272e75ed64f049d541b') build() { diff --git a/community/vym/vym.changelog b/community/vym/vym.changelog index 7c4e9b3e7..b61af921b 100644 --- a/community/vym/vym.changelog +++ b/community/vym/vym.changelog @@ -1,5 +1,8 @@ +2011-10-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * vym 1.99.0-1 + 2011-02-19 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * vym 1.12.8 + * vym 1.12.8-1 2010-03-21 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * Update to major release 1.12.7 diff --git a/community/vym/vym.install b/community/vym/vym.install new file mode 100644 index 000000000..2eaa60550 --- /dev/null +++ b/community/vym/vym.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/community/wavegain/ChangeLog b/community/wavegain/ChangeLog deleted file mode 100644 index a348c0cc3..000000000 --- a/community/wavegain/ChangeLog +++ /dev/null @@ -1,19 +0,0 @@ -2009-02-28 Corrado Primier <bardo@aur.archlinux.org> - - * Version bump: 1.2.8 - - * PKGBUILD: some cleanup - - * rename.patch: removed - -2008-05-03 Corrado Primier <bardo@aur.archlinux.org> - - * Release bump: -2 - - * PKGBUILD: corrected a wrong description (stupid me) - -2008-05-03 Corrado Primier <bardo@aur.archlinux.org> - - * PKGBUILD: created (wavegain is needed by gnormalize) - - * ChangeLog: added diff --git a/community/wavegain/PKGBUILD b/community/wavegain/PKGBUILD index 5f448bfe2..ae2379453 100644 --- a/community/wavegain/PKGBUILD +++ b/community/wavegain/PKGBUILD @@ -1,27 +1,30 @@ -# $Id: PKGBUILD 22383 2010-07-21 16:08:04Z lcarlier $ -# Maintainer: Corrado Primier <bardo@aur.archlinux.org> +# $Id: PKGBUILD 56863 2011-10-15 08:48:28Z schiv $ +# Maintainer: Ray Rashif <schiv@archlinux.org> +# Contributor: Corrado Primier <bardo@aur.archlinux.org> pkgname=wavegain -pkgver=1.2.8 -pkgrel=2 +_realname=WaveGain +pkgver=1.3.0 +pkgrel=1 pkgdesc="A command line tool to normalize sound files" arch=('i686' 'x86_64' 'mips64el') url="http://rarewares.org/others.php" license=('LGPL') -depends=('glibc' 'libsndfile') -source=(http://www.rarewares.org/files/others/${pkgname}-${pkgver}srcs.zip) -md5sums=('bc9b412400dbfb69bcbf961ed4e6eb06') +depends=('libsndfile') +source=(http://www.rarewares.org/files/others/$pkgname-${pkgver}srcs.zip) +md5sums=('6f4bc4f5fc7387db34e04f80fdf74dd2') build() { - cd ${srcdir}/WaveGain-${pkgver} + cd "$srcdir/$_realname-$pkgver" make -f Makefile.linux } package() { - cd ${srcdir}/WaveGain-${pkgver} + cd "$srcdir/$_realname-$pkgver" - install -Dm755 ${srcdir}/WaveGain-${pkgver}/wavegain ${pkgdir}/usr/bin/wavegain + install -Dm755 "$srcdir/$_realname-$pkgver/wavegain" \ + "$pkgdir/usr/bin/wavegain" } # vim:set ts=2 sw=2 et: diff --git a/community/zathura/PKGBUILD b/community/zathura/PKGBUILD index b2016a2f6..454912614 100644 --- a/community/zathura/PKGBUILD +++ b/community/zathura/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 54972 2011-08-29 09:50:03Z spupykin $ +# $Id: PKGBUILD 56955 2011-10-17 08:21:21Z ibiru $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: ML <neldoreth> pkgname=zathura pkgver=0.0.8.4 -pkgrel=2 +pkgrel=4 pkgdesc="a PDF viewer" arch=('i686' 'x86_64' 'mips64el') url="http://zathura.pwmt.org" @@ -26,4 +26,6 @@ package() { cd $srcdir/zathura-$pkgver make install DESTDIR=$pkgdir install -D -m664 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + mkdir -p $pkgdir/etc/bash_completion.d/ + echo "complete -f -X '!*.[pf]df' zathura" >$pkgdir/etc/bash_completion.d/zathura } diff --git a/community/zeromq/PKGBUILD b/community/zeromq/PKGBUILD index b503d355d..b5b326d44 100644 --- a/community/zeromq/PKGBUILD +++ b/community/zeromq/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 55967 2011-09-27 03:46:54Z kkeen $ +# $Id: PKGBUILD 56540 2011-10-08 03:04:25Z kkeen $ # Maintainer: Kyle Keen <keenerd@gmail.com> pkgname=zeromq -pkgver=2.1.9 -pkgrel=2 +pkgver=2.1.10 +pkgrel=1 pkgdesc="Fast messaging system built on sockets, C and C++ bindings. aka 0MQ, ZMQ." arch=('i686' 'x86_64' 'mips64el') url="http://www.zeromq.org" @@ -10,7 +10,7 @@ license=('LGPL') depends=('gcc-libs' 'util-linux') makedepends=() source=(http://download.zeromq.org/$pkgname-$pkgver.tar.gz) -md5sums=('94c5e0262a79c5f82bc0b178c1f8a33d') +md5sums=('f034096095fa76041166a8861e9d71b7') build() { cd "$srcdir/$pkgname-$pkgver" |
