diff options
78 files changed, 769 insertions, 631 deletions
diff --git a/community/aria2/PKGBUILD b/community/aria2/PKGBUILD index 2a8ef73c3..23dd2dd75 100644 --- a/community/aria2/PKGBUILD +++ b/community/aria2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 97034 2013-09-11 06:15:17Z bpiotrowski $ +# $Id: PKGBUILD 99071 2013-10-24 08:15:38Z bpiotrowski $ # Maintainer: BartÅ‚omiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Angel Velasquez <angvp@archlinux.org> @@ -6,7 +6,7 @@ # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=aria2 -pkgver=1.18.0 +pkgver=1.18.1 pkgrel=1 pkgdesc='Download utility that supports HTTP(S), FTP, BitTorrent, and Metalink' arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ license=('GPL') depends=('gnutls' 'libxml2' 'sqlite' 'c-ares' 'ca-certificates') checkdepends=('cppunit') source=(http://downloads.sourceforge.net/aria2/aria2-${pkgver}.tar.xz) -sha256sums=('431aa6a1ba1cf992d5ac68c2822854a6c6991f03d025608311b5d99227fc0ab7') +sha256sums=('14179cec7d476204faa52c4220fd8332a1036edd2c16fa3a9a29fd5d8b763968') build() { cd $pkgname-$pkgver diff --git a/community/banner/PKGBUILD b/community/banner/PKGBUILD index 8720cb681..b84170f85 100644 --- a/community/banner/PKGBUILD +++ b/community/banner/PKGBUILD @@ -1,15 +1,16 @@ -# Maintainer: jsteel <jsteel@aur.archlinux.org> +# Maintainer: Jonathan Steel <jsteel@aur.archlinux.org> # Contributor: Peter Simons <simons@cryp.to> pkgname=banner pkgver=1.3.2 -pkgrel=4 +pkgrel=5 pkgdesc="Print large banners to ASCII terminals" arch=('i686' 'x86_64') url="http://shh.thathost.com/pub-unix" license=('GPL') depends=('glibc') makedepends=('shhmsg' 'shhopt') +conflicts=('sysvbanner') source=($url/files/$pkgname-$pkgver.tar.gz) md5sums=('9bd1dc58d3bced525a19194b92d20217') diff --git a/community/dbmail/PKGBUILD b/community/dbmail/PKGBUILD index 4d0c78a55..c22b6ebb5 100644 --- a/community/dbmail/PKGBUILD +++ b/community/dbmail/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 98903 2013-10-21 10:04:20Z spupykin $ +# $Id: PKGBUILD 99113 2013-10-24 13:50:20Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sebastian Faltoni <sebastian.faltoni@gmail.com> pkgname=dbmail pkgver=3.1.7 -pkgrel=3 +pkgrel=4 pkgdesc="Fast and scalable sql based mail services" arch=('i686' 'x86_64') depends=('gmime' 'libzdb' 'mhash' 'libevent') diff --git a/community/geda-gaf/PKGBUILD b/community/geda-gaf/PKGBUILD index 0c6ae88da..6dab25f76 100644 --- a/community/geda-gaf/PKGBUILD +++ b/community/geda-gaf/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 97320 2013-09-17 11:15:31Z kkeen $ +# $Id: PKGBUILD 99104 2013-10-24 12:53:47Z kkeen $ # Maintainer: Kyle Keen <keenerd@gmail.com> # Contributor: Jared Casper <jaredcasper@gmail.com> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> pkgname=geda-gaf pkgver=1.8.1 -pkgrel=3 +pkgrel=4 pkgdesc="gEDA/gaf suite - Contains gschem, gnetlist, gsymcheck, gattrib, utilities and documentation from the gEDA project" arch=('i686' 'x86_64') url="http://geda-project.org/" diff --git a/community/gerbv/PKGBUILD b/community/gerbv/PKGBUILD index bf06a6125..9c8af3255 100644 --- a/community/gerbv/PKGBUILD +++ b/community/gerbv/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 97318 2013-09-17 10:57:59Z kkeen $ +# $Id: PKGBUILD 99098 2013-10-24 12:43:42Z kkeen $ # Maintainer: Kyle Keen <keenerd@gmail.com> # Contributor: Jared Casper <jaredcasper@gmail.com> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> pkgname=gerbv pkgver=2.6.1 -pkgrel=1 +pkgrel=2 pkgdesc="An open source Gerber file (RS-274X only) viewer" #url="http://gerbv.gpleda.org/" url="http://gerbv.geda-project.org/" diff --git a/community/gpicview/PKGBUILD b/community/gpicview/PKGBUILD index 668131416..9c52edf9e 100644 --- a/community/gpicview/PKGBUILD +++ b/community/gpicview/PKGBUILD @@ -1,42 +1,37 @@ -# $Id: PKGBUILD 96672 2013-09-02 21:26:05Z bgyorgy $ +# $Id: PKGBUILD 99073 2013-10-24 08:15:59Z bpiotrowski $ # Maintainer: BartÅ‚omiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> pkgname=gpicview -pkgver=0.2.3 -pkgrel=2 -pkgdesc="lightweight image viewer" +pkgver=0.2.4 +pkgrel=1 +pkgdesc='Lightweight image viewer' arch=('i686' 'x86_64') license=('GPL2') -url="http://lxde.org/" +url='http://lxde.org/' groups=('lxde') -depends=('gtk2' 'desktop-file-utils') +depends=('gtk2' 'desktop-file-utils' 'xdg-utils') install=$pkgname.install makedepends=('pkgconfig' 'intltool') optdepends=('librsvg: For SVG support') -source=(http://downloads.sourceforge.net/sourceforge/lxde/${pkgname}-${pkgver}.tar.gz - fix-scrolling.patch) -md5sums=('bca9ffe1d283ed3dbb13bada7feb7e89' - 'f258a3e703c4daa2f79c0c9f5a625d86') +source=(http://downloads.sourceforge.net/sourceforge/lxde/$pkgname-$pkgver.tar.gz) +md5sums=('b209e36531f89c48e3067b389699d4c7') prepare() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver - # Fix scrolling (FS#34872) - patch -Np1 -i "$srcdir/fix-scrolling.patch" - - # Apply one main category only (FS#34684) + # Apply only one main category (FS#34684) sed -i '/^Categories=/ s/Utility;//' gpicview.desktop.in } build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver ./configure --sysconfdir=/etc --prefix=/usr make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/community/gpicview/fix-scrolling.patch b/community/gpicview/fix-scrolling.patch deleted file mode 100644 index 9323055ad..000000000 --- a/community/gpicview/fix-scrolling.patch +++ /dev/null @@ -1,149 +0,0 @@ -From 88e76ee77d7271820dfad4b66ea1ca892e1a1ae0 Mon Sep 17 00:00:00 2001 -From: Vadim Ushakov <igeekless@gmail.com> -Date: Fri, 3 Aug 2012 22:43:29 +0800 -Subject: [PATCH] fix scrolling when scale == 1 - ---- - src/image-view.c | 98 ++++++++---------------------------------------------- - 1 files changed, 14 insertions(+), 84 deletions(-) - -diff --git a/src/image-view.c b/src/image-view.c -index cd40e3a..b367f2a 100644 ---- a/src/image-view.c -+++ b/src/image-view.c -@@ -309,65 +309,6 @@ void image_view_paint( ImageView* iv, GdkEventExpose* evt ) - { - // GdkRectangle& rect = rects[i]; - paint( iv, rects + i, GDK_INTERP_NEAREST ); --#if 0 -- g_debug("dirty dest: x=%d, y=%d, w=%d, h=%d\nx_off=%d, y_off=%d", -- rect.x, rect.y, rect.width, rect.height, iv->img_area.x, iv->img_area.y ); -- -- if( ! gdk_rectangle_intersect( &rect, &iv->img_area, &rect ) ) -- continue; -- -- int dest_x = rect.x; -- int dest_y = rect.y; -- -- rect.x -= img_area.x; -- rect.y -= img_area.y; -- -- GdkPixbuf* src_pix = NULL; -- int src_x, src_y; -- if( iv->scale == 1.0 ) // original size -- { -- src_pix = (GdkPixbuf*)g_object_ref( pix ); -- src_x = rect.x; -- src_y = rect.y; -- } -- else // scaling is needed -- { -- GdkPixbuf* scaled_pix = NULL; -- int src_w, src_h; -- src_x = (int)floor( gdouble(rect.x) / scale + 0.5 ); -- src_y = (int)floor( gdouble(rect.y) / scale + 0.5 ); -- src_w = (int)floor( gdouble(rect.width) / scale + 0.5 ); -- src_h = (int)floor( gdouble(rect.height) / scale + 0.5 ); -- if( src_y > gdk_pixbuf_get_height(pix) ) -- src_y = gdk_pixbuf_get_height(pix); -- if( src_x + src_w > gdk_pixbuf_get_width(pix) ) -- src_w = gdk_pixbuf_get_width(pix) - src_x; -- if( src_y + src_h > gdk_pixbuf_get_height(pix) ) -- src_h = gdk_pixbuf_get_height(pix) - src_y; -- g_debug("orig src: x=%d, y=%d, w=%d, h=%d", -- src_x, src_y, src_w, src_h ); -- -- src_pix = gdk_pixbuf_new_subpixbuf( pix, src_x, src_y, src_w, src_h ); -- scaled_pix = gdk_pixbuf_scale_simple( src_pix, rect.width, rect.height, interp_type ); -- g_object_unref( src_pix ); -- src_pix = scaled_pix; -- -- src_x = 0; -- src_y = 0; -- } -- -- if( G_LIKELY(src_pix) ) -- { -- gdk_draw_pixbuf( widget->window, -- widget->style->fg_gc[GTK_STATE_NORMAL], -- src_pix, -- src_x, src_y, -- dest_x, dest_y, -- rect.width, rect.height, -- GDK_RGB_DITHER_NORMAL, 0, 0 ); -- g_object_unref( src_pix ); -- } --#endif - } - g_free( rects ); - -@@ -525,28 +466,29 @@ void paint( ImageView* iv, GdkRectangle* invalid_rect, GdkInterpType type ) - if( ! gdk_rectangle_intersect( invalid_rect, &iv->img_area, &rect ) ) - return; - -- int dest_x = rect.x; -- int dest_y = rect.y; -- -- rect.x -= iv->img_area.x; -- rect.y -= iv->img_area.y; -+ int dest_x; -+ int dest_y; - - GdkPixbuf* src_pix = NULL; -- int src_x, src_y; - if( iv->scale == 1.0 ) // original size - { - src_pix = (GdkPixbuf*)g_object_ref( iv->pix ); -- src_x = rect.x; -- src_y = rect.y; -+ dest_x = iv->img_area.x; -+ dest_y = iv->img_area.y; - } - else // scaling is needed - { -+ dest_x = rect.x; -+ dest_y = rect.y; -+ -+ rect.x -= iv->img_area.x; -+ rect.y -= iv->img_area.y; -+ - GdkPixbuf* scaled_pix = NULL; -- int src_w, src_h; -- src_x = (int)floor( ((gdouble)rect.x) / iv->scale + 0.5 ); -- src_y = (int)floor( ((gdouble)rect.y) / iv->scale + 0.5 ); -- src_w = (int)floor( ((gdouble)rect.width) / iv->scale + 0.5 ); -- src_h = (int)floor( ((gdouble)rect.height) / iv->scale + 0.5 ); -+ int src_x = (int)floor( ((gdouble)rect.x) / iv->scale + 0.5 ); -+ int src_y = (int)floor( ((gdouble)rect.y) / iv->scale + 0.5 ); -+ int src_w = (int)floor( ((gdouble)rect.width) / iv->scale + 0.5 ); -+ int src_h = (int)floor( ((gdouble)rect.height) / iv->scale + 0.5 ); - if( src_y > gdk_pixbuf_get_height( iv->pix ) ) - src_y = gdk_pixbuf_get_height( iv->pix ); - if( src_x + src_w > gdk_pixbuf_get_width( iv->pix ) ) -@@ -564,23 +506,11 @@ void paint( ImageView* iv, GdkRectangle* invalid_rect, GdkInterpType type ) - src_pix = scaled_pix; - } - -- src_x = 0; -- src_y = 0; - } - - if( G_LIKELY(src_pix) ) - { - GtkWidget* widget = (GtkWidget*)iv; --/* -- gdk_draw_pixbuf( widget->window, -- widget->style->fg_gc[GTK_STATE_NORMAL], -- src_pix, -- src_x, src_y, -- dest_x, dest_y, -- rect.width, rect.height, -- GDK_RGB_DITHER_NORMAL, 0, 0 ); --*/ -- // New function with cairo - cairo_t *cr = gdk_cairo_create (gtk_widget_get_window(widget)); - gdk_cairo_set_source_pixbuf (cr, src_pix, dest_x, dest_y); - cairo_paint (cr); --- -1.7.4.1 - diff --git a/community/gpicview/gpicview.install b/community/gpicview/gpicview.install index bc3abcd40..ec506fa93 100644 --- a/community/gpicview/gpicview.install +++ b/community/gpicview/gpicview.install @@ -1,11 +1,12 @@ post_install() { - update-desktop-database -q + update-desktop-database -q + xdg-icon-resource forceupdate --theme hicolor &> /dev/null } post_upgrade() { - post_install + post_install } post_remove() { - post_install + post_install } diff --git a/community/granite/PKGBUILD b/community/granite/PKGBUILD new file mode 100644 index 000000000..45930bbfe --- /dev/null +++ b/community/granite/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 99110 2013-10-24 13:12:55Z alucryd $ +# Maintainer: Maxime Gauduin <alucryd at gmail dot com> +# Contributor: Ner0 <darkelfdarkelf666 at yahoo dot co dot uk> + +pkgname=granite +pkgver=0.2.2 +pkgrel=3 +pkgdesc="An extension of GTK+ libraries" +arch=('i686' 'x86_64') +url="https://launchpad.net/granite" +license=('LGPL3') +depends=('gtk3' 'libgee06') +makedepends=('cmake' 'gobject-introspection' 'vala') +install="${pkgname}.install" +source=("https://launchpad.net/${pkgname}/${pkgver%\.?}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz") +sha256sums=('341f94cd8c2af60fc072fb8602e1406bccd77189aad76424b172c3ce08c173cc') + +build() { + cd ${pkgname}-${pkgver} + + if [[ -d build ]]; then + rm -rf build + fi + mkdir build && cd build + + cmake .. -DCMAKE_INSTALL_PREFIX='/usr' -DCMAKE_BUILD_TYPE='Release' + make +} + +package() { + cd ${pkgname}-${pkgver}/build + + make DESTDIR="${pkgdir}" install +} + +# vim: ts=2 sw=2 et: diff --git a/community/granite/granite.install b/community/granite/granite.install new file mode 100644 index 000000000..11027f6ea --- /dev/null +++ b/community/granite/granite.install @@ -0,0 +1,13 @@ +post_install() { + gtk-update-icon-cache -ftq usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} + +# vim: ts=2 sw=2 et: diff --git a/community/jansson/PKGBUILD b/community/jansson/PKGBUILD index 7dc08d820..b93245670 100644 --- a/community/jansson/PKGBUILD +++ b/community/jansson/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 97810 2013-09-30 00:05:41Z kkeen $ +# $Id: PKGBUILD 99106 2013-10-24 13:00:22Z kkeen $ # Maintainer: Kyle Keen <keenerd@gmail.com> # Contributor: Dave Reisner <d@falconindy.com> pkgname=jansson pkgver=2.5 -pkgrel=1 +pkgrel=2 pkgdesc='C library for encoding, decoding and manipulating JSON data' arch=('i686' 'x86_64') url='http://www.digip.org/jansson/' depends=('glibc') license=('MIT') -options=('!libtool') +options=('staticlibs') source=("http://www.digip.org/$pkgname/releases/$pkgname-$pkgver.tar.bz2") md5sums=('ab239be8c08871c8463b27cf7610947c') diff --git a/community/luasocket/PKGBUILD b/community/luasocket/PKGBUILD index 684566c28..f77bfaab3 100644 --- a/community/luasocket/PKGBUILD +++ b/community/luasocket/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 98942 2013-10-21 14:19:50Z spupykin $ +# $Id: PKGBUILD 99083 2013-10-24 09:31:56Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Anders Bergh <anders1@gmail.com> pkgbase=luasocket pkgname=(lua-socket lua51-socket) pkgver=3.0rc1 -pkgrel=2 +pkgrel=3 pkgdesc='Networking support library for the Lua language' arch=('i686' 'x86_64') url='https://github.com/diegonehab/luasocket' @@ -34,7 +34,7 @@ build() { package_lua-socket() { depends=('lua') cd luasocket-${pkgver/rc/-rc}-52 - make DESTDIR="$pkgdir/" LUAV=5.2 prefix=/usr install + make DESTDIR="$pkgdir/" LUAV=5.2 prefix=/usr install-unix install -D -m0644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } @@ -44,6 +44,6 @@ package_lua51-socket() { conflicts=('luasocket') cd luasocket-${pkgver/rc/-rc} - make DESTDIR="$pkgdir/" LUAV=5.1 prefix=/usr install + make DESTDIR="$pkgdir/" LUAV=5.1 prefix=/usr install-unix install -D -m0644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } diff --git a/community/lxappearance-obconf/PKGBUILD b/community/lxappearance-obconf/PKGBUILD index 9f771b4bf..ad7a47423 100644 --- a/community/lxappearance-obconf/PKGBUILD +++ b/community/lxappearance-obconf/PKGBUILD @@ -1,38 +1,27 @@ -# $Id: PKGBUILD 96676 2013-09-03 01:00:14Z bgyorgy $ +# $Id: PKGBUILD 99075 2013-10-24 08:16:14Z bpiotrowski $ # Maintainer: BartÅ‚omiej Piotrowski <nospam@bpiotrowski.pl> pkgname=lxappearance-obconf -pkgver=0.2.0 -pkgrel=2 -pkgdesc='A plugin for LXAppearance to configure Openbox' +pkgver=0.2.1 +pkgrel=1 +pkgdesc='Plugin for LXAppearance to configure Openbox' arch=('i686' 'x86_64') license=('GPL2') -url="http://lxde.org/" +url='http://lxde.org/' groups=('lxde') depends=('lxappearance' 'openbox') makedepends=('intltool') options=('!libtool') -source=(http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz - obconf-rrbutton.patch) -md5sums=('8bf23c90febe6a655e0f86c80e44725d' - '73cd418ff8dc68a76538fc829d6260c7') - -prepare() { - cd $srcdir/$pkgname-$pkgver - - # Fix building with openbox-3.5.2 - patch -Np1 -i ../obconf-rrbutton.patch -} +source=(http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz) +md5sums=('1f061c96e0c78a6476421ca294ac24aa') build() { - cd $srcdir/$pkgname-$pkgver + cd $pkgname-$pkgver ./configure --prefix=/usr --disable-static make } - package() { - cd $srcdir/$pkgname-$pkgver + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } - diff --git a/community/mpv/PKGBUILD b/community/mpv/PKGBUILD index 8124effb1..2c866dea6 100644 --- a/community/mpv/PKGBUILD +++ b/community/mpv/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 98686 2013-10-16 20:24:06Z bpiotrowski $ +# $Id: PKGBUILD 99077 2013-10-24 08:16:35Z bpiotrowski $ # Maintainer: BartÅ‚omiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Eivind Uggedal <eivind@uggedal.com> pkgname=mpv -pkgver=0.2.0 +pkgver=0.2.1 pkgrel=1 pkgdesc='Video player based on MPlayer/mplayer2' arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ makedepends=('mesa' 'python-docutils') options=(!emptydirs) install=mpv.install source=("https://github.com/mpv-player/$pkgname/archive/v$pkgver.tar.gz") -md5sums=('f86a6e99093b83717edded92ad8346b1') +md5sums=('4e7c8823354f97753f0cbe17c61ec211') build() { unset CFLAGS diff --git a/community/mythtv/PKGBUILD b/community/mythtv/PKGBUILD index a61dbdd84..a053fffa9 100644 --- a/community/mythtv/PKGBUILD +++ b/community/mythtv/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 97419 2013-09-19 04:04:04Z jconder $ +# $Id: PKGBUILD 99069 2013-10-24 02:39:07Z jconder $ # Maintainer: Jonathan Conder <jonno.conder@gmail.com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Juergen Hoetzel <juergen@archlinux.org> @@ -7,7 +7,7 @@ pkgname=mythtv pkgver=0.27 -pkgrel=1 +pkgrel=2 epoch=1 pkgdesc="A Homebrew PVR project" arch=('i686' 'x86_64') diff --git a/community/noise/PKGBUILD b/community/noise/PKGBUILD new file mode 100644 index 000000000..e34eb3062 --- /dev/null +++ b/community/noise/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 99111 2013-10-24 13:13:25Z alucryd $ +# Maintainer: Maxime Gauduin <alucryd at gmail dot com> + +pkgname=noise +pkgver=0.2.4 +pkgrel=2 +pkgdesc="Simple, fast, and good looking music player" +arch=('i686' 'x86_64') +url="https://launchpad.net/noise" +license=('GPL3') +depends=('desktop-file-utils' 'granite' 'gstreamer0.10-base' 'json-glib' 'libgpod' 'libnotify' 'libpeas' 'libsoup' 'sqlheavy' 'taglib') +makedepends=('cmake' 'vala') +optdepends=('elementary-icon-theme: Missing UI icons' + 'gstreamer0.10-base-plugins: "Base" plugin libraries' + 'gstreamer0.10-good-plugins: "Good" plugin libraries' + 'gstreamer0.10-bad-plugins: "Bad" plugin libraries' + 'gstreamer0.10-ugly-plugins: "Ugly" plugin libraries') +install="${pkgname}.install" +source=("https://launchpad.net/${pkgname}/${pkgver%.?}/${pkgver}/+download/${pkgname}-${pkgver}.tgz") +sha256sums=('ffcd5f2cba112af13707a7ba7f0ceace7b812d4b6082671684ff78d76fc1d8a9') + +build() { + cd ${pkgname}-${pkgver} + + if [[ -d build ]]; then + rm -rf build + fi + mkdir build && cd build + + cmake .. -DCMAKE_INSTALL_PREFIX='/usr' -DCMAKE_BUILD_TYPE='Release' -DGSETTINGS_COMPILE='OFF' + make +} + +package() { + cd ${pkgname}-${pkgver}/build + + make DESTDIR="${pkgdir}" install +} + +# vim: ts=2 sw=2 et: diff --git a/community/noise/noise.install b/community/noise/noise.install new file mode 100644 index 000000000..20def33a9 --- /dev/null +++ b/community/noise/noise.install @@ -0,0 +1,17 @@ +post_install() { + glib-compile-schemas usr/share/glib-2.0/schemas + gtk-update-icon-cache -ftq usr/share/icons/hicolor + update-desktop-database -q +} + +post_upgrade() +{ + post_install +} + +post_remove() +{ + post_install +} + +# vim: ts=2 sw=2 et: diff --git a/community/pd/PKGBUILD b/community/pd/PKGBUILD index 365b70e67..4ff3b7606 100644 --- a/community/pd/PKGBUILD +++ b/community/pd/PKGBUILD @@ -1,23 +1,30 @@ -# $Id: PKGBUILD 92233 2013-06-03 06:13:55Z bpiotrowski $ +# $Id: PKGBUILD 99115 2013-10-24 15:22:27Z speps $ # Maintainer : speps <speps at aur dot archlinux dot org> # Contributor: TDY <tdy@gmx.com> # Contributor: Shinlun Hsieh <yngwiexx@yahoo.com.tw> pkgname=pd -pkgver=0.44.3 +pkgver=0.45.3 _ver=${pkgver%.*}-${pkgver##*.} -pkgrel=2 +pkgrel=1 pkgdesc="The Pure Data real-time music and multimedia environment" arch=('i686' 'x86_64') url="http://crca.ucsd.edu/~msp/software.html" license=('custom:BSD') depends=('jack' 'fftw' 'tk') provides=('puredata') -source=("http://crca.ucsd.edu/~msp/Software/pd-$_ver.src.tar.gz") -md5sums=('a3e8ca0eab039dc472a6533ef9344582') +source=("http://crca.ucsd.edu/~msp/Software/pd-$_ver.src.tar.gz" + "enable-fftw3.patch") +md5sums=('461a3d0d558a4f45c49943234baa9ca8' + 'bb907907a9b33f6c63312274c8523d40') + +prepare() { + cd pd-$_ver + patch -p1 -i ../${source[1]} +} build() { - cd "$srcdir/pd-$_ver" + cd pd-$_ver ./autogen.sh ./configure --prefix=/usr \ --enable-alsa \ @@ -28,7 +35,7 @@ build() { } package() { - cd "$srcdir/pd-$_ver" + cd pd-$_ver make DESTDIR="$pkgdir" install # license diff --git a/community/pd/enable-fftw3.patch b/community/pd/enable-fftw3.patch new file mode 100644 index 000000000..678e05862 --- /dev/null +++ b/community/pd/enable-fftw3.patch @@ -0,0 +1,19 @@ +diff -aur pd-0.45-3/configure.ac pd-0.45-3.fftw3/configure.ac +--- pd-0.45-3/configure.ac 2013-10-03 18:22:29.000000000 +0200 ++++ pd-0.45-3.fftw3/configure.ac 2013-10-24 02:14:09.555763309 +0200 +@@ -212,13 +212,13 @@ + AM_CONDITIONAL(PORTMIDI, test x$portmidi = xyes) + if test x$portmidi = xyes; then echo Using included portmidi; fi + +-dnl fftw v2 ++dnl fftw v3 + AC_ARG_ENABLE([fftw], + [AS_HELP_STRING([--enable-fftw], + [use FFTW package])], + [fftw=$enableval]) + if test x$fftw = xyes; then +- AC_CHECK_LIB(fftw, fftw_one, [LIBS="$LIBS -lfftw"], ++ AC_CHECK_LIB(fftw3f, fftwf_execute, [LIBS="$LIBS -lfftw3f"], + [AC_MSG_NOTICE([fftw package not found - using built-in FFT]); fftw=no]) + fi + AM_CONDITIONAL(FFTW, test x$fftw = xyes) diff --git a/community/pgadmin3/PKGBUILD b/community/pgadmin3/PKGBUILD index fe73a337c..314f4e50f 100644 --- a/community/pgadmin3/PKGBUILD +++ b/community/pgadmin3/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 99053 2013-10-23 12:11:30Z spupykin $ +# $Id: PKGBUILD 99091 2013-10-24 10:41:34Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Douglas Soares de Andrade <dsa@aur.archlinux.org> # Contributor: Benjamin Andresen <benny@klapmuetz.org> @@ -6,13 +6,14 @@ pkgname=pgadmin3 pkgver=1.18.1 -pkgrel=2 +pkgrel=3 pkgdesc="Comprehensive design and management interface for PostgreSQL" arch=('i686' 'x86_64') url="http://www.pgadmin.org" license=('custom') depends=('wxgtk' 'postgresql-libs' 'libxslt') makedepends=('libpqxx' 'krb5' 'postgresql' 'imagemagick') +install=pgadmin3.install source=(http://ftp.postgresql.org/pub/pgadmin3/release/v${pkgver}/src/pgadmin3-${pkgver}.tar.gz) md5sums=('7dde96680407c900af72d0839a377de4') diff --git a/community/pgadmin3/pgadmin3.install b/community/pgadmin3/pgadmin3.install new file mode 100644 index 000000000..56e20c736 --- /dev/null +++ b/community/pgadmin3/pgadmin3.install @@ -0,0 +1,11 @@ +post_install() { + [ -x usr/bin/update-desktop-database ] && update-desktop-database -q || true +} + +post_upgrade() { + [ -x usr/bin/update-desktop-database ] && update-desktop-database -q || true +} + +post_remove() { + [ -x usr/bin/update-desktop-database ] && update-desktop-database -q || true +} diff --git a/community/qcad/PKGBUILD b/community/qcad/PKGBUILD index 6cffeb967..35fda67b1 100644 --- a/community/qcad/PKGBUILD +++ b/community/qcad/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 98945 2013-10-21 14:45:27Z spupykin $ +# $Id: PKGBUILD 99094 2013-10-24 11:49:04Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> # Contributor: Giovanni Scafora <linuxmania@gmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=qcad -pkgver=3.3.4.0 +pkgver=3.4.0.0 pkgrel=1 pkgdesc="A 2D CAD package based upon Qt" arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ makedepends=('glu') options=(libtool) source=($pkgname-$pkgver.tar.gz::https://github.com/qcad/qcad/archive/v${pkgver}.tar.gz QCad.desktop) -md5sums=('ceec731e034aa2e2e9a1f1669ec55e57' +md5sums=('b781fb8dcf8ba2725bbccf315a1da44f' '35100eaedbdf6625f6e6a09b177854cd') prepare() { diff --git a/community/quagga/PKGBUILD b/community/quagga/PKGBUILD index 486fbec49..e887e56ce 100644 --- a/community/quagga/PKGBUILD +++ b/community/quagga/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 98892 2013-10-21 07:13:03Z seblu $ +# $Id: PKGBUILD 99121 2013-10-24 20:42:11Z seblu $ # Maintainer: Sébastien Luttringer pkgname=quagga pkgver=0.99.22.4 -pkgrel=2 +pkgrel=3 pkgdesc='BGP/OSPF/ISIS/RIP/RIPNG routing daemon suite' arch=('i686' 'x86_64') url='http://www.quagga.net' @@ -20,7 +20,7 @@ source=("http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.tar 'ripd.service' 'ripngd.service' 'zebra.service') -md5sums=('1b68aa52d403b6b4ea877e005610a6b4' +md5sums=('27ef98abb1820bae19eb71f631a10853' '20a8e36ad851d4e06467aeb56a84b245' 'cc90c234aac9098c5132d653037d5269' '67d0ada0f3000b9a86351798786c5256' diff --git a/community/rtl-sdr/PKGBUILD b/community/rtl-sdr/PKGBUILD index 04c8afa7f..260b5c4fe 100644 --- a/community/rtl-sdr/PKGBUILD +++ b/community/rtl-sdr/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 98280 2013-10-07 22:50:19Z kkeen $ +# $Id: PKGBUILD 99108 2013-10-24 13:05:39Z kkeen $ # Maintainer: Kyle Keen <keenerd@gmail.com> # Contributor: Michael Düll <mail@akurei.me> @@ -7,7 +7,7 @@ pkgname=rtl-sdr # consider using tags for the pkgver in the future pkgver=20130913 _commit=4914b5d4314b752 -pkgrel=1 +pkgrel=2 pkgdesc="Driver for Realtek RTL2832U, allowing general purpose software defined radio (SDR)." arch=('i686' 'x86_64') url="http://sdr.osmocom.org/trac/wiki/rtl-sdr" @@ -15,6 +15,7 @@ license=('GPL') depends=('libusb>=1.0') makedepends=('git' 'cmake') conflicts=('rtl-sdr-git') +options=('staticlibs') install=rtl-sdr.install source=("git://git.osmocom.org/rtl-sdr.git#commit=$_commit" 'rtlsdr.conf') @@ -28,6 +29,7 @@ build() { mkdir build cd build cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr -Wno-dev ../ + #cmake ../ -DINSTALL_UDEV_RULES=ON make } diff --git a/community/sk1/PKGBUILD b/community/sk1/PKGBUILD index ed0920ac3..d6002833d 100644 --- a/community/sk1/PKGBUILD +++ b/community/sk1/PKGBUILD @@ -1,51 +1,27 @@ -# $Id: PKGBUILD 98434 2013-10-10 11:32:25Z spupykin $ +# $Id: PKGBUILD 99085 2013-10-24 10:25:28Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: ConnorBehan <connor.behan@gmail.com> pkgname=sk1 pkgver=0.9.1 -pkgrel=12 +pkgrel=13 pkgdesc="Fork of skencil with improved CMYK support" arch=(i686 x86_64) url="http://sk1project.org/modules.php?name=Products&product=sk1" -depends=('tcl' 'tk' 'python2-lcms' 'python2-pillow' 'zenity' 'sk1libs') +depends=('tcl' 'tk' 'python2-lcms' 'python2-pillow' 'zenity' 'sk1libs' 'sk1sdk') license=('GPL' 'LGPL') -source=(http://sk1project.org/downloads/sk1/${pkgver}pre_rev905/sK1-${pkgver}pre_rev905.tar.gz - sk1.desktop - fix_pillow_import.patch +source=(https://sk1.googlecode.com/files/sk1-${pkgver}pre2_rev1383.tar.gz build-fix.patch) +md5sums=('ce8a98e99e133b215b7ed67d6b0e0113' + 'b22c3c7b6a979c0a4e59ecaa2bd2182b') -package() { - local _tclver=`pacman -Q tcl` - local _tclnum=${tclver:4:3} - local _tcldir='tcl'${tclnum} - - cd $srcdir/sK1-${pkgver}pre - - # pillow import fix - patch -Np1 -i $srcdir/fix_pillow_import.patch - - # python2 fix - sed -i 's_#! /usr/bin/python_#! /usr/bin/python2_' src/__init__.py - +prepare() { + cd $srcdir/sk1-${pkgver}pre2 + sed -i 's_#! /usr/bin/python_#! /usr/bin/python2_' src/{__init__.py,sk1} patch -p1 <$srcdir/build-fix.patch - python2 setup.py install --prefix=/usr --root=$pkgdir - - mkdir -p $pkgdir/usr/share/pixmaps - mkdir -p $pkgdir/usr/share/applications - - cp $pkgdir/usr/lib/python2.7/site-packages/sk1/share/icons/CrystalSVG/icon_sk1_32.png \ - $pkgdir/usr/share/pixmaps/sk1.png - - cp $srcdir/sk1.desktop $pkgdir/usr/share/applications - - mkdir $pkgdir/usr/lib/${_tcldir} - cp -r $pkgdir/usr/lib/python2.7/site-packages/sk1/share/ttk-themes/Plastik \ - $pkgdir/usr/lib/${_tcldir}/Plastik +} - sed -i 's#^python#python2#' $pkgdir/usr/bin/sk1 +package() { + cd $srcdir/sk1-${pkgver}pre2 + python2 setup.py install --prefix=/usr --root=$pkgdir } -md5sums=('43b82fd85049b078dcf98e9dd81fdc6a' - 'bbf6f10b8155838eede93b5abed724f5' - '4a44dd89707b19fe58f4c124ed321236' - 'b22c3c7b6a979c0a4e59ecaa2bd2182b') diff --git a/community/sk1/fix_pillow_import.patch b/community/sk1/fix_pillow_import.patch deleted file mode 100644 index 7306dd3b6..000000000 --- a/community/sk1/fix_pillow_import.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -aur sK1-0.9.1pre/src/app/UI/pluginpanels/properties/gradient_fill.py sK1-0.9.1pre.new/src/app/UI/pluginpanels/properties/gradient_fill.py ---- sK1-0.9.1pre/src/app/UI/pluginpanels/properties/gradient_fill.py 2009-07-16 23:26:15.000000000 +0000 -+++ sK1-0.9.1pre.new/src/app/UI/pluginpanels/properties/gradient_fill.py 2013-09-22 09:52:26.543457833 +0000 -@@ -24,7 +24,7 @@ - - import tooltips - --import Image, ImageTk, ImageDraw -+from PIL import Image, ImageTk, ImageDraw - - DEFAULT_WIDTH=0.283286 - DEFAULT_CORNER=const.JoinMiter -diff -aur sK1-0.9.1pre/src/app/UI/pluginpanels/properties/outlineprop.py sK1-0.9.1pre.new/src/app/UI/pluginpanels/properties/outlineprop.py ---- sK1-0.9.1pre/src/app/UI/pluginpanels/properties/outlineprop.py 2009-05-15 22:11:39.000000000 +0000 -+++ sK1-0.9.1pre.new/src/app/UI/pluginpanels/properties/outlineprop.py 2013-09-22 09:52:13.216885815 +0000 -@@ -24,7 +24,7 @@ - - import tooltips - --import Image, ImageTk, ImageDraw -+from PIL import Image, ImageTk, ImageDraw - - DEFAULT_WIDTH=0.283286 - DEFAULT_CORNER=const.JoinMiter -diff -aur sK1-0.9.1pre/src/app/UI/widgets/colorbutton.py sK1-0.9.1pre.new/src/app/UI/widgets/colorbutton.py ---- sK1-0.9.1pre/src/app/UI/widgets/colorbutton.py 2009-04-30 02:58:41.000000000 +0000 -+++ sK1-0.9.1pre.new/src/app/UI/widgets/colorbutton.py 2013-09-22 09:52:38.150044124 +0000 -@@ -8,7 +8,7 @@ - # The color sample size is 31x20 px - - from Ttk import TButton --import Image, ImageTk -+from PIL import Image, ImageTk - - class TColorButton(TButton): diff --git a/community/sk1/sk1.desktop b/community/sk1/sk1.desktop deleted file mode 100644 index 6e1878e6e..000000000 --- a/community/sk1/sk1.desktop +++ /dev/null @@ -1,59 +0,0 @@ - -[Desktop Entry] -Encoding=UTF-8 -Name=sk1 -GenericName=Vector-based Drawing Program -GenericName[af]=Vector-based Teken Program -GenericName[bg]=ÐекÑоѬна Ð³Ñ¬Ð°Ñ Ð¸Ñ!на пѬогѬама за ѬиÑýђване -GenericName[bs]=Program za vektorsko crtanje -GenericName[ca]=Programa de dibuix basat en els vectors -GenericName[cs]=Vektorový kreslÃprogram -GenericName[da]=Vektorbaseret tegneprogram -GenericName[de]=Vektorbasiertes Zeichenprogramm -GenericName[el]=Î ÏýÏRγÏýαμμα ÎÏ0γÏýÎ±Ï Î¹ÎºÎ®Ï ÎÎ±Ï’Î¹Ï’Î¼Î½Î·Ï Ï’Îµ ΠιανÏýÏ’Î¼Î±Ï Î± -GenericName[eo]=Vektor-desegnilo -GenericName[es]=Programa de dibujo vectorial -GenericName[et]=Vektorgraafika joonistamine -GenericName[eu]=Marazteko Programa Bektoriala -GenericName[fa]=بر٠اÙ&Ù!â¬RÛR رسÙ& بردارÛR -GenericName[fi]=Vektoripohjainen piirto-ohjelma -GenericName[fr]=Logiciel de dessin vectoriel -GenericName[he]=ת×"×:× ×"ת צ×"×"ר ×~××"ססת ×"ק×Ü×"ר×"×ý -GenericName[hr]=Vektorski program za crtanje -GenericName[hu]=vektoros rajzolóprogram -GenericName[is]=Vigrað teikniforrit -GenericName[it]=Programma di disegno vettoriale -GenericName[ja]=ã’"ã¯ã’Æã’«ã’0ã’¼ã¤ã’³ã°ã’ã’°ã’©ã’ -GenericName[lo]=à»àº:ຣà»ýàºýຣມວາຠàº~າàºaà»ýàºaàºa໬ວັàºý໬àº"ີ -GenericName[lt]=Vektorinio paiÅ¡ymo programa -GenericName[lv]=Uz Vektoriem bÄýzÄ tas ZÄ«mÄ Å¡anas Programma -GenericName[mk]=ÐекÑоѬÑýки базиѬан пѬогѬам за Ñ Ñ¬ÑаÑaе -GenericName[mn]=ÐекÑоѬв ÑђлгђђлаÑýан зђѬгийн пѬогѬам -GenericName[mt]=Programm biex tpinÄ¡i b'vektori -GenericName[nb]=Vektorbasert tegneprogram -GenericName[nl]=vector-gebaseerd tekenprogramma -GenericName[nn]=Vektorbasert teikneprogram -GenericName[nso]=Lenaneo lago Taka leo le Lebisitswego ka Vector -GenericName[pl]=Wektorowy program do rysowania -GenericName[pt]=Programa de Desenho Vectorial -GenericName[pt_BR]=Programa de Desenho baseado em Vetor -GenericName[ro]=Program de desenare vectorialÄ’ -GenericName[ru]=ÐxѬогѬамма векÑоѬной Ð³Ñ¬Ð°Ñ Ð¸ÐºÐ¸ -GenericName[se]=VektorvuoÄÄoduvvon sárgonprográmma -GenericName[sk]=Vektorový kresliaci program -GenericName[sl]=Program za vektorsko risanje -GenericName[sv]=Vektorbaserat ritprogram -GenericName[th]=à¹à¸:รà¹ýà¸ýรมวาภภาà¸~à¹ýà¸aà¸a๬วà¸ý๬à¸"ุ£à¹R -GenericName[tr]=Vektor Tabanlı Ã!izim Programı -GenericName[uk]=ÐxѬогѬама ÑýÑвоѬеннÑý векÑоѬниÑ& зобѬаженÑR -GenericName[ven]=Mbekanyamushumo yo olwaho sa Vekitha -GenericName[vi]=Trình vẽ kiá»’u Vector -GenericName[xh]=Inkqubo Yomzobo Osekwe-Kwimitha Yovavanyo -GenericName[zh_CN]=çx¢é!ýç»Üå:¾ç¨9åºý -GenericName[zh_TW]=åýé!ý繪åSç¨9å¼ý -GenericName[zu]=Uhlelo lwemisebenzi olusekelwe kwi-Vector -Exec=/usr/bin/sk1 -Categories=Application;Graphics; -Terminal=false -Type=Application -Icon=/usr/share/pixmaps/sk1.png diff --git a/community/sk1libs/PKGBUILD b/community/sk1libs/PKGBUILD index d4a374be8..91b43ef21 100644 --- a/community/sk1libs/PKGBUILD +++ b/community/sk1libs/PKGBUILD @@ -1,24 +1,24 @@ -# $Id: PKGBUILD 65445 2012-02-21 05:49:25Z spupykin $ +# $Id: PKGBUILD 99087 2013-10-24 10:25:54Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=sk1libs -pkgver=0.9.1 -pkgrel=3 +pkgver=0.9.2 +pkgrel=1 pkgdesc='A set of python non-GUI extensions for sK1 Project.' arch=('i686' 'x86_64') url='http://sk1project.org/' license=('custom:LGPL2') depends=('python2' 'freetype2' 'lcms') -source=("${pkgname}-${pkgver}.tar.gz::http://sk1project.org/dc.php?target=${pkgname}-${pkgver}.tar.gz") -md5sums=('e18088bbc8a105e7535a96f40b80f284') +source=("${pkgname}-${pkgver}.tar.gz::https://sk1.googlecode.com/files/sk1libs-${pkgver}pre_rev1383.tar.gz") +md5sums=('fdbb198779ff9941a8912438802fc05a') build() { - cd ${pkgname}-${pkgver} + cd ${pkgname}-${pkgver}pre python2 setup.py build } package() { - cd ${pkgname}-${pkgver} + cd ${pkgname}-${pkgver}pre python2 setup.py install --root ${pkgdir} install -D -m644 GNU_LGPL_v2 ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE } diff --git a/community/sk1sdk/PKGBUILD b/community/sk1sdk/PKGBUILD new file mode 100644 index 000000000..92dad15bf --- /dev/null +++ b/community/sk1sdk/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 78820 2012-10-25 06:47:28Z foutrelis $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> + +pkgname=sk1sdk +pkgver=0.9.1 +pkgrel=1 +pkgdesc='A set of python non-GUI extensions for sK1 Project.' +arch=('i686' 'x86_64') +url='http://sk1project.org/' +license=('custom:LGPL2') +depends=('python2' 'freetype2' 'lcms' 'tk' 'libxcursor') +source=("${pkgname}-${pkgver}.tar.gz::https://sk1.googlecode.com/files/sk1sdk-${pkgver}pre2_rev1383.tar.gz") +md5sums=('b6db1a14ed9d39251851a3d78b63bb15') + +prepare() { + cd ${pkgname}-${pkgver}pre2 + sed -i 's|python -c|python2 -c|g' src/tkstyle/{fonts,colors}.py +} + +build() { + cd ${pkgname}-${pkgver}pre2 + python2 setup.py build +} + +package() { + cd ${pkgname}-${pkgver}pre2 + python2 setup.py install --root ${pkgdir} + install -D -m644 GNU_LGPL_v2 ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE +} diff --git a/community/sqlheavy/PKGBUILD b/community/sqlheavy/PKGBUILD index 37902a562..5f968fda9 100755 --- a/community/sqlheavy/PKGBUILD +++ b/community/sqlheavy/PKGBUILD @@ -1,38 +1,37 @@ -# $Id: PKGBUILD 96517 2013-08-30 22:52:46Z alucryd $ +# $Id: PKGBUILD 99102 2013-10-24 12:51:25Z alucryd $ # Maintainer: Maxime Gauduin <alucryd at gmail dot com> # Contributor : sebikul <sebikul@gmail.com> pkgname=sqlheavy -pkgver=0.1.1 -pkgrel=7 +pkgver=0.2.0.7ae6112 +pkgrel=1 pkgdesc="GObject SQLite wrapper" arch=('i686' 'x86_64') url="https://code.google.com/p/sqlheavy/" license=('LGPL') depends=('gtk2' 'sqlite3') -makedepends=('gobject-introspection' 'vala') -options=('!libtool') -source=("https://sqlheavy.googlecode.com/files/${pkgname}-${pkgver}.tar.xz") -sha256sums=('e8689f5fd4e0baf98eada2b3811262bb99877c2e8586fd21ad2a7ad3acc59031') +makedepends=('git' 'gobject-introspection' 'vala') +source=('git://gitorious.org/sqlheavy/sqlheavy.git') +sha256sums=('SKIP') -prepare() { - cd ${pkgname}-${pkgver} +pkgver() { + cd ${pkgname} - sed 's/libvala-0.16/libvala-0.20/' -i configure - sed '/examples/d; /utils/d' -i Makefile.in + printf "0.2.0.%s" "$(git rev-parse --short HEAD)" } build() { - cd ${pkgname}-${pkgver} + cd ${pkgname} - ./configure --prefix='/usr' --disable-static + ./autogen.sh --prefix='/usr' --disable-static make } package() { - cd ${pkgname}-${pkgver} + cd ${pkgname} make DESTDIR="${pkgdir}" install + rm -rf "${pkgdir}"/usr/share/man } # vim: ts=2 sw=2 et: diff --git a/community/ulogd/PKGBUILD b/community/ulogd/PKGBUILD index 03bd912a6..ec36063c0 100644 --- a/community/ulogd/PKGBUILD +++ b/community/ulogd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 98179 2013-10-07 10:07:11Z spupykin $ +# $Id: PKGBUILD 99081 2013-10-24 09:27:16Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Sébastien Luttringer # Contributor: Dale Blount <dale@archlinux.org> @@ -6,7 +6,7 @@ pkgname=ulogd pkgver=2.0.2 -pkgrel=3 +pkgrel=4 pkgdesc='Userspace Packet Logging for netfilter' arch=('i686' 'x86_64') url='http://www.netfilter.org/projects/ulogd/index.html' @@ -30,7 +30,7 @@ source=("ftp://ftp.netfilter.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2" "$pkgname.service") md5sums=('660516de4b5b1e110c12dae414619e0f' '95f05af0a0c8f5fdea5bd92ccb2fd465' - '7ccdb48cd152ff502334d3f6b2a4daab' + '2c8cbedb2fb455cba220ca35186ad846' '092d72209e30c132e0a08112e4062772') build() { diff --git a/community/ulogd/ulogd.conf b/community/ulogd/ulogd.conf index f96bd1d2c..643892e88 100644 --- a/community/ulogd/ulogd.conf +++ b/community/ulogd/ulogd.conf @@ -9,8 +9,9 @@ plugin="/usr/lib/ulogd/ulogd_raw2packet_BASE.so" plugin="/usr/lib/ulogd/ulogd_filter_IP2STR.so" plugin="/usr/lib/ulogd/ulogd_filter_PRINTPKT.so" plugin="/usr/lib/ulogd/ulogd_output_LOGEMU.so" +plugin="/usr/lib/ulogd/ulogd_filter_IFINDEX.so" -stack=log1:NFLOG,base1:BASE,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU +stack=log1:NFLOG,base1:BASE,ifi1:IFINDEX,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU [log1] group=1 diff --git a/community/xmlstarlet/PKGBUILD b/community/xmlstarlet/PKGBUILD index a701d2730..3e6c18d11 100644 --- a/community/xmlstarlet/PKGBUILD +++ b/community/xmlstarlet/PKGBUILD @@ -1,34 +1,29 @@ -# $Id: PKGBUILD 83360 2013-01-30 09:39:18Z spupykin $ +# $Id: PKGBUILD 99079 2013-10-24 09:22:03Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: PyroPeter <abi1789@googlemail.com> # Contributor: BlackEagle <ike.devolder@scarlet.be> # Contributor: chochem <chochem@gmail.com> pkgname=xmlstarlet -pkgver=1.4.2 +pkgver=1.5.0 pkgrel=1 pkgdesc="A set of tools to transform, query, validate, and edit XML documents" arch=('i686' 'x86_64') url="http://xmlstar.sourceforge.net/" license=('MIT') -depends=('libxslt>=1.1.9') +depends=('libxslt') source=("xmlstarlet-$pkgver.tar.gz::http://sourceforge.net/projects/xmlstar/files/xmlstarlet/$pkgver/xmlstarlet-$pkgver.tar.gz/download") -md5sums=('ee8df42efd2417f74a1f5e3b7fe9e023') +md5sums=('0c6db295d0cf9ff0d439edb755b7e8f6') build() { cd "$srcdir/$pkgname-$pkgver" - - local xsltlibs=$(pkg-config --libs libxslt libexslt) - local xmllibs=$(pkg-config --libs libxml-2.0) - - LIBXSLT_PREFIX=/usr \ - LIBXML_PREFIX=/usr \ - LIBXSLT_LIBS="${xsltlibs}" \ - LIBXML_LIBS="${xmllibs}" \ - ./configure --prefix=/usr + LIBXSLT_PREFIX=/usr LIBXML_PREFIX=/usr ./configure --prefix=/usr make - make DESTDIR="${pkgdir}" install +} +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="${pkgdir}" install install -Dm0644 Copyright $pkgdir/usr/share/licenses/$pkgname/COPYING ln -s xml ${pkgdir}/usr/bin/xmlstarlet } diff --git a/community/zeromq/LIBZMQ-569.patch b/community/zeromq/LIBZMQ-569.patch new file mode 100644 index 000000000..a1e27f622 --- /dev/null +++ b/community/zeromq/LIBZMQ-569.patch @@ -0,0 +1,30 @@ +From 7ecab54ac3b7a6103c46892990217acafb039eed Mon Sep 17 00:00:00 2001 +From: Martin Hurton <hurtonm@gmail.com> +Date: Fri, 21 Jun 2013 16:23:38 +0200 +Subject: [PATCH] Load identity message to decoder at start + +--- + src/stream_engine.cpp | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/src/stream_engine.cpp b/src/stream_engine.cpp +index 0d87581..2c07889 100644 +--- a/src/stream_engine.cpp ++++ b/src/stream_engine.cpp +@@ -480,6 +480,13 @@ bool zmq::stream_engine_t::handshake () + // header data away. + const size_t header_size = options.identity_size + 1 >= 255 ? 10 : 2; + unsigned char tmp [10], *bufferp = tmp; ++ ++ // Prepare the identity message and load it into encoder. ++ // Then consume bytes we have already sent to the peer. ++ const int rc = tx_msg.init_size (options.identity_size); ++ zmq_assert (rc == 0); ++ memcpy (tx_msg.data (), options.identity, options.identity_size); ++ encoder->load_msg (&tx_msg); + size_t buffer_size = encoder->encode (&bufferp, header_size); + zmq_assert (buffer_size == header_size); + +-- +1.8.4 + diff --git a/community/zeromq/PKGBUILD b/community/zeromq/PKGBUILD index a91968c25..1e1da4244 100644 --- a/community/zeromq/PKGBUILD +++ b/community/zeromq/PKGBUILD @@ -1,18 +1,26 @@ -# $Id: PKGBUILD 98805 2013-10-18 23:13:16Z kkeen $ +# $Id: PKGBUILD 99117 2013-10-24 16:13:47Z mtorromeo $ # Maintainer: Kyle Keen <keenerd@gmail.com> pkgname=zeromq pkgver=4.0.1 -pkgrel=3 +pkgrel=5 pkgdesc="Fast messaging system built on sockets, C and C++ bindings. aka 0MQ, ZMQ." arch=('i686' 'x86_64') url="http://www.zeromq.org" license=('LGPL') depends=('gcc-libs' 'util-linux' 'libsodium') makedepends=('python2') +options=('staticlibs') source=(http://download.zeromq.org/$pkgname-$pkgver.tar.gz - https://raw.github.com/zeromq/cppzmq/master/zmq.hpp) + https://raw.github.com/zeromq/cppzmq/master/zmq.hpp + LIBZMQ-569.patch) md5sums=('e738c310d135e20fa48c5b348da18e22' - '388ddb07fdd88b040769e8f4c9b397fa') + '388ddb07fdd88b040769e8f4c9b397fa' + '2ef4f92027ec2b88e8eec86b2cccf2e4') + +prepare() { + cd "$srcdir/$pkgname-$pkgver" + patch -p1 -i "$srcdir/LIBZMQ-569.patch" +} build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/core/curl/PKGBUILD b/core/curl/PKGBUILD index 9ca623a0e..b5741da2a 100644 --- a/core/curl/PKGBUILD +++ b/core/curl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 196882 2013-10-20 21:20:05Z dreisner $ +# $Id: PKGBUILD 197255 2013-10-24 19:47:20Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> @@ -7,7 +7,7 @@ pkgname=curl pkgver=7.33.0 -pkgrel=1 +pkgrel=2 pkgdesc="An URL retrieval utility and library" arch=('i686' 'x86_64') url="http://curl.haxx.se" diff --git a/core/dialog/PKGBUILD b/core/dialog/PKGBUILD index 6bc4fea12..85f4c8542 100644 --- a/core/dialog/PKGBUILD +++ b/core/dialog/PKGBUILD @@ -1,12 +1,13 @@ -# $Id: PKGBUILD 195853 2013-10-02 13:25:41Z foutrelis $ +# $Id: PKGBUILD 197224 2013-10-24 09:07:05Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> pkgname=dialog -pkgver=1.2_20131001 +pkgver=1.2_20130928 pkgrel=1 +epoch=1 pkgdesc="A tool to display dialog boxes from shell scripts" arch=('i686' 'x86_64') url="http://invisible-island.net/dialog/" @@ -14,7 +15,7 @@ license=('LGPL2.1') depends=('ncurses') options=('staticlibs') source=(ftp://invisible-island.net/$pkgname/$pkgname-${pkgver/_/-}.tgz) -sha256sums=('b22215d56dfbfa7f025092759e8f144b17321e14829b2a273f68d745a1f0dca5') +sha256sums=('6fcf8daa50335e4d08da9f4f5ea5e1025efe84c3a719a56e871eb83ed0fd2b4c') build() { cd "$srcdir/$pkgname-${pkgver/_/-}" diff --git a/core/libarchive/PKGBUILD b/core/libarchive/PKGBUILD index 6820b23b0..cedff1878 100644 --- a/core/libarchive/PKGBUILD +++ b/core/libarchive/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 196629 2013-10-15 21:20:36Z dreisner $ +# $Id: PKGBUILD 197256 2013-10-24 19:47:22Z dreisner $ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=libarchive pkgver=3.1.2 -pkgrel=3 +pkgrel=4 pkgdesc="library that can create and read several streaming archive formats" arch=('i686' 'x86_64') url="http://libarchive.org/" license=('BSD') depends=('acl' 'attr' 'bzip2' 'expat' 'lzo2' 'openssl' 'xz' 'zlib') -options=('strip' 'debug') +options=('strip' 'debug' 'libtool') provides=('libarchive.so') source=("http://libarchive.org/downloads/$pkgname-$pkgver.tar.gz" '0001-mtree-fix-line-filename-length-calculation.patch' diff --git a/core/shadow/PKGBUILD b/core/shadow/PKGBUILD index 2080f59c3..1a3224325 100644 --- a/core/shadow/PKGBUILD +++ b/core/shadow/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 187042 2013-06-03 11:15:35Z allan $ +# $Id: PKGBUILD 197259 2013-10-24 19:47:27Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Maintainer: Aaron Griffin <aaron@archlinux.org> pkgname=shadow pkgver=4.1.5.1 -pkgrel=6 +pkgrel=7 pkgdesc="Password and account management tool suite with support for shadow files and PAM" arch=('i686' 'x86_64') url='http://pkg-shadow.alioth.debian.org/' @@ -16,7 +16,7 @@ backup=(etc/login.defs etc/pam.d/{chpasswd,newusers,groupadd,groupdel,groupmod} etc/pam.d/{chgpasswd,groupmems} etc/default/useradd) -options=('!libtool') +options=('!libtool' strip debug) install='shadow.install' source=("http://pkg-shadow.alioth.debian.org/releases/$pkgname-$pkgver.tar.bz2"{,.sig} LICENSE @@ -114,7 +114,7 @@ package() { # Remove utilities provided by util-linux rm \ - "$pkgdir"/usr/bin/{login,su,chsh,chfn,sg} \ + "$pkgdir"/usr/bin/{login,su,chsh,chfn,sg,nologin} \ "$pkgdir"/usr/sbin/{vipw,vigr} # but we keep newgrp, as sg is really an alias to it @@ -127,6 +127,7 @@ package() { -name 'su.1' -o \ -name 'logoutd.8' -o \ -name 'login.1' -o \ + -name 'nologin.8' -o \ -name 'vipw.8' -o \ -name 'vigr.8' -o \ -name 'newgrp.1' ')' \ diff --git a/core/systemd/0001-mount-check-for-NULL-before-reading-pm-what.patch b/core/systemd/0001-mount-check-for-NULL-before-reading-pm-what.patch new file mode 100644 index 000000000..27256484c --- /dev/null +++ b/core/systemd/0001-mount-check-for-NULL-before-reading-pm-what.patch @@ -0,0 +1,29 @@ +From 9c03872bc8fb2a381eafe7301ef9811b641686dd Mon Sep 17 00:00:00 2001 +From: Dave Reisner <dreisner@archlinux.org> +Date: Fri, 4 Oct 2013 18:22:40 -0400 +Subject: [PATCH] mount: check for NULL before reading pm->what + +Since a57f7e2c828b85, a mount unit with garbage in it would cause +systemd to crash on loading it. + +ref: https://bugs.freedesktop.org/show_bug.cgi?id=70148 +--- + src/core/mount.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/core/mount.c b/src/core/mount.c +index 93bfa99..db055f0 100644 +--- a/src/core/mount.c ++++ b/src/core/mount.c +@@ -182,7 +182,7 @@ static int mount_add_mount_links(Mount *m) { + * for the source path (if this is a bind mount) to be + * available. */ + pm = get_mount_parameters_fragment(m); +- if (pm && path_is_absolute(pm->what)) { ++ if (pm && pm->what && path_is_absolute(pm->what)) { + r = unit_require_mounts_for(UNIT(m), pm->what); + if (r < 0) + return r; +-- +1.8.4.1 + diff --git a/core/systemd/0001-shared-util-fix-off-by-one-error-in-tag_to_udev_node.patch b/core/systemd/0001-shared-util-fix-off-by-one-error-in-tag_to_udev_node.patch new file mode 100644 index 000000000..8c8ea46c2 --- /dev/null +++ b/core/systemd/0001-shared-util-fix-off-by-one-error-in-tag_to_udev_node.patch @@ -0,0 +1,50 @@ +From 1d5989fd803d2019de0f6aaaf3cfb1cb2bbc3cdb Mon Sep 17 00:00:00 2001 +From: Dave Reisner <dreisner@archlinux.org> +Date: Sun, 6 Oct 2013 18:26:23 -0400 +Subject: [PATCH] shared/util: fix off-by-one error in tag_to_udev_node + +Triggered false negatives when encoding a string which needed every +character to be escaped, e.g. "LABEL=/". +--- + src/shared/util.c | 2 +- + src/test/test-device-nodes.c | 4 +++- + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/shared/util.c b/src/shared/util.c +index 82f4221..31cea79 100644 +--- a/src/shared/util.c ++++ b/src/shared/util.c +@@ -3527,7 +3527,7 @@ static char *tag_to_udev_node(const char *tagvalue, const char *by) { + if (u == NULL) + return NULL; + +- enc_len = strlen(u) * 4; ++ enc_len = strlen(u) * 4 + 1; + t = new(char, enc_len); + if (t == NULL) + return NULL; +diff --git a/src/test/test-device-nodes.c b/src/test/test-device-nodes.c +index 2f3dedb..59ba4be 100644 +--- a/src/test/test-device-nodes.c ++++ b/src/test/test-device-nodes.c +@@ -26,7 +26,7 @@ + + /* helpers for test_encode_devnode_name */ + static char *do_encode_string(const char *in) { +- size_t out_len = strlen(in) * 4; ++ size_t out_len = strlen(in) * 4 + 1; + char *out = malloc(out_len); + + assert_se(out); +@@ -46,6 +46,8 @@ static void test_encode_devnode_name(void) { + assert_se(expect_encoded_as("pinkiepie", "pinkiepie")); + assert_se(expect_encoded_as("valÃd\\ųtf8", "valÃd\\x5cųtf8")); + assert_se(expect_encoded_as("s/ash/ng", "s\\x2fash\\x2fng")); ++ assert_se(expect_encoded_as("/", "\\x2f")); ++ assert_se(expect_encoded_as("!", "\\x21")); + } + + int main(int argc, char *argv[]) { +-- +1.8.4.1 + diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD index c828bc755..d238c0390 100644 --- a/core/systemd/PKGBUILD +++ b/core/systemd/PKGBUILD @@ -4,7 +4,7 @@ pkgbase=systemd pkgname=('systemd' 'systemd-sysvcompat') pkgver=208 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/systemd" makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gobject-introspection' 'gperf' @@ -15,16 +15,22 @@ source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz" 'initcpio-hook-udev' 'initcpio-install-systemd' 'initcpio-install-udev' - '0001-fix-lingering-references-to-var-lib-backlight-random.patch') + '0001-fix-lingering-references-to-var-lib-backlight-random.patch' + '0001-mount-check-for-NULL-before-reading-pm-what.patch' + '0001-shared-util-fix-off-by-one-error-in-tag_to_udev_node.patch') md5sums=('df64550d92afbffb4f67a434193ee165' '29245f7a240bfba66e2b1783b63b6b40' '8b68b0218a3897d4d37a6ccf47914774' 'bde43090d4ac0ef048e3eaee8202a407' - '1b191c4e7a209d322675fd199e3abc66') + '1b191c4e7a209d322675fd199e3abc66' + 'a693bef63548163ffc165f4c4801ebf7' + 'ccafe716d87df9c42af0d1960b5a4105') prepare() { cd "$pkgname-$pkgver" - patch -Np1 -i ../0001-fix-lingering-references-to-var-lib-backlight-random.patch + patch -Np1 < "$srcdir"/0001-fix-lingering-references-to-var-lib-backlight-random.patch + patch -Np1 < "$srcdir"/0001-mount-check-for-NULL-before-reading-pm-what.patch + patch -Np1 < "$srcdir"/0001-shared-util-fix-off-by-one-error-in-tag_to_udev_node.patch } build() { @@ -46,8 +52,7 @@ build() { } check() { - # two tests fail due to running under nspawn - make -C "$pkgname-$pkgver" check || true + make -C "$pkgname-$pkgver" check || : } package_systemd() { @@ -71,6 +76,7 @@ package_systemd() { etc/dbus-1/system.d/org.freedesktop.locale1.conf etc/dbus-1/system.d/org.freedesktop.machine1.conf etc/dbus-1/system.d/org.freedesktop.timedate1.conf + etc/pam.d/systemd-user etc/systemd/bootchart.conf etc/systemd/journald.conf etc/systemd/logind.conf @@ -119,7 +125,7 @@ package_systemd() { "$srcdir"/_sysvcompat/usr/share/man/man8 # include MIT license, since it's technically custom - install -Dm755 "$srcdir/$pkgname-$pkgver/LICENSE.MIT" \ + install -Dm644 "$srcdir/$pkgname-$pkgver/LICENSE.MIT" \ "$pkgdir/usr/share/licenses/systemd/LICENSE.MIT" } diff --git a/core/systemd/systemd.install b/core/systemd/systemd.install index f22536360..1e79585d7 100644 --- a/core/systemd/systemd.install +++ b/core/systemd/systemd.install @@ -69,7 +69,7 @@ post_upgrade() { if [ "$(vercmp 183 "$2")" -eq 1 ]; then # systemctl seems to be whiny on sysvinit. this will succeed unless something # horrific happens, so just mask the error. - systemctl -q enable getty@.service || true + systemctl -q enable getty@tty1.service || true fi if [ "$(vercmp 194-4 "$2")" -eq 1 ]; then diff --git a/core/sysvinit-tools/PKGBUILD b/core/sysvinit-tools/PKGBUILD index b8938d02f..86ab094a9 100644 --- a/core/sysvinit-tools/PKGBUILD +++ b/core/sysvinit-tools/PKGBUILD @@ -1,10 +1,11 @@ -# $Id: PKGBUILD 187044 2013-06-03 11:15:38Z allan $ +# $Id: PKGBUILD 197264 2013-10-24 20:11:17Z dreisner $ # Maintainer: Tom Gundersen <teg@jklm.no> # Maintainer: Eric Belanger <eric@archlinux.org> pkgname=sysvinit-tools +pkgdesc="Linux System V Init Tools" pkgver=2.88 -pkgrel=11 +pkgrel=12 arch=('i686' 'x86_64') url="http://savannah.nongnu.org/projects/sysvinit" license=('GPL') @@ -17,33 +18,25 @@ sha1sums=('f2ca149df1314a91f3007cccd7a0aa47d990de26' 'bbecfa7dfa45ac7c37ed8ac59fb53f6a85064b32') build() { - cd "${srcdir}/sysvinit-${pkgver}dsf" + cd "$srcdir/sysvinit-${pkgver}dsf" # FS#30005 patch -p1 -d "src" -i "${srcdir}/0001-simplify-writelog.patch" patch -p1 -d "src" -i "${srcdir}/0002-remove-ansi-escape-codes-from-log-file.patch" - make + # only build what we need... + make -C src fstab-decode killall5 bootlogd } package() { - pkgdesc="Linux System V Init Tools" - - cd "${srcdir}/sysvinit-${pkgver}dsf" - make ROOT="${pkgdir}" install - - cd "${pkgdir}" - ### drop the stuff provided by systemd-sysvcompat and util-linux - rm -r usr/share/man/man5 - rm -r usr/include - rm bin/mountpoint - rm sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit,sulogin} - rm usr/bin/{mesg,utmpdump,wall} - rm usr/share/man/man1/{mountpoint,mesg,utmpdump,wall}.1 - rm usr/share/man/man8/{halt,init,poweroff,reboot,runlevel,shutdown,telinit,sulogin}.8 - ### usrmerge - mv sbin/* usr/bin/ - rm -r sbin - mv bin/* usr/bin/ - rm -r bin + cd "$srcdir/sysvinit-${pkgver}dsf" + + install -dm755 "$pkgdir/usr/bin" "$pkgdir/usr/share/man/man8" + + # binaries + install -m755 src/{fstab-decode,killall5,bootlogd} "$pkgdir/usr/bin" + ln -s killall5 "$pkgdir/usr/bin/pidof" + + # manpages + install -m644 man/{bootlogd,pidof,killall5,fstab-decode}.8 "$pkgdir/usr/share/man/man8" } diff --git a/core/util-linux/PKGBUILD b/core/util-linux/PKGBUILD index 19613b406..5fdccc108 100644 --- a/core/util-linux/PKGBUILD +++ b/core/util-linux/PKGBUILD @@ -1,23 +1,24 @@ -# $Id: PKGBUILD 192147 2013-08-06 13:08:02Z tomegun $ +# $Id: PKGBUILD 197257 2013-10-24 19:47:23Z dreisner $ # Maintainer: Tom Gundersen <teg@jklm.no> # Maintainer: Dave Reisner <dreisner@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=util-linux -pkgver=2.23.2 +pkgver=2.24 pkgrel=1 pkgdesc="Miscellaneous system utilities for Linux" url="http://www.kernel.org/pub/linux/utils/util-linux/" arch=('i686' 'x86_64') groups=('base' 'base-devel') depends=('pam' 'shadow' 'coreutils' 'glibc') -makedepends=('systemd') +optdepends=('python: python bindings to libmount') +makedepends=('systemd' 'python') # checkdepends=('bc') conflicts=('util-linux-ng' 'eject') provides=("util-linux-ng=$pkgver" 'eject') license=('GPL2') -options=('!libtool') -source=("ftp://ftp.kernel.org/pub/linux/utils/$pkgname/v2.23/$pkgname-$pkgver.tar.xz" +options=('!libtool' 'strip' 'debug') +source=("ftp://ftp.kernel.org/pub/linux/utils/$pkgname/v2.24/$pkgname-$pkgver.tar.xz" uuidd.tmpfiles pam-login pam-common @@ -28,7 +29,7 @@ backup=(etc/pam.d/chfn etc/pam.d/su etc/pam.d/su-l) install=util-linux.install -md5sums=('b39fde897334a4858bb2098edcce5b3f' +md5sums=('4fac6443427f575fc5f3531a4ad2ca01' 'a39554bfd65cccfd8254bb46922f4a67' '4368b3f98abd8a32662e094c54e7f9b1' 'a31374fef2cba0ca34dfc7078e2969e4' @@ -39,6 +40,7 @@ build() { ./configure --prefix=/usr \ --libdir=/usr/lib \ + --bindir=/usr/bin \ --localstatedir=/run \ --enable-fs-paths-extra=/usr/bin \ --enable-raw \ @@ -47,10 +49,10 @@ build() { --enable-chfn-chsh \ --enable-write \ --enable-mesg \ - --enable-socket-activation + --enable-socket-activation \ + --with-python=3 # --enable-reset \ # part of ncurses -# --enable-line \ # not part of any package # --enable-last \ # not compat make @@ -83,6 +85,5 @@ package() { # usrmove cd "$pkgdir" mv {,usr/}sbin/* usr/bin - mv bin/* usr/bin - rmdir bin sbin usr/sbin + rmdir sbin usr/sbin } diff --git a/extra/a2ps/PKGBUILD b/extra/a2ps/PKGBUILD index 0a4384534..8c0eed41e 100644 --- a/extra/a2ps/PKGBUILD +++ b/extra/a2ps/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 191744 2013-07-30 07:00:10Z eric $ +# $Id: PKGBUILD 197210 2013-10-24 03:42:33Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=a2ps pkgver=4.14 -pkgrel=4 +pkgrel=5 pkgdesc="An Any to PostScript filter" arch=('i686' 'x86_64') url="http://www.gnu.org/software/a2ps/" @@ -11,7 +11,6 @@ license=('GPL3') depends=('ghostscript' 'psutils' 'imagemagick') makedepends=('gperf') backup=('etc/a2ps/a2ps.cfg' 'etc/a2ps/a2ps-site.cfg') -options=('!libtool') install=a2ps.install source=(ftp://ftp.gnu.org/gnu/a2ps/${pkgname}-${pkgver}.tar.gz{,.sig} a2ps-4.13c-fnmatch-replacement.patch a2ps-4.13c-emacs.patch @@ -45,7 +44,7 @@ build() { libtoolize --force --copy autoreconf --force --install -I m4 ./configure --prefix=/usr --sysconfdir=/etc/a2ps \ - --includedir=/usr/include --enable-nls + --includedir=/usr/include --enable-shared --enable-nls make } diff --git a/extra/aalib/PKGBUILD b/extra/aalib/PKGBUILD index ae5a98b54..df326f65a 100644 --- a/extra/aalib/PKGBUILD +++ b/extra/aalib/PKGBUILD @@ -1,30 +1,33 @@ -# $Id: PKGBUILD 149374 2012-02-07 09:56:45Z eric $ +# $Id: PKGBUILD 197212 2013-10-24 03:56:40Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=aalib pkgver=1.4rc5 -pkgrel=9 +pkgrel=10 pkgdesc="A portable ASCII art graphic library" arch=('i686' 'x86_64') url="http://aa-project.sourceforge.net/aalib/" license=('LGPL') depends=('gpm' 'libx11') makedepends=('libxt') -options=('!libtool') install=aalib.install source=(http://downloads.sourceforge.net/sourceforge/aa-project/${pkgname}-${pkgver}.tar.gz aclocal-fixes.patch) sha1sums=('a23269e950a249d2ef93625837cace45ddbce03b' '98d8c5a13672a8107945d694ff4520e0bc87d3e9') -build() { - cd "${srcdir}/${pkgname}-1.4.0" +prepare() { + cd ${pkgname}-1.4.0 patch -p0 -i "${srcdir}/aclocal-fixes.patch" +} + +build() { + cd ${pkgname}-1.4.0 ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info make } package() { - cd "${srcdir}/${pkgname}-1.4.0" + cd ${pkgname}-1.4.0 make DESTDIR="${pkgdir}" install } diff --git a/extra/audacity/PKGBUILD b/extra/audacity/PKGBUILD index 680390c96..444a3763c 100644 --- a/extra/audacity/PKGBUILD +++ b/extra/audacity/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193962 2013-09-08 19:31:47Z eric $ +# $Id: PKGBUILD 197206 2013-10-23 23:57:14Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=audacity -pkgver=2.0.4 +pkgver=2.0.5 pkgrel=1 pkgdesc="A program that lets you manipulate digital audio waveforms" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ makedepends=('cmake') options=('!makeflags') install=audacity.install source=(http://audacity.googlecode.com/files/${pkgname}-minsrc-${pkgver}.tar.xz) -sha1sums=('4c1a42137cef598e3d83829ca7c22dba62d215be') +sha1sums=('f63cafb81f29e7f3813dc9f80fb1dfdbcfe46b33') build() { cd ${pkgname}-src-${pkgver} diff --git a/extra/cln/PKGBUILD b/extra/cln/PKGBUILD index fa2bd62bc..6ef726a4d 100644 --- a/extra/cln/PKGBUILD +++ b/extra/cln/PKGBUILD @@ -1,16 +1,15 @@ -# $Id: PKGBUILD 191235 2013-07-22 00:17:17Z eric $ +# $Id: PKGBUILD 197218 2013-10-24 05:09:05Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=cln pkgver=1.3.3 -pkgrel=1 +pkgrel=2 pkgdesc="Class library for numbers" arch=('i686' 'x86_64') url="http://www.ginac.de/CLN/" license=('GPL') depends=('gmp') makedepends=('texlive-core') -options=('!libtool') install=cln.install source=(http://www.ginac.de/CLN/${pkgname}-${pkgver}.tar.bz2) sha1sums=('11c56780eb83ed54f2ad1ecef7f0dc0f609c426d') diff --git a/extra/epplet-base/PKGBUILD b/extra/epplet-base/PKGBUILD index a0a6d48f1..4379b3344 100644 --- a/extra/epplet-base/PKGBUILD +++ b/extra/epplet-base/PKGBUILD @@ -1,26 +1,25 @@ -# $Id: PKGBUILD 167952 2012-10-04 04:50:04Z eric $ +# $Id: PKGBUILD 197233 2013-10-24 13:10:07Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=epplet-base pkgver=0.14 -pkgrel=1 +pkgrel=2 pkgdesc="Addon plugins for the enlightenment windowmanager" arch=('i686' 'x86_64') url="http://www.enlightenment.org" license=('GPL') depends=('imlib2' 'libcdaudio' 'libgl') makedepends=('mesa') -options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/enlightenment/epplets-${pkgver}.tar.gz) sha1sums=('ddecad7c22771bc50565f76c36ae334f952388aa') build() { - cd "${srcdir}/epplets-${pkgver}" + cd epplets-${pkgver} ./configure --prefix=/usr make } package() { - cd "${srcdir}/epplets-${pkgver}" + cd epplets-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/faad2/LICENSE b/extra/faad2/LICENSE deleted file mode 100644 index a16abf6e3..000000000 --- a/extra/faad2/LICENSE +++ /dev/null @@ -1,42 +0,0 @@ -__________ -COPYRIGHTS - -For FAAD2 the following license applies: - -****************************************************************************** -** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding -** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com -** -** This program is free software; you can redistribute it and/or modify -** it under the terms of the GNU General Public License as published by -** the Free Software Foundation; either version 2 of the License, or -** (at your option) any later version. -** -** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** GNU General Public License for more details. -** -** You should have received a copy of the GNU General Public License -** along with this program; if not, write to the Free Software -** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -** -** Any non-GPL usage of this software or parts of this software is strictly -** forbidden. -** -** The "appropriate copyright message" mentioned in section 2c of the GPLv2 -** must read: "Code from FAAD2 is copyright (c) Nero AG, www.nero.com" -** -** Commercial non-GPL licensing of this software is possible. -** For more info contact Nero AG through Mpeg4AAClicense@nero.com. -****************************************************************************** - - -Please note that the use of this software may require the payment of -patent royalties. You need to consider this issue before you start -building derivative works. We are not warranting or indemnifying you in -any way for patent royalities! YOU ARE SOLELY RESPONSIBLE FOR YOUR OWN -ACTIONS! - - -______ diff --git a/extra/faad2/PKGBUILD b/extra/faad2/PKGBUILD index 46a388a16..3804ed5a8 100644 --- a/extra/faad2/PKGBUILD +++ b/extra/faad2/PKGBUILD @@ -1,29 +1,39 @@ -# $Id: PKGBUILD 149405 2012-02-07 15:27:21Z eric $ +# $Id: PKGBUILD 197236 2013-10-24 15:27:20Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=faad2 pkgver=2.7 -pkgrel=3 +pkgrel=4 pkgdesc="ISO AAC audio decoder" arch=('i686' 'x86_64') url="http://www.audiocoding.com/" -license=('custom:GPL') +license=('GPL') depends=('glibc') -options=('!libtool' '!makeflags') -source=(http://downloads.sourceforge.net/sourceforge/faac/${pkgname}-${pkgver}.tar.bz2 LICENSE) +options=('!makeflags') +source=(http://downloads.sourceforge.net/sourceforge/faac/${pkgname}-${pkgver}.tar.bz2 + faad2-2.7-libmp4ff-install-mp4ff_int_types_h.patch + faad2-2.7-libmp4ff-shared-lib.patch + faad2-2.7-man1_MANS.patch) sha1sums=('b0e80481d27ae9faf9e46c8c8dfb617a0adb91b5' - '00edd9b30d8d5098b5e91c03c595d96a3bbe56fd') + '1cf28cfd32dbae6cc484b149fd6adfea33506544' + '247658aa795cd6d44a153fae8c5cb62e427f3ecf' + '4b548a08f7611a5f4f395c7c1d4cef5e37368af2') + +prepare() { + cd ${pkgname}-${pkgver} + patch -p1 -i "${srcdir}/faad2-2.7-libmp4ff-shared-lib.patch" + patch -p0 -i "${srcdir}/faad2-2.7-libmp4ff-install-mp4ff_int_types_h.patch" + patch -p1 -i "${srcdir}/faad2-2.7-man1_MANS.patch" + autoreconf --force --install +} build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} ./configure --prefix=/usr make CFLAGS="${CFLAGS} -fPIC" } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" manmdir=/usr/share/man/man1 install - mv "${pkgdir}/usr/share/man/man1/faad.man" "${pkgdir}/usr/share/man/man1/faad.1" - install -D -m644 common/mp4ff/mp4ff_int_types.h "${pkgdir}/usr/include/mp4ff_int_types.h" - install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + cd ${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install } diff --git a/extra/faad2/faad2-2.7-libmp4ff-install-mp4ff_int_types_h.patch b/extra/faad2/faad2-2.7-libmp4ff-install-mp4ff_int_types_h.patch new file mode 100644 index 000000000..5d39cad95 --- /dev/null +++ b/extra/faad2/faad2-2.7-libmp4ff-install-mp4ff_int_types_h.patch @@ -0,0 +1,13 @@ +Install mp4ff_int_types.h for mythmusic. + +http://bugs.gentoo.org/275008 + +--- common/mp4ff/Makefile.am ++++ common/mp4ff/Makefile.am +@@ -1,5 +1,5 @@ + lib_LTLIBRARIES = libmp4ff.la +-include_HEADERS = mp4ff.h mp4ffint.h ++include_HEADERS = mp4ff.h mp4ffint.h mp4ff_int_types.h + + AM_CFLAGS = -DUSE_TAGGING=1 + diff --git a/extra/faad2/faad2-2.7-libmp4ff-shared-lib.patch b/extra/faad2/faad2-2.7-libmp4ff-shared-lib.patch new file mode 100644 index 000000000..56a131192 --- /dev/null +++ b/extra/faad2/faad2-2.7-libmp4ff-shared-lib.patch @@ -0,0 +1,29 @@ +Ripped from Debian + +Patch to create a shared lib for libmp4ff. + +--- a/common/mp4ff/Makefile.am ++++ b/common/mp4ff/Makefile.am +@@ -1,7 +1,8 @@ +-lib_LIBRARIES = libmp4ff.a ++lib_LTLIBRARIES = libmp4ff.la + include_HEADERS = mp4ff.h mp4ffint.h + +-libmp4ff_a_CFLAGS = -DUSE_TAGGING=1 ++AM_CFLAGS = -DUSE_TAGGING=1 + +-libmp4ff_a_SOURCES = mp4ff.c mp4atom.c mp4meta.c mp4sample.c mp4util.c \ ++libmp4ff_la_LDFLAGS = -version-info 0:0:0 ++libmp4ff_la_SOURCES = mp4ff.c mp4atom.c mp4meta.c mp4sample.c mp4util.c \ + mp4tagupdate.c mp4ff.h mp4ffint.h mp4ff_int_types.h +--- a/frontend/Makefile.am ++++ b/frontend/Makefile.am +@@ -5,7 +5,7 @@ + -I$(top_srcdir)/common/mp4ff + + faad_LDADD = $(top_builddir)/libfaad/libfaad.la \ +- $(top_builddir)/common/mp4ff/libmp4ff.a ++ $(top_builddir)/common/mp4ff/libmp4ff.la + + faad_SOURCES = main.c \ + audio.c audio.h \ diff --git a/extra/faad2/faad2-2.7-man1_MANS.patch b/extra/faad2/faad2-2.7-man1_MANS.patch new file mode 100644 index 000000000..9c1ddb01b --- /dev/null +++ b/extra/faad2/faad2-2.7-man1_MANS.patch @@ -0,0 +1,10 @@ +diff -ur faad2-2.7.orig/frontend/Makefile.am faad2-2.7/frontend/Makefile.am +--- faad2-2.7.orig/frontend/Makefile.am 2009-02-06 18:03:37.000000000 +0200 ++++ faad2-2.7/frontend/Makefile.am 2009-07-20 20:27:29.000000000 +0300 +@@ -1,5 +1,5 @@ + bin_PROGRAMS = faad +-man_MANS = faad.man ++man1_MANS = faad.man + + INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/common/faad \ + -I$(top_srcdir)/common/mp4ff diff --git a/extra/glib/PKGBUILD b/extra/glib/PKGBUILD index 57be2dc1f..d4f9b62fb 100644 --- a/extra/glib/PKGBUILD +++ b/extra/glib/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 191242 2013-07-22 06:31:51Z eric $ +# $Id: PKGBUILD 197238 2013-10-24 16:18:46Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=glib pkgver=1.2.10 -pkgrel=10 +pkgrel=11 pkgdesc="Common C routines used by Gtk+ and other libs" arch=('i686' 'x86_64') url="http://www.gtk.org/" license=('LGPL') depends=('glibc' 'sh') -options=('!libtool' '!makeflags') +options=('!makeflags') install=glib.install source=(ftp://ftp.gtk.org/pub/gtk/v1.2/${pkgname}-${pkgver}.tar.gz gcc340.patch aclocal-fixes.patch glib1-autotools.patch) diff --git a/extra/gnet/PKGBUILD b/extra/gnet/PKGBUILD index b9b9a3647..1310530e8 100644 --- a/extra/gnet/PKGBUILD +++ b/extra/gnet/PKGBUILD @@ -1,15 +1,14 @@ -# $Id: PKGBUILD 191233 2013-07-21 23:25:28Z eric $ +# $Id: PKGBUILD 197240 2013-10-24 16:49:18Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=gnet pkgver=2.0.8 -pkgrel=3 +pkgrel=4 pkgdesc="A simple network library" arch=('i686' 'x86_64') url="http://live.gnome.org/GNetLibrary" license=('LGPL') depends=('glib2') -options=('!libtool') source=(http://ftp.gnome.org/pub/GNOME/sources/gnet/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) sha1sums=('74a33dd25cc594b874e3a5171795efd99e567387') diff --git a/extra/gsasl/PKGBUILD b/extra/gsasl/PKGBUILD index 94526a7a5..2c9c54ebd 100644 --- a/extra/gsasl/PKGBUILD +++ b/extra/gsasl/PKGBUILD @@ -1,27 +1,25 @@ -# $Id: PKGBUILD 170167 2012-11-04 02:30:50Z eric $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Orivej Desh <smpuj@bk.ru> -# Maintainer: Orivej Desh <smpuj@bk.ru> +# $Id: PKGBUILD 197247 2013-10-24 18:39:54Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=gsasl pkgver=1.8.0 -pkgrel=2 +pkgrel=3 pkgdesc="Simple Authentication and Security Layer framework and a few common SASL mechanisms" -arch=("i686" "x86_64") +arch=('i686' 'x86_64') url="http://josefsson.org/gsasl/" -license=("GPL") +license=('GPL') depends=('gnutls' 'libidn' 'krb5' 'libgcrypt') -source=("ftp://ftp.gnu.org/gnu/gsasl/$pkgname-$pkgver.tar.gz") -md5sums=('982fe54a20016aa46a871c084c990c36') +install=gsasl.install +source=(ftp://ftp.gnu.org/gnu/gsasl/${pkgname}-${pkgver}.tar.gz) +sha1sums=('343fd97ae924dc406986c02fb9b889f4114239ae') build() { - cd "$srcdir/$pkgname-$pkgver" + cd ${pkgname}-${pkgver} ./configure --prefix=/usr --with-gssapi-impl=mit make } package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - rm "$pkgdir/usr/share/info/dir" "$pkgdir/usr/lib/libgsasl.la" + cd ${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install } diff --git a/extra/gsasl/gsasl.install b/extra/gsasl/gsasl.install new file mode 100644 index 000000000..b9b69f97e --- /dev/null +++ b/extra/gsasl/gsasl.install @@ -0,0 +1,16 @@ +infodir=usr/share/info +file=gsasl.info + +post_install() { + [[ -x usr/bin/install-info ]] || return 0 + install-info "$infodir/$file.gz" "$infodir/dir" 2> /dev/null +} + +post_upgrade() { + post_install "$1" +} + +pre_remove() { + [[ -x usr/bin/install-info ]] || return 0 + install-info --delete "$infodir/$file.gz" "$infodir/dir" 2> /dev/null +} diff --git a/extra/gtk/PKGBUILD b/extra/gtk/PKGBUILD index c218906e7..24b355d64 100644 --- a/extra/gtk/PKGBUILD +++ b/extra/gtk/PKGBUILD @@ -1,16 +1,15 @@ -# $Id: PKGBUILD 191240 2013-07-22 03:45:27Z eric $ +# $Id: PKGBUILD 197249 2013-10-24 18:51:37Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=gtk pkgver=1.2.10 -pkgrel=12 +pkgrel=13 pkgdesc="GTK+ is a multi-platform toolkit (v1)" arch=('i686' 'x86_64') url="http://www.gtk.org/" license=('LGPL') depends=('libxi' 'glib' 'sh') makedepends=('libxt') -options=('!libtool') install=gtk.install source=(ftp://ftp.gtk.org/pub/gtk/v1.2/gtk+-${pkgver}.tar.gz aclocal-fixes.patch) diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD index 47ca9dd9c..08ec66be4 100644 --- a/extra/imagemagick/PKGBUILD +++ b/extra/imagemagick/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 196817 2013-10-20 04:38:14Z eric $ +# $Id: PKGBUILD 197208 2013-10-24 01:16:46Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgbase=imagemagick pkgname=('imagemagick' 'imagemagick-doc') -pkgver=6.8.7.1 +pkgver=6.8.7.2 pkgrel=1 arch=('i686' 'x86_64') url="http://www.imagemagick.org/" @@ -14,7 +14,7 @@ makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' \ #source=(http://www.imagemagick.org/download/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz{,.asc} \ source=(ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz{,.asc} \ perlmagick.rpath.patch) -sha1sums=('c8aabca18e0ca108b403dd154c858cb17ff304ee' +sha1sums=('7dd54b769df1a8a173b76612bed131cd814e0e21' 'SKIP' 'e143cf9d530fabf3b58023899b5cc544ba93daec') @@ -27,7 +27,7 @@ prepare() { build() { cd ImageMagick-${pkgver%.*}-${pkgver##*.} - ./configure --prefix=/usr --sysconfdir=/etc --with-modules --disable-static \ + ./configure --prefix=/usr --sysconfdir=/etc --with-modules \ --enable-hdri --with-wmf --with-openexr --with-xml --with-lcms2 --with-jp2 \ --with-webp --with-gslib --with-gs-font-dir=/usr/share/fonts/Type1 \ --with-perl --with-perl-options="INSTALLDIRS=vendor" --with-lqr --with-rsvg \ diff --git a/extra/jasper/PKGBUILD b/extra/jasper/PKGBUILD index 83df195b9..50f4f606f 100644 --- a/extra/jasper/PKGBUILD +++ b/extra/jasper/PKGBUILD @@ -1,36 +1,39 @@ -# $Id: PKGBUILD 168605 2012-10-13 11:47:31Z andyrtr $ +# $Id: PKGBUILD 197251 2013-10-24 19:18:50Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=jasper pkgver=1.900.1 -pkgrel=8 +pkgrel=9 pkgdesc="A software-based implementation of the codec specified in the emerging JPEG-2000 Part-1 standard" arch=('i686' 'x86_64') url="http://www.ece.uvic.ca/~mdadams/jasper/" license=('custom:JasPer2.0') depends=('libjpeg' 'freeglut' 'libxmu' 'glu') -options=('!libtool') -source=(http://www.ece.uvic.ca/~mdadams/${pkgname}/software/${pkgname}-${pkgver}.zip jpc_dec.c.patch +source=(http://www.ece.uvic.ca/~mdadams/${pkgname}/software/${pkgname}-${pkgver}.zip patch-libjasper-stepsizes-overflow.diff jasper-1.900.1-CVE-2008-3520.patch - jasper-1.900.1-CVE-2008-3522.patch) + jpc_dec.c.patch jasper-1.900.1-CVE-2008-3522.patch) sha1sums=('9c5735f773922e580bf98c7c7dfda9bbed4c5191' - 'c1a0176a15210c0af14d85e55ce566921957d780' 'f298566fef08c8a589d072582112cd51c72c3983' '2483dba925670bf29f531d85d73c4e5ada513b01' + 'c1a0176a15210c0af14d85e55ce566921957d780' '0e7b6142cd9240ffb15a1ed7297c43c76fa09ee4') -build() { - cd "${srcdir}/${pkgname}-${pkgver}" +prepare() { + cd ${pkgname}-${pkgver} patch -p1 -i "${srcdir}/jpc_dec.c.patch" patch -p1 -i "${srcdir}/patch-libjasper-stepsizes-overflow.diff" patch -p1 -i "${srcdir}/jasper-1.900.1-CVE-2008-3520.patch" patch -p1 -i "${srcdir}/jasper-1.900.1-CVE-2008-3522.patch" +} + +build() { + cd ${pkgname}-${pkgver} ./configure --prefix=/usr --mandir=/usr/share/man --enable-shared make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/lablgtk2/PKGBUILD b/extra/lablgtk2/PKGBUILD index cc23a4cf6..2c7f732e4 100644 --- a/extra/lablgtk2/PKGBUILD +++ b/extra/lablgtk2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 197007 2013-10-21 12:38:24Z tpowa $ +# $Id: PKGBUILD 197222 2013-10-24 08:15:10Z tpowa $ #Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=lablgtk2 pkgver=2.16.0 -pkgrel=4 +pkgrel=5 pkgdesc=" An Objective Caml interface to gtk2" arch=(i686 x86_64) license=('LGPL') @@ -13,7 +13,7 @@ makedepends=('ocaml') optdepends=('ocaml: for using the tools') DLAGENTS=('https::/usr/bin/curl -fLC - --insecure --retry 3 --retry-delay 3 -o %o %u') source=(https://forge.ocamlcore.org/frs/download.php/979/lablgtk-${pkgver}.tar.gz) -options=(!makeflags) +options=(!makeflags staticlibs) build() { cd "${srcdir}/lablgtk-${pkgver}" diff --git a/extra/lcms2/PKGBUILD b/extra/lcms2/PKGBUILD index f23a19e33..187a1dab6 100644 --- a/extra/lcms2/PKGBUILD +++ b/extra/lcms2/PKGBUILD @@ -1,16 +1,14 @@ -# $Id: PKGBUILD 189259 2013-07-01 18:54:09Z eric $ +# $Id: PKGBUILD 197253 2013-10-24 19:34:40Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> -# Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgname=lcms2 pkgver=2.5 -pkgrel=1 +pkgrel=2 pkgdesc="Small-footprint color management engine, version 2" arch=('i686' 'x86_64') +url="http://www.littlecms.com" license=('MIT') depends=('libtiff') -url="http://www.littlecms.com" -options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/lcms/${pkgname}-${pkgver}.tar.gz) sha1sums=('bab3470471fc7756c5fbe71be9a3c7d677d2ee7b') diff --git a/extra/libmad/PKGBUILD b/extra/libmad/PKGBUILD index 30339145a..a896c159a 100644 --- a/extra/libmad/PKGBUILD +++ b/extra/libmad/PKGBUILD @@ -1,15 +1,14 @@ -# $Id: PKGBUILD 149402 2012-02-07 14:56:23Z eric $ +# $Id: PKGBUILD 197260 2013-10-24 19:49:09Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=libmad pkgver=0.15.1b -pkgrel=6 +pkgrel=7 pkgdesc="A high-quality MPEG audio decoder" arch=('i686' 'x86_64') url="http://www.underbit.com/products/mad/" license=('GPL') depends=('glibc') -options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/mad/${pkgname}-${pkgver}.tar.gz{,.sign} libmad.patch amd64-64bit.diff frame_length.diff optimize.diff) sha1sums=('cac19cd00e1a907f3150cc040ccc077783496d76' @@ -19,12 +18,16 @@ sha1sums=('cac19cd00e1a907f3150cc040ccc077783496d76' 'b9c61ecacc6a6d47425d66f33327e0634cd8a33c' '3d5b958244ef0395ccdcb00344f2cf301ca07e34') -build() { - cd "${srcdir}/${pkgname}-${pkgver}" +prepare() { + cd ${pkgname}-${pkgver} patch -p1 -i "${srcdir}/libmad.patch" patch -p1 -i "${srcdir}/amd64-64bit.diff" patch -p1 -i "${srcdir}/frame_length.diff" patch -p1 -i "${srcdir}/optimize.diff" +} + +build() { + cd ${pkgname}-${pkgver} CFLAGS="$CFLAGS -ftree-vectorize -ftree-vectorizer-verbose=1" autoconf ./configure --prefix=/usr @@ -32,6 +35,6 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/libmng/PKGBUILD b/extra/libmng/PKGBUILD index 87f3b2438..7f3bfdd1b 100644 --- a/extra/libmng/PKGBUILD +++ b/extra/libmng/PKGBUILD @@ -1,15 +1,14 @@ -# $Id: PKGBUILD 193685 2013-08-28 00:06:03Z eric $ +# $Id: PKGBUILD 197262 2013-10-24 20:00:46Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=libmng pkgver=2.0.2 -pkgrel=2 +pkgrel=3 pkgdesc="A collection of routines used to create and manipulate MNG format graphics files" arch=('i686' 'x86_64') url="http://www.libmng.com/" license=('custom') depends=('lcms2') -options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.asc} libmng-stdio.patch) sha1sums=('7dd35369ff5916e1823cbacef984ab1b87714b69' diff --git a/extra/libqalculate/PKGBUILD b/extra/libqalculate/PKGBUILD index 9e228f345..a888f1923 100644 --- a/extra/libqalculate/PKGBUILD +++ b/extra/libqalculate/PKGBUILD @@ -1,27 +1,29 @@ -# $Id: PKGBUILD 149451 2012-02-08 01:06:52Z eric $ +# $Id: PKGBUILD 197265 2013-10-24 20:11:40Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=libqalculate pkgver=0.9.7 -pkgrel=3 +pkgrel=4 pkgdesc="Multi-purpose desktop calculator" arch=('i686' 'x86_64') url="http://qalculate.sourceforge.net/" license=('GPL') depends=('libxml2' 'cln' 'glib2') makedepends=('perl-xml-parser') -optdepends=('gnuplot: for plotting support' 'wget: for retrieval of exchange rates (not needed if you use one of the GUI)' 'gnome-vfs: for retrieval of exchange rates (not needed if you use one of the GUI)') -options=('!libtool' '!makeflags') +optdepends=('gnuplot: for plotting support' + 'wget: for retrieval of exchange rates (not needed if you use one of the GUI)' + 'gnome-vfs: for retrieval of exchange rates (not needed if you use one of the GUI)') +options=('!makeflags') source=(http://downloads.sourceforge.net/sourceforge/qalculate/${pkgname}-${pkgver}.tar.gz) sha1sums=('c15f7f3a97995decf62cc964956fc1e374ecd78c') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} ./configure --prefix=/usr make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/libsamplerate/PKGBUILD b/extra/libsamplerate/PKGBUILD index 036b59fa0..3e09896a9 100644 --- a/extra/libsamplerate/PKGBUILD +++ b/extra/libsamplerate/PKGBUILD @@ -1,15 +1,14 @@ -# $Id: PKGBUILD 192312 2013-08-10 02:16:26Z eric $ +# $Id: PKGBUILD 197267 2013-10-24 20:17:46Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=libsamplerate pkgver=0.1.8 -pkgrel=2 +pkgrel=3 pkgdesc="Secret Rabbit Code - aka Sample Rate Converter for audio" arch=('i686' 'x86_64') url="http://www.mega-nerd.com/SRC/index.html" license=('GPL') depends=('libsndfile') -options=('!libtool') source=(http://www.mega-nerd.com/SRC/libsamplerate-${pkgver}.tar.gz{,.asc}) sha1sums=('e5fe82c4786be2fa33ca6bd4897db4868347fe70' 'SKIP') diff --git a/extra/libsndfile/PKGBUILD b/extra/libsndfile/PKGBUILD index cff3c6442..d72103a98 100644 --- a/extra/libsndfile/PKGBUILD +++ b/extra/libsndfile/PKGBUILD @@ -1,34 +1,37 @@ -# $Id: PKGBUILD 149407 2012-02-07 15:40:58Z eric $ +# $Id: PKGBUILD 197269 2013-10-24 20:25:13Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=libsndfile pkgver=1.0.25 -pkgrel=2 +pkgrel=3 pkgdesc="A C library for reading and writing files containing sampled sound" arch=('i686' 'x86_64') url="http://www.mega-nerd.com/libsndfile" license=('LGPL') depends=('alsa-lib' 'flac' 'libvorbis') checkdepends=('python2') -options=('!libtool') source=(http://www.mega-nerd.com/libsndfile/files/${pkgname}-${pkgver}.tar.gz{,.asc}) sha1sums=('e95d9fca57f7ddace9f197071cbcfb92fa16748e' 'a93d26016730cb9fa214c753d079ee77dca1f326') -build() { - cd "${srcdir}/${pkgname}-${pkgver}" +prepare() { + cd ${pkgname}-${pkgver} sed -i 's|#!/usr/bin/python|#!/usr/bin/python2|' src/binheader_writef_check.py \ src/create_symbols_file.py programs/test-sndfile-metadata-set.py +} + +build() { + cd ${pkgname}-${pkgver} ./configure --prefix=/usr --disable-sqlite make } check() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make check } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/libstroke/PKGBUILD b/extra/libstroke/PKGBUILD index 08f0a1dac..8f2697ba2 100644 --- a/extra/libstroke/PKGBUILD +++ b/extra/libstroke/PKGBUILD @@ -1,44 +1,40 @@ -# $Id: PKGBUILD 137618 2011-09-10 07:13:27Z eric $ +# $Id: PKGBUILD 197273 2013-10-24 21:52:00Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=libstroke pkgver=0.5.1 -pkgrel=5 +pkgrel=6 pkgdesc="A stroke (mouse gesture) translation library" arch=('i686' 'x86_64') url="http://etla.net/libstroke/" license=('GPL2') depends=('glibc') -makedepends=('libx11' 'gtk') -options=('!libtool') -source=(http://etla.net/libstroke/${pkgname}-${pkgver}.tar.gz \ - libgstroke-Makefile.am.patch libstroke-Makefile.am.patch \ - libstroke-0.5.1-m4_syntax.patch) -md5sums=('51b9a4e309ac15cfcab96191eed03cb2' - '60bbaf355355c3c66c8015b0f7feca85' - '96413a77e1d39d1a3223e8eb6be8ef01' - '93c47eef46a0cc4011a246485c5a6620') +makedepends=('libx11') +source=(http://etla.net/libstroke/${pkgname}-${pkgver}.tar.gz + libgstroke-Makefile.am.patch libstroke-Makefile.am.patch + libstroke-0.5.1-m4_syntax.patch libstroke-0.5.1-no_gtk1.patch) sha1sums=('48bd2b98faa8681ccd97eda7a09442845dbf1b7b' 'a0c3bd9e894650475ba3049b0ef3d7f9580c203d' 'ee5a3635c31dba00b070a942c512cc0d53056188' - 'c9240937776b0572e3927e1c56d78309413c5209') + 'c9240937776b0572e3927e1c56d78309413c5209' + 'c79acd9712fa5c6b9a9ac21621c6858ec10d84dd') -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 < ../libgstroke-Makefile.am.patch - patch -p1 < ../libstroke-Makefile.am.patch - patch -p1 < ../libstroke-0.5.1-m4_syntax.patch - - libtoolize --force --copy - aclocal - autoconf - automake --add-missing --force --copy +prepare() { + cd ${pkgname}-${pkgver} + patch -p1 -i "${srcdir}/libgstroke-Makefile.am.patch" + patch -p1 -i "${srcdir}/libstroke-Makefile.am.patch" + patch -p1 -i "${srcdir}/libstroke-0.5.1-m4_syntax.patch" + patch -p1 -i "${srcdir}/libstroke-0.5.1-no_gtk1.patch" +} +build() { + cd ${pkgname}-${pkgver} + autoreconf --force --install ./configure --prefix=/usr make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/libstroke/libstroke-0.5.1-no_gtk1.patch b/extra/libstroke/libstroke-0.5.1-no_gtk1.patch new file mode 100644 index 000000000..a099fb991 --- /dev/null +++ b/extra/libstroke/libstroke-0.5.1-no_gtk1.patch @@ -0,0 +1,33 @@ +--- libstroke-0.5.1/configure.in 2001-08-07 07:08:05.000000000 +0100 ++++ libstroke-0.5.1b/configure.in 2006-11-28 01:49:26.000000000 +0000 +@@ -81,16 +81,9 @@ + [ --with-mouse-footprints Draw mouse footprints in X], + [AC_DEFINE(STROKE_MOUSE_FOOTPRINTS)]) + +-dnl check for GTK +-dnl we won't build libgstroke if it's not found +-AC_MSG_CHECKING(gtk+ library) +-AM_PATH_GTK(1.2.7, HAVE_LIBGTK=yes +- AC_DEFINE(HAVE_LIBGTK, 1, [Define if libgtk is available]), +- AC_MSG_WARN( +-***** NOTE: The GNOME stroke support won't be built +-) +- HAVE_LIBGTK=no, +-) ++GTK_CFLAGS="" ++AC_SUBST(GTK_CFLAGS) ++HAVE_LIBGTK=no + AM_CONDITIONAL(HAVE_LIBGTK, test "x$HAVE_LIBGTK" = "xyes") + + +--- libstroke-0.5.1/Makefile.am 2001-08-07 07:03:12.000000000 +0100 ++++ libstroke-0.5.1b/Makefile.am 2006-11-28 02:00:55.000000000 +0000 +@@ -10,7 +10,7 @@ + EXTRA_DIST = COPYRIGHT CREDITS README.javastroke README.libgstroke + + m4datadir=$(datadir)/aclocal +-m4data_DATA=libstroke.m4 libgstroke.m4 ++m4data_DATA=libstroke.m4 + + MOSTLYCLEANFILES = core *~ + CLEANFILES = core *~ diff --git a/extra/libtiff/PKGBUILD b/extra/libtiff/PKGBUILD index 2a76d717c..8ebf8fdcd 100644 --- a/extra/libtiff/PKGBUILD +++ b/extra/libtiff/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 193540 2013-08-22 21:13:54Z eric $ +# $Id: PKGBUILD 197204 2013-10-23 23:19:13Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=libtiff pkgver=4.0.3 -pkgrel=3 +pkgrel=4 pkgdesc="Library for manipulation of TIFF images" arch=('i686' 'x86_64') url="http://www.remotesensing.org/libtiff/" @@ -20,7 +20,8 @@ source=(ftp://ftp.remotesensing.org/pub/libtiff/tiff-${pkgver}.tar.gz tiff-4.0.3-libjpeg-turbo.patch tiff-4.0.3-tiff2pdf-colors.patch tiff-4.0.3-CVE-2013-4231.patch - tiff-4.0.3-CVE-2013-4232.patch) + tiff-4.0.3-CVE-2013-4232.patch + libtiff-CVE-2013-4244.patch) sha1sums=('652e97b78f1444237a82cbcfe014310e776eb6f0' '41be661638282dae0d07bd2788414cb6650f8981' '6cb3d480908132335c05c769b5a51f951413725d' @@ -29,7 +30,8 @@ sha1sums=('652e97b78f1444237a82cbcfe014310e776eb6f0' '02d57835df50d3f84587571ec52b36f5af838de2' '23443ad0bc130d70860b6cc6d19b69584ae7a6cc' '969f588e9da5991e7f17dddf69ae59424b05fa16' - '2a23c55d081bed74ac8dd99541a93d312cc72b64') + '2a23c55d081bed74ac8dd99541a93d312cc72b64' + '01c6792ba2470493da4d990edae8de6c13bd4670') prepare() { cd tiff-${pkgver} @@ -39,9 +41,11 @@ prepare() { patch -p1 -i "${srcdir}/tiff-4.0.3-CVE-2013-1960.patch" patch -p1 -i "${srcdir}/tiff-4.0.3-CVE-2013-1961.patch" patch -p1 -i "${srcdir}/tiff-4.0.3-libjpeg-turbo.patch" + patch -p1 -i "${srcdir}/libtiff-CVE-2013-4244.patch" cd tools patch -p0 -i "${srcdir}/tiff-4.0.3-CVE-2013-4231.patch" patch -p0 -i "${srcdir}/tiff-4.0.3-CVE-2013-4232.patch" + } build() { diff --git a/extra/libtiff/libtiff-CVE-2013-4244.patch b/extra/libtiff/libtiff-CVE-2013-4244.patch new file mode 100644 index 000000000..792e07698 --- /dev/null +++ b/extra/libtiff/libtiff-CVE-2013-4244.patch @@ -0,0 +1,15 @@ +diff --git a/tools/gif2tiff.c b/tools/gif2tiff.c +index 375b152..2731273 100644 +--- a/tools/gif2tiff.c ++++ b/tools/gif2tiff.c +@@ -402,6 +402,10 @@ process(register int code, unsigned char** fill) + } + + if (oldcode == -1) { ++ if (code >= clear) { ++ fprintf(stderr, "bad input: code=%d is larger than clear=%d\n",code, clear); ++ return 0; ++ } + *(*fill)++ = suffix[code]; + firstchar = oldcode = code; + return 1; diff --git a/extra/qt4/PKGBUILD b/extra/qt4/PKGBUILD index f46993815..807b5477e 100644 --- a/extra/qt4/PKGBUILD +++ b/extra/qt4/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 197140 2013-10-22 17:14:15Z andrea $ +# $Id: PKGBUILD 197232 2013-10-24 13:09:09Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=qt4 pkgver=4.8.5 -pkgrel=5 +pkgrel=6 arch=('i686' 'x86_64') url='http://qt-project.org/' license=('GPL3' 'LGPL' 'FDL' 'custom') @@ -32,7 +32,7 @@ source=("http://download.qt-project.org/official_releases/qt/4.8/${pkgver}/${_pk 'qtconfig-qt4.desktop' 'assistant-qt4.desktop' 'designer-qt4.desktop' 'linguist-qt4.desktop' 'qdbusviewer-qt4.desktop' 'improve-cups-support.patch' - 'qtbug-31579.patch' 'qtbug-32534.patch') + 'qtbug-31579.patch' 'qtbug-32534.patch' 'qtbug-32908.patch') md5sums=('1864987bdbb2f58f8ae8b350dfdbe133' 'a16638f4781e56e7887ff8212a322ecc' '8a28b3f52dbeb685d4b69440b520a3e1' @@ -41,7 +41,8 @@ md5sums=('1864987bdbb2f58f8ae8b350dfdbe133' 'b859c5673e5098c39f72b2252947049e' 'c439c7731c25387352d8453ca7574971' '6ed8d26a8e4a9bba1f6c08fb99cc8357' - 'bb0e0fa6ba953fa590d81ac612374e11') + 'bb0e0fa6ba953fa590d81ac612374e11' + 'db343dcae522bc90d802ad1e83b7f5dd') prepare() { cd ${_pkgfqn} @@ -53,6 +54,8 @@ prepare() { patch -p1 -i "${srcdir}"/qtbug-31579.patch # (FS#36394) (QTBUG#32534) patch -p1 -i "${srcdir}"/qtbug-32534.patch + # (FS#36947) (QTBUG#32908) + patch -p1 -i "${srcdir}"/qtbug-32908.patch sed -i "s|-O2|${CXXFLAGS}|" mkspecs/common/{g++,gcc}-base.conf sed -i "/^QMAKE_LFLAGS_RPATH/s| -Wl,-rpath,||g" mkspecs/common/gcc-base-unix.conf diff --git a/extra/qt4/qtbug-32908.patch b/extra/qt4/qtbug-32908.patch new file mode 100644 index 000000000..f11fa4075 --- /dev/null +++ b/extra/qt4/qtbug-32908.patch @@ -0,0 +1,40 @@ +From 0c03af0d4d928bdbb32b09eedb1dba3ce59e5278 Mon Sep 17 00:00:00 2001 +From: Gatis Paeglis <gatis.paeglis@digia.com> +Date: Sat, 31 Aug 2013 21:22:47 +0200 +Subject: [PATCH] Revert "QTBUG-15319: fix shortcuts with secondary Xkb layout." + +The change which attempted to fix QTBUG-15319 broke keyboard +shortcuts for non latin keyboard layouts. + +This patch reverts QTBUG-15319 (f45cdeda8) since it caused a +regression. + +Task-number: QTBUG-32908 + +Change-Id: I47d7984fa7986d5218d1f3ff1fc36d2ec67c9ba7 +Reviewed-by: David Faure <david.faure@kdab.com> +--- + src/gui/kernel/qkeymapper_x11.cpp | 5 +---- + 1 files changed, 1 insertions(+), 4 deletions(-) + +diff --git a/src/gui/kernel/qkeymapper_x11.cpp b/src/gui/kernel/qkeymapper_x11.cpp +index 005ff3f..7daa41d 100644 +--- a/src/gui/kernel/qkeymapper_x11.cpp ++++ b/src/gui/kernel/qkeymapper_x11.cpp +@@ -282,12 +282,9 @@ QList<int> QKeyMapperPrivate::possibleKeysXKB(QKeyEvent *event) + + // first, translate key only using lock modifiers (there are no Qt equivalents for these, so we must + // always use them when determining the baseKeySym) +- // Note: the Xkb group to be used for the conversion keycode->keysym has to be given to +- // XkbLookupKeySym(). This information is contained in the bits 8 to 15 of xmodifiers. +- // See https://bugreports.qt-project.org/browse/QTBUG-15319 . + KeySym baseKeySym; + uint consumedModifiers; +- if (!XkbLookupKeySym(X11->display, xkeycode, (xmodifiers & (0xff00 | LockMask | qt_num_lock_mask)), ++ if (!XkbLookupKeySym(X11->display, xkeycode, (xmodifiers & (LockMask | qt_num_lock_mask)), + &consumedModifiers, &baseKeySym)) + return QList<int>(); + +-- +1.7.1 + diff --git a/libre/vim/PKGBUILD b/libre/vim-runtime/PKGBUILD index 0a2ae3740..93ac38edd 100644 --- a/libre/vim/PKGBUILD +++ b/libre/vim-runtime/PKGBUILD @@ -12,7 +12,7 @@ __hgrev=d17ef148ada4 _versiondir="vim${_topver//./}" pkgver=${_topver}.${_patchlevel} pkgrel=2 -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') license=('custom:vim') url="http://www.vim.org" makedepends=('gpm' 'python2' 'ruby' 'libxt' 'desktop-file-utils' 'gtk2' 'lua') diff --git a/libre/vim/parabola.vim b/libre/vim-runtime/parabola.vim index bc3c1f82e..bc3c1f82e 100644 --- a/libre/vim/parabola.vim +++ b/libre/vim-runtime/parabola.vim diff --git a/libre/vim/vimrc b/libre/vim-runtime/vimrc index fc67e7eb0..fc67e7eb0 100644 --- a/libre/vim/vimrc +++ b/libre/vim-runtime/vimrc |