From c72dc5de577922ea7f6002cdabcfac1576eae211 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 17 Oct 2013 01:14:24 -0700 Subject: Thu Oct 17 01:13:29 PDT 2013 --- community/mpv/PKGBUILD | 13 ++++++++----- community/mpv/mpv.install | 12 ++++++++++++ 2 files changed, 20 insertions(+), 5 deletions(-) create mode 100644 community/mpv/mpv.install (limited to 'community/mpv') diff --git a/community/mpv/PKGBUILD b/community/mpv/PKGBUILD index a02999b94..8124effb1 100644 --- a/community/mpv/PKGBUILD +++ b/community/mpv/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 98298 2013-10-08 06:09:02Z bpiotrowski $ +# $Id: PKGBUILD 98686 2013-10-16 20:24:06Z bpiotrowski $ # Maintainer: BartÅ‚omiej Piotrowski # Contributor: Eivind Uggedal pkgname=mpv -pkgver=0.1.7 -pkgrel=3 +pkgver=0.2.0 +pkgrel=1 pkgdesc='Video player based on MPlayer/mplayer2' arch=('i686' 'x86_64') license=('GPL') @@ -12,11 +12,13 @@ url='http://mpv.io' depends=( 'portaudio' 'ffmpeg' 'lcms2' 'libdvdread' 'libcdio-paranoia' 'libxinerama' 'libquvi' 'mpg123' 'libxv' 'libxkbcommon' 'libva' 'lirc-utils' + 'desktop-file-utils' 'hicolor-icon-theme' 'xdg-utils' ) makedepends=('mesa' 'python-docutils') options=(!emptydirs) +install=mpv.install source=("https://github.com/mpv-player/$pkgname/archive/v$pkgver.tar.gz") -md5sums=('69185e255fe6e8b6b13dcf6ea9b2fefb') +md5sums=('f86a6e99093b83717edded92ad8346b1') build() { unset CFLAGS @@ -49,5 +51,6 @@ package() { "$pkgdir"/usr/share/doc/mpv/examples install -m644 DOCS/{encoding.rst,tech-overview.txt} \ "$pkgdir"/usr/share/doc/mpv - install -m755 TOOLS/mpv_identify.sh "$pkgdir"/usr/bin + + #install -Dm644 etc/mpv.desktop "$pkgdir"/usr/share/applications/mpv.desktop } diff --git a/community/mpv/mpv.install b/community/mpv/mpv.install new file mode 100644 index 000000000..5c501dc49 --- /dev/null +++ b/community/mpv/mpv.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} -- cgit v1.2.3-54-g00ecf From 5a3821aec094b38a412cf5e6997c08b6428d6f77 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 25 Oct 2013 02:08:36 -0700 Subject: Fri Oct 25 02:07:10 PDT 2013 --- community/aria2/PKGBUILD | 6 +- community/banner/PKGBUILD | 5 +- community/dbmail/PKGBUILD | 4 +- community/geda-gaf/PKGBUILD | 4 +- community/gerbv/PKGBUILD | 4 +- community/gpicview/PKGBUILD | 29 ++-- community/gpicview/fix-scrolling.patch | 149 --------------------- community/gpicview/gpicview.install | 7 +- community/granite/PKGBUILD | 36 +++++ community/granite/granite.install | 13 ++ community/jansson/PKGBUILD | 6 +- community/luasocket/PKGBUILD | 8 +- community/lxappearance-obconf/PKGBUILD | 29 ++-- community/mpv/PKGBUILD | 6 +- community/mythtv/PKGBUILD | 4 +- community/noise/PKGBUILD | 40 ++++++ community/noise/noise.install | 17 +++ community/pd/PKGBUILD | 21 ++- community/pd/enable-fftw3.patch | 19 +++ community/pgadmin3/PKGBUILD | 5 +- community/pgadmin3/pgadmin3.install | 11 ++ community/qcad/PKGBUILD | 6 +- community/quagga/PKGBUILD | 6 +- community/rtl-sdr/PKGBUILD | 6 +- community/sk1/PKGBUILD | 50 ++----- community/sk1/fix_pillow_import.patch | 35 ----- community/sk1/sk1.desktop | 59 -------- community/sk1libs/PKGBUILD | 14 +- community/sk1sdk/PKGBUILD | 29 ++++ community/sqlheavy/PKGBUILD | 27 ++-- community/ulogd/PKGBUILD | 6 +- community/ulogd/ulogd.conf | 3 +- community/xmlstarlet/PKGBUILD | 23 ++-- community/zeromq/LIBZMQ-569.patch | 30 +++++ community/zeromq/PKGBUILD | 16 ++- core/curl/PKGBUILD | 4 +- core/dialog/PKGBUILD | 7 +- core/libarchive/PKGBUILD | 6 +- core/shadow/PKGBUILD | 9 +- ...unt-check-for-NULL-before-reading-pm-what.patch | 29 ++++ ...-fix-off-by-one-error-in-tag_to_udev_node.patch | 50 +++++++ core/systemd/PKGBUILD | 20 ++- core/systemd/systemd.install | 2 +- core/sysvinit-tools/PKGBUILD | 39 +++--- core/util-linux/PKGBUILD | 21 +-- extra/a2ps/PKGBUILD | 7 +- extra/aalib/PKGBUILD | 15 ++- extra/audacity/PKGBUILD | 6 +- extra/cln/PKGBUILD | 5 +- extra/epplet-base/PKGBUILD | 9 +- extra/faad2/LICENSE | 42 ------ extra/faad2/PKGBUILD | 34 +++-- ...d2-2.7-libmp4ff-install-mp4ff_int_types_h.patch | 13 ++ extra/faad2/faad2-2.7-libmp4ff-shared-lib.patch | 29 ++++ extra/faad2/faad2-2.7-man1_MANS.patch | 10 ++ extra/glib/PKGBUILD | 6 +- extra/gnet/PKGBUILD | 5 +- extra/gsasl/PKGBUILD | 24 ++-- extra/gsasl/gsasl.install | 16 +++ extra/gtk/PKGBUILD | 5 +- extra/imagemagick/PKGBUILD | 8 +- extra/jasper/PKGBUILD | 21 +-- extra/lablgtk2/PKGBUILD | 6 +- extra/lcms2/PKGBUILD | 8 +- extra/libmad/PKGBUILD | 15 ++- extra/libmng/PKGBUILD | 5 +- extra/libqalculate/PKGBUILD | 14 +- extra/libsamplerate/PKGBUILD | 5 +- extra/libsndfile/PKGBUILD | 17 ++- extra/libstroke/PKGBUILD | 42 +++--- extra/libstroke/libstroke-0.5.1-no_gtk1.patch | 33 +++++ extra/libtiff/PKGBUILD | 12 +- extra/libtiff/libtiff-CVE-2013-4244.patch | 15 +++ extra/qt4/PKGBUILD | 11 +- extra/qt4/qtbug-32908.patch | 40 ++++++ libre/vim-runtime/PKGBUILD | 104 ++++++++++++++ libre/vim-runtime/parabola.vim | 27 ++++ libre/vim-runtime/vimrc | 16 +++ libre/vim/PKGBUILD | 104 -------------- libre/vim/parabola.vim | 27 ---- libre/vim/vimrc | 16 --- 81 files changed, 915 insertions(+), 777 deletions(-) delete mode 100644 community/gpicview/fix-scrolling.patch create mode 100644 community/granite/PKGBUILD create mode 100644 community/granite/granite.install create mode 100644 community/noise/PKGBUILD create mode 100644 community/noise/noise.install create mode 100644 community/pd/enable-fftw3.patch create mode 100644 community/pgadmin3/pgadmin3.install delete mode 100644 community/sk1/fix_pillow_import.patch delete mode 100644 community/sk1/sk1.desktop create mode 100644 community/sk1sdk/PKGBUILD create mode 100644 community/zeromq/LIBZMQ-569.patch create mode 100644 core/systemd/0001-mount-check-for-NULL-before-reading-pm-what.patch create mode 100644 core/systemd/0001-shared-util-fix-off-by-one-error-in-tag_to_udev_node.patch delete mode 100644 extra/faad2/LICENSE create mode 100644 extra/faad2/faad2-2.7-libmp4ff-install-mp4ff_int_types_h.patch create mode 100644 extra/faad2/faad2-2.7-libmp4ff-shared-lib.patch create mode 100644 extra/faad2/faad2-2.7-man1_MANS.patch create mode 100644 extra/gsasl/gsasl.install create mode 100644 extra/libstroke/libstroke-0.5.1-no_gtk1.patch create mode 100644 extra/libtiff/libtiff-CVE-2013-4244.patch create mode 100644 extra/qt4/qtbug-32908.patch create mode 100644 libre/vim-runtime/PKGBUILD create mode 100644 libre/vim-runtime/parabola.vim create mode 100644 libre/vim-runtime/vimrc delete mode 100644 libre/vim/PKGBUILD delete mode 100644 libre/vim/parabola.vim delete mode 100644 libre/vim/vimrc (limited to 'community/mpv') 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 # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Angel Velasquez @@ -6,7 +6,7 @@ # Contributor: Daniel J Griffiths 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 +# Maintainer: Jonathan Steel # Contributor: Peter Simons 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 # Contributor: Sebastian Faltoni 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 # Contributor: Jared Casper # Contributor: Stefan Husmann 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 # Contributor: Jared Casper # Contributor: Stefan Husmann 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 # Contributor: Angel Velasquez # Contributor: Geoffroy Carrier 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 -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 +# Contributor: Ner0 + +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 # Contributor: Dave Reisner 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 # Contributor: Anders Bergh 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 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 # Contributor: Eivind Uggedal 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 # Contributor: Giovanni Scafora # Contributor: Juergen Hoetzel @@ -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 + +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 # Contributor: TDY # Contributor: Shinlun Hsieh 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 # Maintainer: Douglas Soares de Andrade # Contributor: Benjamin Andresen @@ -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 # Contributor: Stefan Husmann # Contributor: Giovanni Scafora # Contributor: Daniel J Griffiths 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 # Contributor: Michael Düll @@ -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 # Contributor: ConnorBehan 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 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 + +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 # Contributor : sebikul 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 # Maintainer: Sébastien Luttringer # Contributor: Dale Blount @@ -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 # Maintainer: PyroPeter # Contributor: BlackEagle # Contributor: chochem 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 +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 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 # Contributor: Angel Velasquez # Contributor: Eric Belanger @@ -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 # Contributor: Stéphane Gaudreault # Contributor: Allan McRae # Contributor: Andreas Radke 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 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 # Maintainer: Aaron Griffin 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 +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 +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 # Maintainer: Eric Belanger 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 # Maintainer: Dave Reisner # Contributor: judd 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 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 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 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 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 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 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 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 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 -# Contributor: Orivej Desh -# Maintainer: Orivej Desh +# $Id: PKGBUILD 197247 2013-10-24 18:39:54Z eric $ +# Maintainer: Eric Bélanger 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 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 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 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 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 -# Contributor: Lukas Jirkovsky 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 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 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 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 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 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 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 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 # Contributor: Pierre Schmitz 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 +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 +--- + 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 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(); + +-- +1.7.1 + diff --git a/libre/vim-runtime/PKGBUILD b/libre/vim-runtime/PKGBUILD new file mode 100644 index 000000000..93ac38edd --- /dev/null +++ b/libre/vim-runtime/PKGBUILD @@ -0,0 +1,104 @@ +# Maintainer: Thomas Dziedzic +# Contributor: Jan "heftig" Steffens +# Contributor: tobias [ tobias at archlinux org ] +# Contributor: Daniel J Griffiths +# Maintainer (Parabola): André Silva + +pkgbase=vim +pkgname=vim-runtime +_topver=7.4 +_patchlevel=16 +__hgrev=d17ef148ada4 +_versiondir="vim${_topver//./}" +pkgver=${_topver}.${_patchlevel} +pkgrel=2 +arch=('i686' 'x86_64' 'mips64el') +license=('custom:vim') +url="http://www.vim.org" +makedepends=('gpm' 'python2' 'ruby' 'libxt' 'desktop-file-utils' 'gtk2' 'lua') +source=("ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz" + "ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz.sig" + 'vimrc' + 'parabola.vim') +md5sums=('733cce44a08ea953ad0e1f9d574670e0' + 'SKIP' + '27820c2bdc34624674c561ae6476bc6a' + 'a8c21928eefd766e211f987879a9199c') + +build() { + cp -a ${pkgbase}-${pkgver} vim-build + + # define the place for the global (g)vimrc file (set to /etc/vimrc) + sed -i 's|^.*\(#define SYS_.*VIMRC_FILE.*"\) .*$|\1|' \ + vim-build/src/feature.h + sed -i 's|^.*\(#define VIMRC_FILE.*"\) .*$|\1|' \ + vim-build/src/feature.h + + (cd vim-build/src && autoconf) + + cd "${srcdir}"/vim-build + + ./configure \ + --prefix=/usr \ + --localstatedir=/var/lib/vim \ + --with-features=huge \ + --with-compiledby='Parabola GNU/Linux-libre' \ + --enable-gpm \ + --enable-acl \ + --with-x=yes \ + --enable-gui=gtk2 \ + --enable-multibyte \ + --enable-cscope \ + --enable-netbeans \ + --enable-perlinterp \ + --enable-pythoninterp \ + --disable-python3interp \ + --enable-rubyinterp \ + --enable-luainterp + + make +} + +package_vim-runtime() { + pkgdesc='Runtime for vim and gvim (Parabola rebranded)' + depends=('perl' 'gawk') + backup=('etc/vimrc') + + cd "${srcdir}"/vim-build + + make -j1 VIMRCLOC=/etc DESTDIR="${pkgdir}" install + + # delete binaries and manuals files + rm -vr "${pkgdir}"/usr/bin + rm -vr "${pkgdir}"/usr/share/man + + # Don't forget logtalk.dict + install -Dm644 "${srcdir}"/vim-build/runtime/ftplugin/logtalk.dict \ + "${pkgdir}"/usr/share/vim/${_versiondir}/ftplugin/logtalk.dict + + # fix FS#17216 + sed -i 's|messages,/var|messages,/var/log/messages.log,/var|' \ + "${pkgdir}"/usr/share/vim/${_versiondir}/filetype.vim + + # patch filetype.vim for better handling of pacman related files + sed -i "s/rpmsave/pacsave/;s/rpmnew/pacnew/;s/,\*\.ebuild/\0,PKGBUILD*,*.install/" \ + "${pkgdir}"/usr/share/vim/${_versiondir}/filetype.vim + sed -i "/find the end/,+3{s/changelog_date_entry_search/changelog_date_end_entry_search/}" \ + "${pkgdir}"/usr/share/vim/${_versiondir}/ftplugin/changelog.vim + + # rc files + install -Dm644 "${srcdir}"/vimrc "${pkgdir}"/etc/vimrc + install -Dm644 "${srcdir}"/parabola.vim \ + "${pkgdir}"/usr/share/vim/vimfiles/parabola.vim + + # rgb.txt file + install -Dm644 "${srcdir}"/vim-${pkgver}/runtime/rgb.txt \ + "${pkgdir}"/usr/share/vim/${_versiondir}/rgb.txt + + # license + install -dm755 "${pkgdir}"/usr/share/licenses/vim-runtime + ln -s /usr/share/vim/${_versiondir}/doc/uganda.txt \ + "${pkgdir}"/usr/share/licenses/vim-runtime/license.txt +} + +# vim:set sw=2 sts=2 et: diff --git a/libre/vim-runtime/parabola.vim b/libre/vim-runtime/parabola.vim new file mode 100644 index 000000000..bc3c1f82e --- /dev/null +++ b/libre/vim-runtime/parabola.vim @@ -0,0 +1,27 @@ +" The Parabola GNU/Linux-libre global vimrc - setting only a few sane defaults +" +" Maintainer: Tobias Kieslich [tobias funnychar archlinux dot org] +" Maintainer for Parabola rebranding: André Silva [emulatorman funnychar parabola dot nu] +" +" NEVER EDIT THIS FILE, IT'S OVERWRITTEN UPON UPGRADES, GLOBAL CONFIGURATION +" SHALL BE DONE IN /etc/vimrc, USER SPECIFIC CONFIGURATION IN ~/.vimrc + +" Normally we use vim-extensions. If you want true vi-compatibility +" remove change the following statements +set nocompatible " Use Vim defaults instead of 100% vi compatibility +set backspace=indent,eol,start " more powerful backspacing + +" Now we set some defaults for the editor +set history=50 " keep 50 lines of command line history +set ruler " show the cursor position all the time + +" Suffixes that get lower priority when doing tab completion for filenames. +" These are files we are not likely to want to edit or read. +set suffixes=.bak,~,.swp,.o,.info,.aux,.log,.dvi,.bbl,.blg,.brf,.cb,.ind,.idx,.ilg,.inx,.out,.toc + + +if has('gui_running') + " Make shift-insert work like in Xterm + map + map! +endif diff --git a/libre/vim-runtime/vimrc b/libre/vim-runtime/vimrc new file mode 100644 index 000000000..fc67e7eb0 --- /dev/null +++ b/libre/vim-runtime/vimrc @@ -0,0 +1,16 @@ +" All system-wide defaults are set in $VIMRUNTIME/parabola.vim (usually just +" /usr/share/vim/vimfiles/parabola.vim) and sourced by the call to :runtime +" you can find below. If you wish to change any of those settings, you should +" do it in this file (/etc/vimrc), since parabola.vim will be overwritten +" everytime an upgrade of the vim packages is performed. It is recommended to +" make changes after sourcing parabola.vim since it alters the value of the +" 'compatible' option. + +" This line should not be removed as it ensures that various options are +" properly set to work with the Vim-related packages. +runtime! parabola.vim + +" If you prefer the old-style vim functionalty, add 'runtime! vimrc_example.vim' +" Or better yet, read /usr/share/vim/vim74/vimrc_example.vim or the vim manual +" and configure vim to your own liking! + diff --git a/libre/vim/PKGBUILD b/libre/vim/PKGBUILD deleted file mode 100644 index 0a2ae3740..000000000 --- a/libre/vim/PKGBUILD +++ /dev/null @@ -1,104 +0,0 @@ -# Maintainer: Thomas Dziedzic -# Contributor: Jan "heftig" Steffens -# Contributor: tobias [ tobias at archlinux org ] -# Contributor: Daniel J Griffiths -# Maintainer (Parabola): André Silva - -pkgbase=vim -pkgname=vim-runtime -_topver=7.4 -_patchlevel=16 -__hgrev=d17ef148ada4 -_versiondir="vim${_topver//./}" -pkgver=${_topver}.${_patchlevel} -pkgrel=2 -arch=('i686' 'x86_64') -license=('custom:vim') -url="http://www.vim.org" -makedepends=('gpm' 'python2' 'ruby' 'libxt' 'desktop-file-utils' 'gtk2' 'lua') -source=("ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz" - "ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz.sig" - 'vimrc' - 'parabola.vim') -md5sums=('733cce44a08ea953ad0e1f9d574670e0' - 'SKIP' - '27820c2bdc34624674c561ae6476bc6a' - 'a8c21928eefd766e211f987879a9199c') - -build() { - cp -a ${pkgbase}-${pkgver} vim-build - - # define the place for the global (g)vimrc file (set to /etc/vimrc) - sed -i 's|^.*\(#define SYS_.*VIMRC_FILE.*"\) .*$|\1|' \ - vim-build/src/feature.h - sed -i 's|^.*\(#define VIMRC_FILE.*"\) .*$|\1|' \ - vim-build/src/feature.h - - (cd vim-build/src && autoconf) - - cd "${srcdir}"/vim-build - - ./configure \ - --prefix=/usr \ - --localstatedir=/var/lib/vim \ - --with-features=huge \ - --with-compiledby='Parabola GNU/Linux-libre' \ - --enable-gpm \ - --enable-acl \ - --with-x=yes \ - --enable-gui=gtk2 \ - --enable-multibyte \ - --enable-cscope \ - --enable-netbeans \ - --enable-perlinterp \ - --enable-pythoninterp \ - --disable-python3interp \ - --enable-rubyinterp \ - --enable-luainterp - - make -} - -package_vim-runtime() { - pkgdesc='Runtime for vim and gvim (Parabola rebranded)' - depends=('perl' 'gawk') - backup=('etc/vimrc') - - cd "${srcdir}"/vim-build - - make -j1 VIMRCLOC=/etc DESTDIR="${pkgdir}" install - - # delete binaries and manuals files - rm -vr "${pkgdir}"/usr/bin - rm -vr "${pkgdir}"/usr/share/man - - # Don't forget logtalk.dict - install -Dm644 "${srcdir}"/vim-build/runtime/ftplugin/logtalk.dict \ - "${pkgdir}"/usr/share/vim/${_versiondir}/ftplugin/logtalk.dict - - # fix FS#17216 - sed -i 's|messages,/var|messages,/var/log/messages.log,/var|' \ - "${pkgdir}"/usr/share/vim/${_versiondir}/filetype.vim - - # patch filetype.vim for better handling of pacman related files - sed -i "s/rpmsave/pacsave/;s/rpmnew/pacnew/;s/,\*\.ebuild/\0,PKGBUILD*,*.install/" \ - "${pkgdir}"/usr/share/vim/${_versiondir}/filetype.vim - sed -i "/find the end/,+3{s/changelog_date_entry_search/changelog_date_end_entry_search/}" \ - "${pkgdir}"/usr/share/vim/${_versiondir}/ftplugin/changelog.vim - - # rc files - install -Dm644 "${srcdir}"/vimrc "${pkgdir}"/etc/vimrc - install -Dm644 "${srcdir}"/parabola.vim \ - "${pkgdir}"/usr/share/vim/vimfiles/parabola.vim - - # rgb.txt file - install -Dm644 "${srcdir}"/vim-${pkgver}/runtime/rgb.txt \ - "${pkgdir}"/usr/share/vim/${_versiondir}/rgb.txt - - # license - install -dm755 "${pkgdir}"/usr/share/licenses/vim-runtime - ln -s /usr/share/vim/${_versiondir}/doc/uganda.txt \ - "${pkgdir}"/usr/share/licenses/vim-runtime/license.txt -} - -# vim:set sw=2 sts=2 et: diff --git a/libre/vim/parabola.vim b/libre/vim/parabola.vim deleted file mode 100644 index bc3c1f82e..000000000 --- a/libre/vim/parabola.vim +++ /dev/null @@ -1,27 +0,0 @@ -" The Parabola GNU/Linux-libre global vimrc - setting only a few sane defaults -" -" Maintainer: Tobias Kieslich [tobias funnychar archlinux dot org] -" Maintainer for Parabola rebranding: André Silva [emulatorman funnychar parabola dot nu] -" -" NEVER EDIT THIS FILE, IT'S OVERWRITTEN UPON UPGRADES, GLOBAL CONFIGURATION -" SHALL BE DONE IN /etc/vimrc, USER SPECIFIC CONFIGURATION IN ~/.vimrc - -" Normally we use vim-extensions. If you want true vi-compatibility -" remove change the following statements -set nocompatible " Use Vim defaults instead of 100% vi compatibility -set backspace=indent,eol,start " more powerful backspacing - -" Now we set some defaults for the editor -set history=50 " keep 50 lines of command line history -set ruler " show the cursor position all the time - -" Suffixes that get lower priority when doing tab completion for filenames. -" These are files we are not likely to want to edit or read. -set suffixes=.bak,~,.swp,.o,.info,.aux,.log,.dvi,.bbl,.blg,.brf,.cb,.ind,.idx,.ilg,.inx,.out,.toc - - -if has('gui_running') - " Make shift-insert work like in Xterm - map - map! -endif diff --git a/libre/vim/vimrc b/libre/vim/vimrc deleted file mode 100644 index fc67e7eb0..000000000 --- a/libre/vim/vimrc +++ /dev/null @@ -1,16 +0,0 @@ -" All system-wide defaults are set in $VIMRUNTIME/parabola.vim (usually just -" /usr/share/vim/vimfiles/parabola.vim) and sourced by the call to :runtime -" you can find below. If you wish to change any of those settings, you should -" do it in this file (/etc/vimrc), since parabola.vim will be overwritten -" everytime an upgrade of the vim packages is performed. It is recommended to -" make changes after sourcing parabola.vim since it alters the value of the -" 'compatible' option. - -" This line should not be removed as it ensures that various options are -" properly set to work with the Vim-related packages. -runtime! parabola.vim - -" If you prefer the old-style vim functionalty, add 'runtime! vimrc_example.vim' -" Or better yet, read /usr/share/vim/vim74/vimrc_example.vim or the vim manual -" and configure vim to your own liking! - -- cgit v1.2.3-54-g00ecf From 24152c3ea77087edccf017c13d44904a75799ff7 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 26 Oct 2013 01:22:45 -0700 Subject: Sat Oct 26 01:21:13 PDT 2013 --- community/aegisub/PKGBUILD | 4 +- community/bamf/PKGBUILD | 31 + community/bullet/PKGBUILD | 18 +- community/flam3/PKGBUILD | 7 +- community/gitg/PKGBUILD | 10 +- community/gmtk/PKGBUILD | 5 +- community/google-glog/PKGBUILD | 4 +- community/gpac/PKGBUILD | 4 +- community/haskell-ghc-paths/PKGBUILD | 9 +- community/haveged/PKGBUILD | 4 +- community/jbig2dec/PKGBUILD | 4 +- community/kyotocabinet/PKGBUILD | 9 +- community/libdbusmenu/PKGBUILD | 46 ++ community/libsodium/PKGBUILD | 7 +- community/liteide/PKGBUILD | 12 +- community/ming/PKGBUILD | 4 +- community/mongodb/PKGBUILD | 12 +- community/mpv/PKGBUILD | 4 +- community/mythtv/PKGBUILD | 8 +- community/opencc/PKGBUILD | 10 +- community/pdflib-lite/PKGBUILD | 2 +- community/percona-server/PKGBUILD | 10 +- community/percona-server/mysql56-bison3.patch | 621 +++++++++++---------- community/pidgin-hotkeys/PKGBUILD | 4 +- community/plank/PKGBUILD | 39 ++ community/plank/plank.install | 15 + community/portaudio/PKGBUILD | 4 +- community/proxychains/PKGBUILD | 7 +- community/python2-xapian/PKGBUILD | 8 +- community/rtl-sdr/PKGBUILD | 12 +- community/scite/PKGBUILD | 6 +- community/simavr/PKGBUILD | 21 +- community/synergy/PKGBUILD | 4 +- community/xmlrpc-c/PKGBUILD | 8 +- community/zathura-pdf-mupdf/PKGBUILD | 12 +- community/zh-autoconvert/PKGBUILD | 3 +- community/zinnia/PKGBUILD | 4 +- core/acl/PKGBUILD | 5 +- core/gcc/PKGBUILD | 20 +- core/glibc/PKGBUILD | 30 +- core/glibc/glibc-2.18-make-4.patch | 45 ++ core/glibc/glibc.install | 5 +- core/glibc/locale-gen | 60 +- extra/a52dec/PKGBUILD | 5 +- extra/audiofile/PKGBUILD | 4 +- extra/cfitsio/PKGBUILD | 9 +- .../0001-Fix-failure-to-start-with-ENOTSOCK.patch | 26 - .../0001-Fix-wrong-size-in-memset-call.patch | 26 - extra/dnsmasq/PKGBUILD | 21 +- extra/elfutils/PKGBUILD | 7 +- extra/enca/PKGBUILD | 7 +- extra/exiv2/PKGBUILD | 4 +- extra/ffmpeg-compat/PKGBUILD | 4 +- extra/ffmpeg/PKGBUILD | 4 +- extra/fftw/PKGBUILD | 5 +- extra/fuse/PKGBUILD | 5 +- extra/gd/PKGBUILD | 4 +- extra/geoip/PKGBUILD | 6 +- extra/giblib/PKGBUILD | 4 +- extra/gnutls/PKGBUILD | 6 +- extra/gsl/PKGBUILD | 6 +- extra/gupnp-igd/PKGBUILD | 25 +- extra/id3lib/PKGBUILD | 4 +- extra/imlib2/PKGBUILD | 4 +- extra/lame/PKGBUILD | 5 +- extra/lcms/PKGBUILD | 5 +- extra/libass/PKGBUILD | 7 +- extra/libbsd/PKGBUILD | 7 +- extra/libcdaudio/PKGBUILD | 5 +- extra/libcddb/PKGBUILD | 4 +- extra/libdv/PKGBUILD | 5 +- extra/libebml/PKGBUILD | 4 +- extra/libexif/PKGBUILD | 4 +- extra/libftdi/PKGBUILD | 5 +- extra/libglade/PKGBUILD | 5 +- extra/libid3tag/PKGBUILD | 4 +- extra/libidl2/PKGBUILD | 6 +- extra/libidn/PKGBUILD | 4 +- extra/libisoburn/PKGBUILD | 7 +- extra/libmatroska/PKGBUILD | 4 +- extra/libmtp/PKGBUILD | 5 +- extra/libogg/PKGBUILD | 4 +- extra/libshout/PKGBUILD | 4 +- extra/libunistring/PKGBUILD | 2 +- extra/libutempter/PKGBUILD | 2 +- extra/libvpx/PKGBUILD | 4 +- extra/libwmf/PKGBUILD | 12 +- extra/libxml2/PKGBUILD | 4 +- extra/libxslt/PKGBUILD | 4 +- extra/physfs/PKGBUILD | 13 +- extra/portmidi/PKGBUILD | 50 +- extra/portmidi/portmidi-217-build-fix.patch | 335 ++++++++++- extra/qt3/PKGBUILD | 14 +- extra/qt3/qt-x11-free-3.3.5-makelibshared.patch | 48 ++ extra/rrdtool/PKGBUILD | 18 +- extra/rrdtool/rrdtool-systemd.patch | 140 +++++ extra/rtmpdump/PKGBUILD | 4 +- extra/schroedinger/PKGBUILD | 4 +- extra/sdl2/PKGBUILD | 7 +- extra/sg3_utils/PKGBUILD | 5 +- extra/sox/PKGBUILD | 5 +- extra/startup-notification/PKGBUILD | 4 +- extra/t1lib/PKGBUILD | 5 +- extra/taglib/PKGBUILD | 8 +- extra/tcl/PKGBUILD | 3 +- extra/tk/PKGBUILD | 3 +- extra/unixodbc/PKGBUILD | 16 +- extra/vlc/PKGBUILD | 4 +- extra/xmms/PKGBUILD | 15 +- extra/xvidcore/PKGBUILD | 4 +- extra/zenity/PKGBUILD | 25 +- libre/crosstool-ng/PKGBUILD | 5 +- libre/gst-plugins-bad-libre/PKGBUILD | 7 +- libre/gstreamer0.10-bad-libre/PKGBUILD | 4 +- libre/mplayer-libre/PKGBUILD | 4 +- libre/mplayer-vaapi-libre/PKGBUILD | 4 +- pcr/fsniper/PKGBUILD | 32 ++ 117 files changed, 1459 insertions(+), 792 deletions(-) create mode 100644 community/bamf/PKGBUILD create mode 100644 community/libdbusmenu/PKGBUILD create mode 100644 community/plank/PKGBUILD create mode 100644 community/plank/plank.install create mode 100644 core/glibc/glibc-2.18-make-4.patch delete mode 100644 extra/dnsmasq/0001-Fix-failure-to-start-with-ENOTSOCK.patch delete mode 100644 extra/dnsmasq/0001-Fix-wrong-size-in-memset-call.patch create mode 100644 extra/qt3/qt-x11-free-3.3.5-makelibshared.patch create mode 100644 extra/rrdtool/rrdtool-systemd.patch create mode 100644 pcr/fsniper/PKGBUILD (limited to 'community/mpv') diff --git a/community/aegisub/PKGBUILD b/community/aegisub/PKGBUILD index 0e6ad935b..8bd2d48a8 100755 --- a/community/aegisub/PKGBUILD +++ b/community/aegisub/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 97224 2013-09-15 13:34:01Z alucryd $ +# $Id: PKGBUILD 99199 2013-10-25 12:58:18Z giovanni $ # Maintainer: Maxime Gauduin # Contributor: kozec # Contributor: Limao Luo pkgname=aegisub pkgver=3.0.4 -pkgrel=4 +pkgrel=5 pkgdesc="A general-purpose subtitle editor with ASS/SSA support" arch=('i686' 'x86_64') url="http://www.aegisub.org" diff --git a/community/bamf/PKGBUILD b/community/bamf/PKGBUILD new file mode 100644 index 000000000..0e9e817f2 --- /dev/null +++ b/community/bamf/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 99159 2013-10-25 08:28:21Z alucryd $ +# Maintainer: Maxime Gauduin +# Contributor: Balló György + +pkgname=bamf +pkgver=0.5.0 +pkgrel=2 +pkgdesc="Application matching framework" +arch=('i686' 'x86_64') +url="https://launchpad.net/bamf" +license=('GPL') +depends=('libgtop' 'libwnck3') +makedepends=('gobject-introspection' 'python2-lxml' 'vala') +source=("http://launchpad.net/${pkgname}/${pkgver%.*}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz") +sha256sums=('93b1acced96d32b36270cf18feb2761014ce2226814303c632448f717a8f9113') + +build() { + cd ${pkgname}-${pkgver} + + export PYTHON='/usr/bin/python2' + ./configure --prefix='/usr' --sysconfdir='/etc' --localstatedir='/var' --libexecdir="/usr/lib/${pkgname}" --disable-{static,webapps} + make +} + +package() { + cd ${pkgbase}-${pkgver} + + make DESTDIR="${pkgdir}" install +} + +# vim: ts=2 sw=2 et: diff --git a/community/bullet/PKGBUILD b/community/bullet/PKGBUILD index 8f52b48c5..a5469b833 100644 --- a/community/bullet/PKGBUILD +++ b/community/bullet/PKGBUILD @@ -1,25 +1,25 @@ -# $Id: PKGBUILD 83395 2013-01-31 09:42:11Z svenstaro $ +# $Id: PKGBUILD 99165 2013-10-25 09:52:29Z svenstaro $ # Maintainer: Sven-Hendrik Haase # Contributor: Christoph Zeiler pkgbase=bullet pkgname=('bullet' 'bullet-docs') -_rev=2613 -pkgver=2.81 -pkgrel=2 +_rev=2704 +pkgver=2.82 +pkgrel=1 pkgdesc="A 3D Collision Detection and Rigid Body Dynamics Library for games and animation" arch=('i686' 'x86_64') url="http://www.bulletphysics.com/Bullet/" license=('custom:zlib') depends=() makedepends=('cmake' 'doxygen' 'graphviz' 'ttf-dejavu' 'mesa') -source=(http://bullet.googlecode.com/files/${pkgbase}-${pkgver}-rev${_rev}.tgz +source=(http://bullet.googlecode.com/files/${pkgbase}-${pkgver}-r${_rev}.tgz ${pkgbase}.pc) -md5sums=('cec9c9a79c2804dbf6385dd7d061346c' +md5sums=('70b3c8d202dee91a0854b4cbc88173e8' 'd1da06deba3b08b884d2212f6838905c') build() { - cd ${pkgbase}-${pkgver}-rev${_rev} + cd ${pkgbase}-${pkgver}-r${_rev} # get a clean build dir [[ -d build ]] && rm -rf build @@ -48,7 +48,7 @@ build() { package_bullet() { optdepends=('bullet-docs: documentation') - cd ${pkgbase}-${pkgver}-rev${_rev}/build + cd ${pkgbase}-${pkgver}-r${_rev}/build # install it make DESTDIR=${pkgdir} install @@ -65,7 +65,7 @@ package_bullet-docs() { pkgdesc="Documentation for bullet" depends=() - cd ${pkgbase}-${pkgver}-rev${_rev} + cd ${pkgbase}-${pkgver}-r${_rev} # install docs install -Dm644 Bullet_User_Manual.pdf ${pkgdir}/usr/share/doc/bullet/Bullet_User_Manual.pdf diff --git a/community/flam3/PKGBUILD b/community/flam3/PKGBUILD index 2dc0711ea..9a6d063a6 100644 --- a/community/flam3/PKGBUILD +++ b/community/flam3/PKGBUILD @@ -1,22 +1,21 @@ -# $Id: PKGBUILD 90023 2013-05-06 19:36:52Z foutrelis $ +# $Id: PKGBUILD 99213 2013-10-25 20:22:05Z eric $ # Maintainer: Eric Bélanger pkgname=flam3 pkgver=3.0.1 -pkgrel=3 +pkgrel=4 pkgdesc="Tools to create/display fractal flames: algorithmically generated images and animations" arch=('i686' 'x86_64') url="http://flam3.com/" license=('GPL3') depends=('libjpeg' 'libpng' 'libxml2') -options=('!libtool') source=(http://flam3.googlecode.com/files/${pkgname}-${pkgver}.tar.gz flam3-3.0.1-libpng15.patch) sha1sums=('8814515f2e49e034e47cf97e9d2c0e932844abb9' '17ece6cc00899e5135dad2bc79f97dfbd73107a6') prepare() { cd ${pkgname}-${pkgver}/src - patch -p1 -i ../../flam3-3.0.1-libpng15.patch + patch -p1 -i "${srcdir}/flam3-3.0.1-libpng15.patch" } build() { diff --git a/community/gitg/PKGBUILD b/community/gitg/PKGBUILD index 68d902e4f..ab5e6a1c4 100644 --- a/community/gitg/PKGBUILD +++ b/community/gitg/PKGBUILD @@ -1,17 +1,15 @@ -# $Id: PKGBUILD 88690 2013-04-21 22:17:07Z heftig $ +# $Id: PKGBUILD 99215 2013-10-25 20:50:04Z eric $ # Maintainer: Eric Bélanger pkgname=gitg pkgver=0.2.7 -pkgrel=1 +pkgrel=2 pkgdesc='A GIT repository viewer based on GTK+' arch=('i686' 'x86_64') url='https://git.gnome.org/browse/gitg/' license=('GPL') -depends=('gtksourceview3' 'git' 'desktop-file-utils' 'gsettings-desktop-schemas' \ - 'hicolor-icon-theme') +depends=('gtksourceview3' 'git' 'desktop-file-utils' 'gsettings-desktop-schemas') makedepends=('intltool') -options=('!libtool') install=gitg.install source=(ftp://ftp.gnome.org/pub/GNOME/sources/gitg/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) sha1sums=('7b1428819666e4797d64dc94bb1624d5e7b75e6a') @@ -19,7 +17,7 @@ sha1sums=('7b1428819666e4797d64dc94bb1624d5e7b75e6a') build() { cd ${pkgname}-${pkgver} ./configure --prefix=/usr - make + make WARN_CFLAGS="-Wall" } package() { diff --git a/community/gmtk/PKGBUILD b/community/gmtk/PKGBUILD index 51869c8d1..687bcbe87 100644 --- a/community/gmtk/PKGBUILD +++ b/community/gmtk/PKGBUILD @@ -1,16 +1,15 @@ -# $Id: PKGBUILD 92205 2013-06-02 18:41:20Z bpiotrowski $ +# $Id: PKGBUILD 99144 2013-10-25 02:20:05Z allan $ # Maintainer: Lukas Fleischer pkgname=gmtk pkgver=1.0.8 -pkgrel=1 +pkgrel=2 pkgdesc='Common functions for gnome-mplayer and gecko-mediaplayer.' arch=('i686' 'x86_64') url='http://gmtk.googlecode.com/' license=('GPL') depends=('glib2' 'gtk3' 'dconf') makedepends=('intltool' 'pkg-config') -options=(!libtool) source=("http://gmtk.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") md5sums=('ee8ab99f3ac2e0071c99a35e4847bba5') diff --git a/community/google-glog/PKGBUILD b/community/google-glog/PKGBUILD index 7ca4be213..a96367afc 100644 --- a/community/google-glog/PKGBUILD +++ b/community/google-glog/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 83436 2013-02-01 07:03:30Z fyan $ +# $Id: PKGBUILD 99149 2013-10-25 05:03:45Z fyan $ # Maintainer: Felix Yan # Contributor: Ian Yang pkgname=google-glog pkgver=0.3.3 -pkgrel=1 +pkgrel=2 pkgdesc="Logging library for C++" arch=('i686' 'x86_64') license=('custom:BSD3') diff --git a/community/gpac/PKGBUILD b/community/gpac/PKGBUILD index b3ac37c1a..c5815e61a 100644 --- a/community/gpac/PKGBUILD +++ b/community/gpac/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 94884 2013-08-01 06:54:59Z bpiotrowski $ +# $Id: PKGBUILD 99218 2013-10-25 20:55:07Z eric $ # Maintainer: Eric Bélanger pkgname=gpac @@ -12,7 +12,7 @@ depends=('ffmpeg' 'libjpeg' 'libpng' 'glu' 'libxv') makedepends=('jack' 'a52dec' 'freetype2' 'faad2' 'libmad' 'mesa') optdepends=('jack: for jack support' 'a52dec: for A52 support' 'faad2: for AAC support' 'libmad: for mp3 support') -options=('!makeflags') +options=('staticlibs' '!makeflags') source=(ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig} gpac-ffmpeg.patch) sha1sums=('6ba29de672b6e4260e510e0e16d5bc0ab09cabb6' 'SKIP' diff --git a/community/haskell-ghc-paths/PKGBUILD b/community/haskell-ghc-paths/PKGBUILD index ffea0e7d4..cab7251c1 100644 --- a/community/haskell-ghc-paths/PKGBUILD +++ b/community/haskell-ghc-paths/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 68685 2012-03-31 16:54:07Z arodseth $ +# $Id: PKGBUILD 99206 2013-10-25 16:17:55Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: Arch Haskell Team pkgname=haskell-ghc-paths pkgver=0.1.0.9 -pkgrel=2 +pkgrel=3 pkgdesc="Knowledge of GHC's installation directories" url='http://hackage.haskell.org/package/ghc-paths' license=('custom:BSD3') @@ -12,10 +12,11 @@ arch=('x86_64' 'i686') depends=('ghc=7.6.3-1') source=("http://hackage.haskell.org/packages/archive/ghc-paths/$pkgver/ghc-paths-$pkgver.tar.gz") install="$pkgname.install" +options=('staticlibs') sha256sums=('afa68fb86123004c37c1dc354286af2d87a9dcfb12ddcb80e8bd0cd55bc87945') build() { - cd "$srcdir/ghc-paths-$pkgver" + cd "ghc-paths-$pkgver" runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ --prefix=/usr --docdir="/usr/share/doc/$pkgname" \ @@ -28,7 +29,7 @@ build() { } package() { - cd "$srcdir/ghc-paths-$pkgver" + cd "ghc-paths-$pkgver" install -Dm 744 register.sh \ "$pkgdir/usr/share/haskell/$pkgname/register.sh" diff --git a/community/haveged/PKGBUILD b/community/haveged/PKGBUILD index 09d1ccf4b..dfe3b31e2 100644 --- a/community/haveged/PKGBUILD +++ b/community/haveged/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 92888 2013-06-18 08:41:07Z bpiotrowski $ +# $Id: PKGBUILD 99131 2013-10-25 01:13:09Z bisson $ # Maintainer: BartÅ‚omiej Piotrowski # Contributor: kfgz # Contributor: pootzko @@ -6,7 +6,7 @@ pkgname=haveged pkgver=1.7.c _pkgver=${pkgver/.c/c} -pkgrel=1 +pkgrel=2 pkgdesc='Entropy harvesting daemon using CPU timings' arch=('i686' 'x86_64') url='http://www.issihosts.com/haveged' diff --git a/community/jbig2dec/PKGBUILD b/community/jbig2dec/PKGBUILD index 9ea0595f9..62656dbcd 100644 --- a/community/jbig2dec/PKGBUILD +++ b/community/jbig2dec/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 90049 2013-05-06 19:37:57Z foutrelis $ +# $Id: PKGBUILD 99133 2013-10-25 01:14:19Z bisson $ # Maintainer: BartÅ‚omiej Piotrowski # Contributor: Stefan Husmann pkgname=jbig2dec pkgver=0.11 -pkgrel=6 +pkgrel=7 pkgdesc="decoder implementation of the JBIG2 image compression format" arch=('x86_64' 'i686') url="http://jbig2dec.sourceforge.net/" diff --git a/community/kyotocabinet/PKGBUILD b/community/kyotocabinet/PKGBUILD index bb08be242..b7eb075d0 100644 --- a/community/kyotocabinet/PKGBUILD +++ b/community/kyotocabinet/PKGBUILD @@ -1,28 +1,27 @@ -# $Id: PKGBUILD 90164 2013-05-07 16:07:18Z fyan $ +# $Id: PKGBUILD 99150 2013-10-25 05:03:47Z fyan $ # Maintainer: Felix Yan # Contributor: Alexander Duscheleit # Contributor: Joaquim Pedro (osmano807) pkgname=kyotocabinet pkgver=1.2.76 -pkgrel=3 +pkgrel=4 pkgdesc="a modern implementation of DBM in C++" arch=('i686' 'x86_64') url="http://fallabs.com/kyotocabinet" license=('LGPL3') -makedepends=('gcc' 'make' 'pkgconfig' 'zlib') depends=('zlib' 'gcc-libs') source=("http://fallabs.com/${pkgname}/pkg/${pkgname}-${pkgver}.tar.gz") build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver ./configure --prefix=/usr --disable-opt make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make install DESTDIR="$pkgdir/" } diff --git a/community/libdbusmenu/PKGBUILD b/community/libdbusmenu/PKGBUILD new file mode 100644 index 000000000..ca900239e --- /dev/null +++ b/community/libdbusmenu/PKGBUILD @@ -0,0 +1,46 @@ +# $Id: PKGBUILD 99160 2013-10-25 08:29:02Z alucryd $ +# Maintainer: Maxime Gauduin +# Contributor: Balló György +# Contributor: Branchini Massimo # Contributor: namelessjon # Contributor: Alessio Sergi pkgname=libsodium -pkgver=0.4.3 +pkgver=0.4.5 pkgrel=1 pkgdesc="P(ortable|ackageable) NaCl-based crypto library" arch=('i686' 'x86_64') url="https://github.com/jedisct1/libsodium" license=('custom:ISC') depends=('glibc') -options=('!libtool') source=(http://download.dnscrypt.org/$pkgname/releases/$pkgname-${pkgver}.tar.gz) build() { @@ -35,4 +34,4 @@ package() { } # vim:set ts=2 sw=2 et: -sha512sums=('479016922fa522409eac80e65046129b4ea3a34642483e6f56331c430c9cb21cf69ec4650a6717560283096d1416bf15035dbf56eba3c35259ddfc8feccda331') +sha512sums=('8c446b62c0400ed972f11c399a03f334cead80fc48513c4b5eba6f569725e28cf98d71cd6d46da5602fc553719a18e74598008c311fe02b2f05b61c7bc72525b') diff --git a/community/liteide/PKGBUILD b/community/liteide/PKGBUILD index 6d5a7c483..d94bb5526 100644 --- a/community/liteide/PKGBUILD +++ b/community/liteide/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 96319 2013-08-25 13:45:50Z arodseth $ +# $Id: PKGBUILD 99195 2013-10-25 12:43:33Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: spambanane # Contributor: Matteo pkgname=liteide pkgver=19 -pkgrel=3 +pkgrel=4 pkgdesc='IDE for editing and building projects written in the Go programming language ("golangide")' license=('LGPL') arch=('x86_64' 'i686') url='https://github.com/visualfc/liteide' -depends=('go' 'libpng12' 'qt5-webkit') +depends=('go' 'qt5-webkit') replaces=('golangide') conflicts=('golangide') makedepends=('gendesk') @@ -23,15 +23,13 @@ sha256sums=('182694341940878cf5df4f083a750659bffc97eb4ae517410e157bebc14f97df' '5d6f05b072586c31e3a4a08ea2d7332dd0a78f5db6b2d088fb76e8cb032672f0') prepare() { - cd "$srcdir" - gendesk -n --name 'Golang IDE' --pkgname "$pkgname" --pkgdesc "$pkgdesc" cd "liteide-x$pkgver/build" chmod +x build_linux.sh } build() { - cd "$srcdir/liteide-x$pkgver/build" + cd "liteide-x$pkgver/build" QTDIR=/usr ./build_linux.sh @@ -42,7 +40,7 @@ build() { } package() { - cd "$srcdir/liteide-x$pkgver/build/liteide" + cd "liteide-x$pkgver/build/liteide" msg2 'Creating directories...' mkdir -p \ diff --git a/community/ming/PKGBUILD b/community/ming/PKGBUILD index 87f4707cf..f9ee37a12 100644 --- a/community/ming/PKGBUILD +++ b/community/ming/PKGBUILD @@ -3,14 +3,14 @@ pkgname=ming pkgver=0.4.5 -pkgrel=1 +pkgrel=2 pkgdesc="SWF output library" arch=('i686' 'x86_64') url="http://www.libming.net/" license=('GPL' 'LGPL') depends=('freetype2' 'libpng' 'flex') makedepends=('bison' 'pkg-config' 'python2') -options=('!libtool' '!emptydirs') +options=('!emptydirs') source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2) md5sums=('73bcbcb837f3872ef1a936c539a2513c') diff --git a/community/mongodb/PKGBUILD b/community/mongodb/PKGBUILD index 3dc14a894..d8998635f 100644 --- a/community/mongodb/PKGBUILD +++ b/community/mongodb/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 96182 2013-08-21 06:12:24Z fyan $ +# $Id: PKGBUILD 99147 2013-10-25 05:02:21Z fyan $ # Maintainer: Felix Yan # Contributor: Sven-Hendrik Haase # Contributor: Thomas Dziedzic < gostrc at gmail > @@ -6,13 +6,13 @@ # Contributor: Alec Thomas pkgname=mongodb -pkgver=2.4.6 +pkgver=2.4.7 pkgrel=1 pkgdesc='A high-performance, open source, schema-free document-oriented database' arch=('i686' 'x86_64') url='http://www.mongodb.org' license=('AGPL3') -depends=('boost-libs' 'pcre' 'snappy' 'openssl' 'gperftools') # 'v8') +depends=('boost-libs' 'pcre' 'snappy' 'openssl' 'gperftools') makedepends=('scons' 'boost' 'readline' 'ncurses' 'libpcap') # 'cyrus-sasl') checkdepends=('python2-pymongo') optdepends=('libpcap: needed for mongosniff') @@ -37,8 +37,8 @@ build() { --use-system-tcmalloc \ --ssl \ --sharedclient - # --use-system-v8 # --use-sasl-client + # --use-system-v8 } < # Contributor: Eivind Uggedal pkgname=mpv pkgver=0.2.1 -pkgrel=1 +pkgrel=2 pkgdesc='Video player based on MPlayer/mplayer2' arch=('i686' 'x86_64') license=('GPL') diff --git a/community/mythtv/PKGBUILD b/community/mythtv/PKGBUILD index a053fffa9..669c837ad 100644 --- a/community/mythtv/PKGBUILD +++ b/community/mythtv/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 99069 2013-10-24 02:39:07Z jconder $ +# $Id: PKGBUILD 99201 2013-10-25 13:44:56Z giovanni $ # Maintainer: Jonathan Conder # Contributor: Giovanni Scafora # Contributor: Juergen Hoetzel @@ -7,7 +7,7 @@ pkgname=mythtv pkgver=0.27 -pkgrel=2 +pkgrel=3 epoch=1 pkgdesc="A Homebrew PVR project" arch=('i686' 'x86_64') @@ -27,10 +27,10 @@ conflicts=('myththemes' 'mythplugins-mythvideo') replaces=('myththemes' 'mythplugins-mythvideo') backup=() install='mythtv.install' -source=("http://www.$pkgname.org/download/$pkgname/$pkgver" +source=("$pkgname-$pkgver.tar.gz::http://www.$pkgname.org/download/$pkgname/$pkgver" 'mythbackend.service' 'http://code.mythtv.org/trac/raw-attachment/ticket/11338/libcec-2-support.2.patch') -sha256sums=('670b378e379df05a4f2ac28cc3cb2578587b42cb03710e0b230b75d692f8e2b8' +sha256sums=('49789de705be73275325b1a4984b727cf8284fdc4ae6b041ad152857c830dc46' 'f628f44164ce773ae54d320fb2f65353cacf9deec16981e4e56316ac33000a2f' '8270407c2074b305e0c32151f89c84f6bf980a32665a2da8e4727405fa3911f3') diff --git a/community/opencc/PKGBUILD b/community/opencc/PKGBUILD index 01375c5e2..3a88ab6b4 100644 --- a/community/opencc/PKGBUILD +++ b/community/opencc/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 95956 2013-08-19 06:36:39Z fyan $ +# $Id: PKGBUILD 99152 2013-10-25 05:05:17Z fyan $ # Maintainer: Felix Yan pkgbase=opencc pkgname=(opencc opencc-doc) pkgver=0.4.3 -pkgrel=1 +pkgrel=2 url="http://code.google.com/p/opencc/" arch=('i686' 'x86_64') license=('Apache') @@ -12,7 +12,7 @@ makedepends=('cmake' 'doxygen') source=("http://opencc.googlecode.com/files/${pkgbase}-${pkgver}.tar.gz") build() { - cd "$srcdir/${pkgbase}-${pkgver}" + cd ${pkgbase}-${pkgver} cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DBUILD_DOCUMENTATION:BOOL=ON make } @@ -21,7 +21,7 @@ package_opencc() { pkgdesc="Library for Open Chinese Convert" depends=('glibc') - cd "$srcdir/${pkgbase}-${pkgver}" + cd ${pkgbase}-${pkgver} make DESTDIR="${pkgdir}" install # Remove docs - install in splitted package @@ -31,7 +31,7 @@ package_opencc() { package_opencc-doc() { pkgdesc="Documentation for Library for Open Chinese Convert" - cd "$srcdir/${pkgbase}-${pkgver}/doc" + cd ${pkgbase}-${pkgver}/doc make DESTDIR="${pkgdir}" install # Remove manpages - already installed in main package diff --git a/community/pdflib-lite/PKGBUILD b/community/pdflib-lite/PKGBUILD index f99c4f350..73e4a997c 100644 --- a/community/pdflib-lite/PKGBUILD +++ b/community/pdflib-lite/PKGBUILD @@ -5,7 +5,7 @@ pkgname=pdflib-lite _pkgnamecaps=PDFlib-Lite pkgver=7.0.5p3 _basepkgver=${pkgver/p*/} -pkgrel=2 +pkgrel=3 pkgdesc="PDF manipulation library." url="http://www.pdflib.com" arch=(i686 x86_64) diff --git a/community/percona-server/PKGBUILD b/community/percona-server/PKGBUILD index f201be457..1ad8e2d03 100644 --- a/community/percona-server/PKGBUILD +++ b/community/percona-server/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 98649 2013-10-16 12:59:04Z mtorromeo $ +# $Id: PKGBUILD 99185 2013-10-25 10:38:59Z mtorromeo $ # Maintainer: Massimiliano Torromeo pkgname=percona-server -pkgver=5.6.13_rel61.0 +pkgver=5.6.14_rel62.0 pkgrel=1 pkgdesc="A backwards-compatible drop-in replacement for MySQL that provides improved performance, diagnostics and instrumentation" arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ url="http://www.percona.com/software/percona-server/" options=('!libtool' 'emptydirs') backup=('etc/mysql/my.cnf') install=percona.install -source=("http://www.percona.com/downloads/Percona-Server-${pkgver%.*_*}/Percona-Server-${pkgver/_/-}/source/Percona-Server-${pkgver/_/-}.tar.gz" +source=("http://www.percona.com/downloads/Percona-Server-${pkgver%.*_*}/Percona-Server-${pkgver/_/-}/release-${pkgver/_rel/-}/483/source/Percona-Server-${pkgver/_/-}.tar.gz" 'mysqld-post.sh' 'mysqld.service' 'mysqld-tmpfile.conf' @@ -102,9 +102,9 @@ package() { rm "${pkgdir}"/usr/share/man/man1/mysql-test-run.pl.1 } -sha256sums=('6fa6c240f08c3aedacbefe31559128d239c7f18089c5bba64136698bd64910c8' +sha256sums=('69edc04585e72ac94c32598221c0762704e75190c2abe4fa680ad42ce202e280' '82a241d9fa4032187a26597d044e94ba810b209b53a7ce14bb6eb92555993a48' '9bc66470f3f80534c0bb62f9f8325ccf60b164f421f74ad74a963f065d7b1869' 'badf6a701d9dc6ea3b4ddca26cb0f42b6236432ccdbc14c64962147802594a60' '1039e232a7778544b00eb215c93bb06c588c95c2fd49cfb162dc50eb4dfbf729' - '89aab4eafa97cd0e40b61871a472fd90b4372e69c7af0d86145e5a7de9c8d4ee') + 'd36c807f085b6051cc8fddb2abc5a1939be809650f1cfefc8a87731978958929') diff --git a/community/percona-server/mysql56-bison3.patch b/community/percona-server/mysql56-bison3.patch index 79c6b5c28..b9767cf71 100644 --- a/community/percona-server/mysql56-bison3.patch +++ b/community/percona-server/mysql56-bison3.patch @@ -1,5 +1,5 @@ diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc -index 1bb7747..009780f 100644 +index 75440c5..af50807 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -34,7 +34,7 @@ @@ -11,7 +11,7 @@ index 1bb7747..009780f 100644 /* We are using pointer to this variable for distinguishing between assignment -@@ -905,9 +905,8 @@ bool consume_comment(Lex_input_stream *lip, int remaining_recursions_permitted) +@@ -906,9 +906,8 @@ bool consume_comment(Lex_input_stream *lip, int remaining_recursions_permitted) (which can't be followed by a signed number) */ @@ -22,7 +22,7 @@ index 1bb7747..009780f 100644 Lex_input_stream *lip= & thd->m_parser_state->m_lip; YYSTYPE *yylval=(YYSTYPE*) arg; int token; -@@ -926,7 +925,7 @@ int MYSQLlex(void *arg, void *yythd) +@@ -927,7 +926,7 @@ int MYSQLlex(void *arg, void *yythd) return token; } @@ -31,7 +31,7 @@ index 1bb7747..009780f 100644 switch(token) { case WITH: -@@ -937,7 +936,7 @@ int MYSQLlex(void *arg, void *yythd) +@@ -938,7 +937,7 @@ int MYSQLlex(void *arg, void *yythd) to transform the grammar into a LALR(1) grammar, which sql_yacc.yy can process. */ @@ -40,7 +40,7 @@ index 1bb7747..009780f 100644 switch(token) { case CUBE_SYM: lip->m_digest_psi= MYSQL_ADD_TOKEN(lip->m_digest_psi, WITH_CUBE_SYM, -@@ -966,14 +965,13 @@ int MYSQLlex(void *arg, void *yythd) +@@ -967,14 +966,13 @@ int MYSQLlex(void *arg, void *yythd) return token; } @@ -57,10 +57,10 @@ index 1bb7747..009780f 100644 LEX *lex= thd->lex; YYSTYPE *yylval=(YYSTYPE*) arg; diff --git a/sql/sql_lex.h b/sql/sql_lex.h -index b7030e4..e2d3a60 100644 +index 42a5e77..602f52a 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h -@@ -2845,7 +2845,7 @@ extern void lex_init(void); +@@ -2857,7 +2857,7 @@ extern void lex_init(void); extern void lex_free(void); extern void lex_start(THD *thd); extern void lex_end(LEX *lex); @@ -70,10 +70,10 @@ index b7030e4..e2d3a60 100644 extern void trim_whitespace(const CHARSET_INFO *cs, LEX_STRING *str); diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc -index bcf5be1..d58838b 100644 +index c88dd69..fc30370 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc -@@ -8497,7 +8497,7 @@ bool check_host_name(LEX_STRING *str) +@@ -8575,7 +8575,7 @@ bool check_host_name(LEX_STRING *str) } @@ -83,7 +83,7 @@ index bcf5be1..d58838b 100644 /** diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy -index 0c9e81d..765e389 100644 +index e640073..f2c7bfb 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -22,21 +22,14 @@ @@ -154,7 +154,7 @@ index 0c9e81d..765e389 100644 /* Currently there are 161 shift/reduce conflicts. We should not introduce new conflicts any more. -@@ -1971,7 +1965,6 @@ rule: <-- starts at col 1 +@@ -1972,7 +1966,6 @@ rule: <-- starts at col 1 query: END_OF_INPUT { @@ -162,7 +162,7 @@ index 0c9e81d..765e389 100644 if (!thd->bootstrap && (!(thd->lex->select_lex.options & OPTION_FOUND_COMMENT))) { -@@ -1985,7 +1978,7 @@ query: +@@ -1986,7 +1979,7 @@ query: { Lex_input_stream *lip = YYLIP; @@ -171,7 +171,7 @@ index 0c9e81d..765e389 100644 lip->multi_statements && ! lip->eof()) { -@@ -2082,7 +2075,6 @@ statement: +@@ -2083,7 +2076,6 @@ statement: deallocate: deallocate_or_drop PREPARE_SYM ident { @@ -179,7 +179,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; lex->sql_command= SQLCOM_DEALLOCATE_PREPARE; lex->prepared_stmt_name= $3; -@@ -2097,7 +2089,6 @@ deallocate_or_drop: +@@ -2098,7 +2090,6 @@ deallocate_or_drop: prepare: PREPARE_SYM ident FROM prepare_src { @@ -187,7 +187,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; lex->sql_command= SQLCOM_PREPARE; lex->prepared_stmt_name= $2; -@@ -2107,14 +2098,12 @@ prepare: +@@ -2118,14 +2109,12 @@ prepare: prepare_src: TEXT_STRING_sys { @@ -202,7 +202,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; lex->prepared_stmt_code= $2; lex->prepared_stmt_code_is_varref= TRUE; -@@ -2124,7 +2113,6 @@ prepare_src: +@@ -2135,7 +2124,6 @@ prepare_src: execute: EXECUTE_SYM ident { @@ -210,7 +210,16 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; lex->sql_command= SQLCOM_EXECUTE; lex->prepared_stmt_name= $2; -@@ -2291,7 +2279,7 @@ master_def: +@@ -2245,7 +2233,7 @@ master_def: + { + Lex_input_stream *lip= YYLIP; + const char *start= lip->get_tok_start(); +- const char *msg= YYTHD->strmake(start, lip->get_ptr() - start); ++ const char *msg= thd->strmake(start, lip->get_ptr() - start); + my_error(ER_MASTER_DELAY_VALUE_OUT_OF_RANGE, MYF(0), + msg, MASTER_DELAY_MAX); + } +@@ -2305,7 +2293,7 @@ master_def: } if (Lex->mi.heartbeat_period > slave_net_timeout) { @@ -219,7 +228,7 @@ index 0c9e81d..765e389 100644 ER_SLAVE_HEARTBEAT_VALUE_OUT_OF_RANGE_MAX, ER(ER_SLAVE_HEARTBEAT_VALUE_OUT_OF_RANGE_MAX)); } -@@ -2299,7 +2287,7 @@ master_def: +@@ -2313,7 +2301,7 @@ master_def: { if (Lex->mi.heartbeat_period != 0.0) { @@ -228,7 +237,7 @@ index 0c9e81d..765e389 100644 ER_SLAVE_HEARTBEAT_VALUE_OUT_OF_RANGE_MIN, ER(ER_SLAVE_HEARTBEAT_VALUE_OUT_OF_RANGE_MIN)); Lex->mi.heartbeat_period= 0.0; -@@ -2382,7 +2370,6 @@ master_file_def: +@@ -2396,7 +2384,6 @@ master_file_def: create: CREATE opt_table_options TABLE_SYM opt_if_not_exists table_ident { @@ -236,7 +245,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; lex->sql_command= SQLCOM_CREATE_TABLE; if (!lex->select_lex.add_table_to_list(thd, $5, NULL, -@@ -2408,7 +2395,6 @@ create: +@@ -2422,7 +2409,6 @@ create: } create2 { @@ -244,7 +253,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; lex->current_select= &lex->select_lex; if ((lex->create_info.used_fields & HA_CREATE_USED_ENGINE) && -@@ -2417,7 +2403,7 @@ create: +@@ -2431,7 +2417,7 @@ create: lex->create_info.db_type= lex->create_info.options & HA_LEX_CREATE_TMP_TABLE ? ha_default_temp_handlerton(thd) : ha_default_handlerton(thd); @@ -253,7 +262,7 @@ index 0c9e81d..765e389 100644 ER_WARN_USING_OTHER_HANDLER, ER(ER_WARN_USING_OTHER_HANDLER), ha_resolve_storage_engine_name(lex->create_info.db_type), -@@ -2551,7 +2537,6 @@ server_option: +@@ -2565,7 +2551,6 @@ server_option: event_tail: remember_name EVENT_SYM opt_if_not_exists sp_name { @@ -261,7 +270,7 @@ index 0c9e81d..765e389 100644 LEX *lex=Lex; lex->stmt_definition_begin= $1; -@@ -2618,7 +2603,7 @@ opt_ev_status: +@@ -2632,7 +2617,7 @@ opt_ev_status: ev_starts: /* empty */ { @@ -270,7 +279,7 @@ index 0c9e81d..765e389 100644 if (item == NULL) MYSQL_YYABORT; Lex->event_parse_data->item_starts= item; -@@ -2668,7 +2653,6 @@ opt_ev_comment: +@@ -2682,7 +2667,6 @@ opt_ev_comment: ev_sql_stmt: { @@ -278,7 +287,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; Lex_input_stream *lip= YYLIP; -@@ -2711,7 +2695,6 @@ ev_sql_stmt: +@@ -2725,7 +2709,6 @@ ev_sql_stmt: } ev_sql_stmt_inner { @@ -286,7 +295,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; sp_finish_parsing(thd); -@@ -2765,11 +2748,10 @@ sp_name: +@@ -2779,11 +2762,10 @@ sp_name: $$= new sp_name($1, $3, true); if ($$ == NULL) MYSQL_YYABORT; @@ -299,7 +308,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; LEX_STRING db; if (sp_check_name(&$1)) -@@ -2839,7 +2821,7 @@ call: +@@ -2853,7 +2835,7 @@ call: lex->sql_command= SQLCOM_CALL; lex->spname= $2; lex->value_list.empty(); @@ -308,7 +317,7 @@ index 0c9e81d..765e389 100644 } opt_sp_cparam_list {} ; -@@ -2900,7 +2882,6 @@ sp_init_param: +@@ -2914,7 +2896,6 @@ sp_init_param: sp_fdparam: ident sp_init_param type_with_opt_collate { @@ -316,7 +325,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; sp_head *sp= lex->sphead; sp_pcontext *pctx= lex->get_sp_current_parsing_ctx(); -@@ -2941,7 +2922,6 @@ sp_pdparams: +@@ -2955,7 +2936,6 @@ sp_pdparams: sp_pdparam: sp_opt_inout sp_init_param ident type_with_opt_collate { @@ -324,7 +333,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; sp_head *sp= lex->sphead; sp_pcontext *pctx= lex->get_sp_current_parsing_ctx(); -@@ -3017,7 +2997,6 @@ sp_decls: +@@ -3031,7 +3011,6 @@ sp_decls: sp_decl: DECLARE_SYM sp_decl_idents { @@ -332,7 +341,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; sp_head *sp= lex->sphead; sp_pcontext *pctx= lex->get_sp_current_parsing_ctx(); -@@ -3028,7 +3007,6 @@ sp_decl: +@@ -3042,7 +3021,6 @@ sp_decl: type_with_opt_collate sp_opt_default { @@ -340,7 +349,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; sp_head *sp= lex->sphead; sp_pcontext *pctx= lex->get_sp_current_parsing_ctx(); -@@ -3101,7 +3079,6 @@ sp_decl: +@@ -3115,7 +3093,6 @@ sp_decl: } | DECLARE_SYM ident CONDITION_SYM FOR_SYM sp_cond { @@ -348,7 +357,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; sp_pcontext *pctx= lex->get_sp_current_parsing_ctx(); -@@ -3117,7 +3094,6 @@ sp_decl: +@@ -3131,7 +3108,6 @@ sp_decl: } | DECLARE_SYM sp_handler_type HANDLER_SYM FOR_SYM { @@ -356,7 +365,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; sp_head *sp= lex->sphead; -@@ -3157,7 +3133,6 @@ sp_decl: +@@ -3171,7 +3147,6 @@ sp_decl: } sp_hcond_list sp_proc_stmt { @@ -364,7 +373,7 @@ index 0c9e81d..765e389 100644 LEX *lex= Lex; sp_head *sp= lex->sphead; sp_pcontext *pctx= lex->get_sp_current_parsing_ctx(); -@@ -3191,7 +3166,6 @@ sp_decl: +@@ -3205,7 +3180,6 @@ sp_decl: } | DECLARE_SYM ident CURSOR_SYM FOR_SYM { @@ -372,7 +381,7 @@ index 0c9e81d..765e389 100644 LEX *lex= Lex; sp_head *sp= lex->sphead; -@@ -3200,7 +3174,6 @@ sp_decl: +@@ -3214,7 +3188,6 @@ sp_decl: } select { @@ -380,7 +389,7 @@ index 0c9e81d..765e389 100644 LEX *cursor_lex= Lex; sp_head *sp= cursor_lex->sphead; -@@ -3305,7 +3278,7 @@ sp_cond: +@@ -3319,7 +3292,7 @@ sp_cond: my_error(ER_WRONG_VALUE, MYF(0), "CONDITION", "0"); MYSQL_YYABORT; } @@ -389,7 +398,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; } -@@ -3328,7 +3301,7 @@ sqlstate: +@@ -3342,7 +3315,7 @@ sqlstate: my_error(ER_SP_BAD_SQLSTATE, MYF(0), $3.str); MYSQL_YYABORT; } @@ -398,7 +407,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; } -@@ -3359,19 +3332,19 @@ sp_hcond: +@@ -3373,19 +3346,19 @@ sp_hcond: } | SQLWARNING_SYM /* SQLSTATEs 01??? */ { @@ -421,7 +430,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; } -@@ -3380,7 +3353,6 @@ sp_hcond: +@@ -3394,7 +3367,6 @@ sp_hcond: signal_stmt: SIGNAL_SYM signal_value opt_set_signal_information { @@ -429,7 +438,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; Yacc_state *state= & thd->m_parser_state->m_yacc; -@@ -3433,7 +3405,7 @@ opt_signal_value: +@@ -3447,7 +3419,7 @@ opt_signal_value: opt_set_signal_information: /* empty */ { @@ -438,7 +447,7 @@ index 0c9e81d..765e389 100644 } | SET signal_information_item_list ; -@@ -3442,7 +3414,7 @@ signal_information_item_list: +@@ -3456,7 +3428,7 @@ signal_information_item_list: signal_condition_information_item_name EQ signal_allowed_expr { Set_signal_information *info; @@ -447,7 +456,7 @@ index 0c9e81d..765e389 100644 int index= (int) $1; info->clear(); info->m_item[index]= $3; -@@ -3451,7 +3423,7 @@ signal_information_item_list: +@@ -3465,7 +3437,7 @@ signal_information_item_list: signal_condition_information_item_name EQ signal_allowed_expr { Set_signal_information *info; @@ -456,7 +465,7 @@ index 0c9e81d..765e389 100644 int index= (int) $3; if (info->m_item[index] != NULL) { -@@ -3522,7 +3494,6 @@ signal_condition_information_item_name: +@@ -3536,7 +3508,6 @@ signal_condition_information_item_name: resignal_stmt: RESIGNAL_SYM opt_signal_value opt_set_signal_information { @@ -464,7 +473,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; Yacc_state *state= & thd->m_parser_state->m_yacc; -@@ -3543,7 +3514,7 @@ get_diagnostics: +@@ -3557,7 +3528,7 @@ get_diagnostics: info->set_which_da($2); Lex->sql_command= SQLCOM_GET_DIAGNOSTICS; @@ -473,7 +482,7 @@ index 0c9e81d..765e389 100644 if (Lex->m_sql_cmd == NULL) MYSQL_YYABORT; -@@ -3560,13 +3531,13 @@ which_area: +@@ -3574,13 +3545,13 @@ which_area: diagnostics_information: statement_information { @@ -489,7 +498,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; } -@@ -3575,7 +3546,7 @@ diagnostics_information: +@@ -3589,7 +3560,7 @@ diagnostics_information: statement_information: statement_information_item { @@ -498,7 +507,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL || $$->push_back($1)) MYSQL_YYABORT; } -@@ -3590,7 +3561,7 @@ statement_information: +@@ -3604,7 +3575,7 @@ statement_information: statement_information_item: simple_target_specification EQ statement_information_item_name { @@ -507,7 +516,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; } -@@ -3598,7 +3569,6 @@ statement_information_item: +@@ -3612,7 +3583,6 @@ statement_information_item: simple_target_specification: ident { @@ -515,7 +524,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; Lex_input_stream *lip= YYLIP; sp_head *sp= lex->sphead; -@@ -3627,7 +3597,7 @@ simple_target_specification: +@@ -3641,7 +3611,7 @@ simple_target_specification: } | '@' ident_or_text { @@ -524,7 +533,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; } -@@ -3652,7 +3622,7 @@ condition_number: +@@ -3666,7 +3636,7 @@ condition_number: condition_information: condition_information_item { @@ -533,7 +542,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL || $$->push_back($1)) MYSQL_YYABORT; } -@@ -3667,7 +3637,7 @@ condition_information: +@@ -3681,7 +3651,7 @@ condition_information: condition_information_item: simple_target_specification EQ condition_information_item_name { @@ -542,7 +551,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; } -@@ -3706,7 +3676,6 @@ sp_decl_idents: +@@ -3720,7 +3690,6 @@ sp_decl_idents: { /* NOTE: field definition is filled in sp_decl section. */ @@ -550,7 +559,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; sp_pcontext *pctx= lex->get_sp_current_parsing_ctx(); -@@ -3726,7 +3695,6 @@ sp_decl_idents: +@@ -3740,7 +3709,6 @@ sp_decl_idents: { /* NOTE: field definition is filled in sp_decl section. */ @@ -558,7 +567,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; sp_pcontext *pctx= lex->get_sp_current_parsing_ctx(); -@@ -3782,7 +3750,6 @@ sp_proc_stmt_if: +@@ -3796,7 +3764,6 @@ sp_proc_stmt_if: sp_proc_stmt_statement: { @@ -566,7 +575,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; Lex_input_stream *lip= YYLIP; sp_head *sp= lex->sphead; -@@ -3792,7 +3759,6 @@ sp_proc_stmt_statement: +@@ -3806,7 +3773,6 @@ sp_proc_stmt_statement: } statement { @@ -574,7 +583,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; sp_head *sp= lex->sphead; -@@ -3839,7 +3805,6 @@ sp_proc_stmt_statement: +@@ -3853,7 +3819,6 @@ sp_proc_stmt_statement: sp_proc_stmt_return: RETURN_SYM { @@ -582,7 +591,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; sp_head *sp= lex->sphead; -@@ -3849,7 +3814,6 @@ sp_proc_stmt_return: +@@ -3863,7 +3828,6 @@ sp_proc_stmt_return: } expr { @@ -590,7 +599,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; sp_head *sp= lex->sphead; -@@ -3895,7 +3859,6 @@ sp_proc_stmt_return: +@@ -3909,7 +3873,6 @@ sp_proc_stmt_return: sp_proc_stmt_unlabeled: { /* Unlabeled controls get a secret label. */ @@ -598,7 +607,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; sp_head *sp= lex->sphead; sp_pcontext *pctx= lex->get_sp_current_parsing_ctx(); -@@ -3918,7 +3881,6 @@ sp_proc_stmt_unlabeled: +@@ -3932,7 +3895,6 @@ sp_proc_stmt_unlabeled: sp_proc_stmt_leave: LEAVE_SYM label_ident { @@ -606,7 +615,7 @@ index 0c9e81d..765e389 100644 LEX *lex= Lex; sp_head *sp = lex->sphead; sp_pcontext *pctx= lex->get_sp_current_parsing_ctx(); -@@ -3977,7 +3939,6 @@ sp_proc_stmt_leave: +@@ -3991,7 +3953,6 @@ sp_proc_stmt_leave: sp_proc_stmt_iterate: ITERATE_SYM label_ident { @@ -614,7 +623,7 @@ index 0c9e81d..765e389 100644 LEX *lex= Lex; sp_head *sp= lex->sphead; sp_pcontext *pctx= lex->get_sp_current_parsing_ctx(); -@@ -4027,7 +3988,6 @@ sp_proc_stmt_iterate: +@@ -4041,7 +4002,6 @@ sp_proc_stmt_iterate: sp_proc_stmt_open: OPEN_SYM ident { @@ -622,7 +631,7 @@ index 0c9e81d..765e389 100644 LEX *lex= Lex; sp_head *sp= lex->sphead; sp_pcontext *pctx= lex->get_sp_current_parsing_ctx(); -@@ -4051,7 +4011,6 @@ sp_proc_stmt_open: +@@ -4065,7 +4025,6 @@ sp_proc_stmt_open: sp_proc_stmt_fetch: FETCH_SYM sp_opt_fetch_noise ident INTO { @@ -630,7 +639,7 @@ index 0c9e81d..765e389 100644 LEX *lex= Lex; sp_head *sp= lex->sphead; sp_pcontext *pctx= lex->get_sp_current_parsing_ctx(); -@@ -4077,7 +4036,6 @@ sp_proc_stmt_fetch: +@@ -4091,7 +4050,6 @@ sp_proc_stmt_fetch: sp_proc_stmt_close: CLOSE_SYM ident { @@ -638,7 +647,7 @@ index 0c9e81d..765e389 100644 LEX *lex= Lex; sp_head *sp= lex->sphead; sp_pcontext *pctx= lex->get_sp_current_parsing_ctx(); -@@ -4145,7 +4103,6 @@ sp_fetch_list: +@@ -4159,7 +4117,6 @@ sp_fetch_list: sp_if: { @@ -646,7 +655,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; sp_head *sp= lex->sphead; -@@ -4154,7 +4111,6 @@ sp_if: +@@ -4168,7 +4125,6 @@ sp_if: } expr { @@ -654,7 +663,7 @@ index 0c9e81d..765e389 100644 LEX *lex= Lex; sp_head *sp= lex->sphead; sp_pcontext *pctx= lex->get_sp_current_parsing_ctx(); -@@ -4190,7 +4146,6 @@ sp_if: +@@ -4204,7 +4160,6 @@ sp_if: } THEN_SYM sp_proc_stmts1 { @@ -662,7 +671,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; sp_head *sp= lex->sphead; sp_pcontext *pctx= lex->get_sp_current_parsing_ctx(); -@@ -4232,7 +4187,6 @@ case_stmt_specification: +@@ -4246,7 +4201,6 @@ case_stmt_specification: simple_case_stmt: CASE_SYM { @@ -670,7 +679,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; sp_head *sp= lex->sphead; -@@ -4243,7 +4197,6 @@ simple_case_stmt: +@@ -4257,7 +4211,6 @@ simple_case_stmt: } expr { @@ -678,7 +687,7 @@ index 0c9e81d..765e389 100644 LEX *lex= Lex; sp_head *sp= lex->sphead; -@@ -4294,7 +4247,7 @@ simple_case_stmt: +@@ -4308,7 +4261,7 @@ simple_case_stmt: searched_case_stmt: CASE_SYM { @@ -687,7 +696,7 @@ index 0c9e81d..765e389 100644 } searched_when_clause_list else_clause_opt -@@ -4318,7 +4271,6 @@ searched_when_clause_list: +@@ -4332,7 +4285,6 @@ searched_when_clause_list: simple_when_clause: WHEN_SYM { @@ -695,7 +704,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; sp_head *sp= lex->sphead; -@@ -4329,7 +4281,6 @@ simple_when_clause: +@@ -4343,7 +4295,6 @@ simple_when_clause: { /* Simple case: = */ @@ -703,7 +712,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; sp_head *sp= lex->sphead; sp_pcontext *pctx= lex->get_sp_current_parsing_ctx(); -@@ -4368,7 +4319,7 @@ simple_when_clause: +@@ -4382,7 +4333,7 @@ simple_when_clause: THEN_SYM sp_proc_stmts1 { @@ -712,7 +721,7 @@ index 0c9e81d..765e389 100644 MYSQL_YYABORT; } ; -@@ -4376,7 +4327,6 @@ simple_when_clause: +@@ -4390,7 +4341,6 @@ simple_when_clause: searched_when_clause: WHEN_SYM { @@ -720,7 +729,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; sp_head *sp= lex->sphead; -@@ -4385,7 +4335,6 @@ searched_when_clause: +@@ -4399,7 +4349,6 @@ searched_when_clause: } expr { @@ -728,7 +737,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; sp_head *sp= lex->sphead; sp_pcontext *pctx= lex->get_sp_current_parsing_ctx(); -@@ -4421,7 +4370,7 @@ searched_when_clause: +@@ -4435,7 +4384,7 @@ searched_when_clause: THEN_SYM sp_proc_stmts1 { @@ -737,7 +746,7 @@ index 0c9e81d..765e389 100644 MYSQL_YYABORT; } ; -@@ -4429,7 +4378,6 @@ searched_when_clause: +@@ -4443,7 +4392,6 @@ searched_when_clause: else_clause_opt: /* empty */ { @@ -745,7 +754,7 @@ index 0c9e81d..765e389 100644 LEX *lex= Lex; sp_head *sp= lex->sphead; sp_pcontext *pctx= lex->get_sp_current_parsing_ctx(); -@@ -4459,7 +4407,7 @@ sp_labeled_control: +@@ -4473,7 +4421,7 @@ sp_labeled_control: } else { @@ -754,7 +763,7 @@ index 0c9e81d..765e389 100644 lab->type= sp_label::ITERATION; } } -@@ -4501,7 +4449,7 @@ sp_labeled_block: +@@ -4515,7 +4463,7 @@ sp_labeled_block: MYSQL_YYABORT; } @@ -763,7 +772,7 @@ index 0c9e81d..765e389 100644 lab->type= sp_label::BEGIN; } sp_block_content sp_opt_label -@@ -4528,7 +4476,7 @@ sp_unlabeled_block: +@@ -4542,7 +4490,7 @@ sp_unlabeled_block: sp_pcontext *pctx= lex->get_sp_current_parsing_ctx(); sp_label *lab= @@ -772,7 +781,7 @@ index 0c9e81d..765e389 100644 lab->type= sp_label::BEGIN; } -@@ -4544,7 +4492,6 @@ sp_block_content: +@@ -4558,7 +4506,6 @@ sp_block_content: { /* QQ This is just a dummy for grouping declarations and statements together. No [[NOT] ATOMIC] yet, and we need to figure out how make it coexist with the existing BEGIN COMMIT/ROLLBACK. */ @@ -780,7 +789,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; sp_pcontext *parent_pctx= lex->get_sp_current_parsing_ctx(); -@@ -4557,7 +4504,6 @@ sp_block_content: +@@ -4571,7 +4518,6 @@ sp_block_content: sp_proc_stmts END { @@ -788,7 +797,7 @@ index 0c9e81d..765e389 100644 LEX *lex= Lex; sp_head *sp= lex->sphead; sp_pcontext *pctx= lex->get_sp_current_parsing_ctx(); -@@ -4593,7 +4539,6 @@ sp_unlabeled_control: +@@ -4607,7 +4553,6 @@ sp_unlabeled_control: LOOP_SYM sp_proc_stmts1 END LOOP_SYM { @@ -796,7 +805,7 @@ index 0c9e81d..765e389 100644 LEX *lex= Lex; sp_head *sp= lex->sphead; sp_pcontext *pctx= lex->get_sp_current_parsing_ctx(); -@@ -4608,7 +4553,6 @@ sp_unlabeled_control: +@@ -4622,7 +4567,6 @@ sp_unlabeled_control: } | WHILE_SYM { @@ -804,7 +813,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; sp_head *sp= lex->sphead; -@@ -4617,7 +4561,6 @@ sp_unlabeled_control: +@@ -4631,7 +4575,6 @@ sp_unlabeled_control: } expr { @@ -812,7 +821,7 @@ index 0c9e81d..765e389 100644 LEX *lex= Lex; sp_head *sp= lex->sphead; sp_pcontext *pctx= lex->get_sp_current_parsing_ctx(); -@@ -4655,7 +4598,6 @@ sp_unlabeled_control: +@@ -4669,7 +4612,6 @@ sp_unlabeled_control: sp_proc_stmts1 END WHILE_SYM { @@ -820,7 +829,7 @@ index 0c9e81d..765e389 100644 LEX *lex= Lex; sp_head *sp= lex->sphead; sp_pcontext *pctx= lex->get_sp_current_parsing_ctx(); -@@ -4671,7 +4613,6 @@ sp_unlabeled_control: +@@ -4685,7 +4627,6 @@ sp_unlabeled_control: } | REPEAT_SYM sp_proc_stmts1 UNTIL_SYM { @@ -828,7 +837,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; sp_head *sp= lex->sphead; -@@ -4680,7 +4621,6 @@ sp_unlabeled_control: +@@ -4694,7 +4635,6 @@ sp_unlabeled_control: } expr { @@ -836,7 +845,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; sp_head *sp= lex->sphead; sp_pcontext *pctx= lex->get_sp_current_parsing_ctx(); -@@ -5133,7 +5073,6 @@ create2: +@@ -5147,7 +5087,6 @@ create2: create3 {} | LIKE table_ident { @@ -844,7 +853,7 @@ index 0c9e81d..765e389 100644 TABLE_LIST *src_table; LEX *lex= thd->lex; -@@ -5148,7 +5087,6 @@ create2: +@@ -5162,7 +5101,6 @@ create2: } | '(' LIKE table_ident ')' { @@ -852,7 +861,7 @@ index 0c9e81d..765e389 100644 TABLE_LIST *src_table; LEX *lex= thd->lex; -@@ -5749,7 +5687,7 @@ part_value_expr_item: +@@ -5763,7 +5701,7 @@ part_value_expr_item: my_parse_error(ER(ER_WRONG_EXPR_IN_PARTITION_FUNC_ERROR)); MYSQL_YYABORT; } @@ -861,7 +870,7 @@ index 0c9e81d..765e389 100644 { MYSQL_YYABORT; } -@@ -6207,7 +6145,6 @@ default_collation: +@@ -6221,7 +6159,6 @@ default_collation: storage_engines: ident_or_text { @@ -869,7 +878,7 @@ index 0c9e81d..765e389 100644 plugin_ref plugin= ha_resolve_by_name(thd, &$1, thd->lex->create_info.options & HA_LEX_CREATE_TMP_TABLE); -@@ -6233,7 +6170,6 @@ storage_engines: +@@ -6247,7 +6184,6 @@ storage_engines: known_storage_engines: ident_or_text { @@ -877,7 +886,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; plugin_ref plugin= ha_resolve_by_name(thd, &$1, -@@ -6469,7 +6405,7 @@ type: +@@ -6483,7 +6419,7 @@ type: { /* Reset unsupported positive column width to default value */ Lex->length= NULL; @@ -886,7 +895,7 @@ index 0c9e81d..765e389 100644 ER_INVALID_YEAR_COLUMN_LENGTH, ER(ER_INVALID_YEAR_COLUMN_LENGTH), length); -@@ -6483,7 +6419,7 @@ type: +@@ -6497,7 +6433,7 @@ type: { $$= MYSQL_TYPE_TIME2; } | TIMESTAMP type_datetime_precision { @@ -895,7 +904,7 @@ index 0c9e81d..765e389 100644 $$=MYSQL_TYPE_DATETIME2; else { -@@ -6491,7 +6427,7 @@ type: +@@ -6505,7 +6441,7 @@ type: Unlike other types TIMESTAMP fields are NOT NULL by default. This behavior is deprecated now. */ @@ -904,7 +913,7 @@ index 0c9e81d..765e389 100644 Lex->type|= NOT_NULL_FLAG; $$=MYSQL_TYPE_TIMESTAMP2; -@@ -6618,7 +6554,7 @@ int_type: +@@ -6632,7 +6568,7 @@ int_type: real_type: REAL { @@ -913,7 +922,7 @@ index 0c9e81d..765e389 100644 MYSQL_TYPE_FLOAT : MYSQL_TYPE_DOUBLE; } | DOUBLE_SYM -@@ -6807,7 +6743,7 @@ type_with_opt_collate: +@@ -6821,7 +6757,7 @@ type_with_opt_collate: now: NOW_SYM func_datetime_precision { @@ -922,7 +931,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; }; -@@ -7287,7 +7223,6 @@ string_list: +@@ -7301,7 +7237,6 @@ string_list: alter: ALTER opt_ignore TABLE_SYM table_ident { @@ -930,7 +939,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; lex->name.str= 0; lex->name.length= 0; -@@ -7313,7 +7248,6 @@ alter: +@@ -7327,7 +7262,6 @@ alter: } alter_commands { @@ -938,7 +947,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; if (!lex->m_sql_cmd) { -@@ -7426,7 +7360,7 @@ alter: +@@ -7440,7 +7374,7 @@ alter: Event_parse_data. */ @@ -947,7 +956,7 @@ index 0c9e81d..765e389 100644 MYSQL_YYABORT; Lex->event_parse_data->identifier= $4; -@@ -7529,7 +7463,7 @@ alter_commands: +@@ -7543,7 +7477,7 @@ alter_commands: /* empty */ | DISCARD TABLESPACE { @@ -956,7 +965,7 @@ index 0c9e81d..765e389 100644 Sql_cmd_discard_import_tablespace( Sql_cmd_discard_import_tablespace::DISCARD_TABLESPACE); if (Lex->m_sql_cmd == NULL) -@@ -7537,7 +7471,7 @@ alter_commands: +@@ -7551,7 +7485,7 @@ alter_commands: } | IMPORT TABLESPACE { @@ -965,7 +974,7 @@ index 0c9e81d..765e389 100644 Sql_cmd_discard_import_tablespace( Sql_cmd_discard_import_tablespace::IMPORT_TABLESPACE); if (Lex->m_sql_cmd == NULL) -@@ -7571,7 +7505,6 @@ alter_commands: +@@ -7585,7 +7519,6 @@ alter_commands: | OPTIMIZE PARTITION_SYM opt_no_write_to_binlog all_or_alt_part_name_list { @@ -973,7 +982,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; lex->no_write_to_binlog= $3; lex->check_opt.init(); -@@ -7585,7 +7518,6 @@ alter_commands: +@@ -7599,7 +7532,6 @@ alter_commands: | ANALYZE_SYM PARTITION_SYM opt_no_write_to_binlog all_or_alt_part_name_list { @@ -981,7 +990,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; lex->no_write_to_binlog= $3; lex->check_opt.init(); -@@ -7597,7 +7529,6 @@ alter_commands: +@@ -7611,7 +7543,6 @@ alter_commands: } | CHECK_SYM PARTITION_SYM all_or_alt_part_name_list { @@ -989,7 +998,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; lex->check_opt.init(); DBUG_ASSERT(!lex->m_sql_cmd); -@@ -7610,7 +7541,6 @@ alter_commands: +@@ -7624,7 +7555,6 @@ alter_commands: | REPAIR PARTITION_SYM opt_no_write_to_binlog all_or_alt_part_name_list { @@ -997,7 +1006,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; lex->no_write_to_binlog= $3; lex->check_opt.init(); -@@ -7630,7 +7560,6 @@ alter_commands: +@@ -7644,7 +7574,6 @@ alter_commands: } | TRUNCATE_SYM PARTITION_SYM all_or_alt_part_name_list { @@ -1005,7 +1014,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; lex->check_opt.init(); DBUG_ASSERT(!lex->m_sql_cmd); -@@ -7643,7 +7572,6 @@ alter_commands: +@@ -7657,7 +7586,6 @@ alter_commands: | EXCHANGE_SYM PARTITION_SYM alt_part_name_item WITH TABLE_SYM table_ident have_partitioning { @@ -1013,7 +1022,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; size_t dummy; lex->select_lex.db=$6->db.str; -@@ -7925,7 +7853,6 @@ alter_list_item: +@@ -7939,7 +7867,6 @@ alter_list_item: { if (!$4) { @@ -1021,7 +1030,7 @@ index 0c9e81d..765e389 100644 $4= thd->variables.collation_database; } $5= $5 ? $5 : $4; -@@ -8287,7 +8214,6 @@ repair: +@@ -8301,7 +8228,6 @@ repair: } table_list opt_mi_repair_type { @@ -1029,7 +1038,7 @@ index 0c9e81d..765e389 100644 LEX* lex= thd->lex; DBUG_ASSERT(!lex->m_sql_cmd); lex->m_sql_cmd= new (thd->mem_root) Sql_cmd_repair_table(); -@@ -8325,7 +8251,6 @@ analyze: +@@ -8339,7 +8265,6 @@ analyze: } table_list { @@ -1037,7 +1046,7 @@ index 0c9e81d..765e389 100644 LEX* lex= thd->lex; DBUG_ASSERT(!lex->m_sql_cmd); lex->m_sql_cmd= new (thd->mem_root) Sql_cmd_analyze_table(); -@@ -8360,7 +8285,6 @@ check: +@@ -8374,7 +8299,6 @@ check: } table_list opt_mi_check_type { @@ -1045,7 +1054,7 @@ index 0c9e81d..765e389 100644 LEX* lex= thd->lex; DBUG_ASSERT(!lex->m_sql_cmd); lex->m_sql_cmd= new (thd->mem_root) Sql_cmd_check_table(); -@@ -8401,7 +8325,6 @@ optimize: +@@ -8415,7 +8339,6 @@ optimize: } table_list { @@ -1053,7 +1062,7 @@ index 0c9e81d..765e389 100644 LEX* lex= thd->lex; DBUG_ASSERT(!lex->m_sql_cmd); lex->m_sql_cmd= new (thd->mem_root) Sql_cmd_optimize_table(); -@@ -8486,7 +8409,7 @@ keycache_list: +@@ -8500,7 +8423,7 @@ keycache_list: assign_to_keycache: table_ident cache_keys_spec { @@ -1062,7 +1071,7 @@ index 0c9e81d..765e389 100644 MDL_SHARED_READ, Select->pop_index_hints())) MYSQL_YYABORT; -@@ -8496,7 +8419,7 @@ assign_to_keycache: +@@ -8510,7 +8433,7 @@ assign_to_keycache: assign_to_keycache_parts: table_ident adm_partition cache_keys_spec { @@ -1071,7 +1080,7 @@ index 0c9e81d..765e389 100644 MDL_SHARED_READ, Select->pop_index_hints())) MYSQL_YYABORT; -@@ -8532,7 +8455,7 @@ preload_list: +@@ -8546,7 +8469,7 @@ preload_list: preload_keys: table_ident cache_keys_spec opt_ignore_leaves { @@ -1080,7 +1089,7 @@ index 0c9e81d..765e389 100644 MDL_SHARED_READ, Select->pop_index_hints())) MYSQL_YYABORT; -@@ -8542,7 +8465,7 @@ preload_keys: +@@ -8556,7 +8479,7 @@ preload_keys: preload_keys_parts: table_ident adm_partition cache_keys_spec opt_ignore_leaves { @@ -1089,7 +1098,7 @@ index 0c9e81d..765e389 100644 MDL_SHARED_READ, Select->pop_index_hints())) MYSQL_YYABORT; -@@ -8559,7 +8482,7 @@ adm_partition: +@@ -8573,7 +8496,7 @@ adm_partition: cache_keys_spec: { @@ -1098,7 +1107,7 @@ index 0c9e81d..765e389 100644 Select->set_index_hint_type(INDEX_HINT_USE, old_mode ? INDEX_HINT_MASK_JOIN : -@@ -8774,7 +8697,6 @@ select_item_list: +@@ -8788,7 +8711,6 @@ select_item_list: | select_item | '*' { @@ -1106,7 +1115,7 @@ index 0c9e81d..765e389 100644 Item *item= new (thd->mem_root) Item_field(&thd->lex->current_select->context, NULL, NULL, "*"); -@@ -8789,14 +8711,11 @@ select_item_list: +@@ -8803,14 +8725,11 @@ select_item_list: select_item: remember_name table_wild remember_end { @@ -1121,7 +1130,7 @@ index 0c9e81d..765e389 100644 DBUG_ASSERT($1 < $3); if (add_item_to_list(thd, $2)) -@@ -8891,7 +8810,7 @@ expr: +@@ -8905,7 +8824,7 @@ expr: else { /* X OR Y */ @@ -1130,7 +1139,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; } -@@ -8899,7 +8818,7 @@ expr: +@@ -8913,7 +8832,7 @@ expr: | expr XOR expr %prec XOR { /* XOR is a proprietary extension */ @@ -1139,7 +1148,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; } -@@ -8941,50 +8860,50 @@ expr: +@@ -8955,50 +8874,50 @@ expr: else { /* X AND Y */ @@ -1198,7 +1207,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; } -@@ -8994,19 +8913,19 @@ expr: +@@ -9008,19 +8927,19 @@ expr: bool_pri: bool_pri IS NULL_SYM %prec IS { @@ -1221,7 +1230,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; } -@@ -9028,13 +8947,12 @@ bool_pri: +@@ -9042,13 +8961,12 @@ bool_pri: predicate: bit_expr IN_SYM '(' subselect ')' { @@ -1236,7 +1245,7 @@ index 0c9e81d..765e389 100644 Item *item= new (thd->mem_root) Item_in_subselect($1, $5); if (item == NULL) MYSQL_YYABORT; -@@ -9044,7 +8962,7 @@ predicate: +@@ -9058,7 +8976,7 @@ predicate: } | bit_expr IN_SYM '(' expr ')' { @@ -1245,7 +1254,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; } -@@ -9052,13 +8970,13 @@ predicate: +@@ -9066,13 +8984,13 @@ predicate: { $6->push_front($4); $6->push_front($1); @@ -1261,7 +1270,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; } -@@ -9066,7 +8984,7 @@ predicate: +@@ -9080,7 +8998,7 @@ predicate: { $7->push_front($5); $7->push_front($1); @@ -1270,7 +1279,7 @@ index 0c9e81d..765e389 100644 if (item == NULL) MYSQL_YYABORT; item->negate(); -@@ -9074,14 +8992,14 @@ predicate: +@@ -9088,14 +9006,14 @@ predicate: } | bit_expr BETWEEN_SYM bit_expr AND_SYM predicate { @@ -1287,7 +1296,7 @@ index 0c9e81d..765e389 100644 if (item == NULL) MYSQL_YYABORT; item->negate(); -@@ -9089,42 +9007,42 @@ predicate: +@@ -9103,42 +9021,42 @@ predicate: } | bit_expr SOUNDS_SYM LIKE bit_expr { @@ -1339,7 +1348,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; } -@@ -9134,85 +9052,85 @@ predicate: +@@ -9148,85 +9066,85 @@ predicate: bit_expr: bit_expr '|' bit_expr %prec '|' { @@ -1439,7 +1448,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; } -@@ -9261,7 +9179,6 @@ simple_expr: +@@ -9275,7 +9193,6 @@ simple_expr: | function_call_conflict | simple_expr COLLATE_SYM ident_or_text %prec NEG { @@ -1447,7 +1456,7 @@ index 0c9e81d..765e389 100644 Item *i1= new (thd->mem_root) Item_string($3.str, $3.length, thd->charset()); -@@ -9277,7 +9194,7 @@ simple_expr: +@@ -9291,7 +9208,7 @@ simple_expr: | sum_expr | simple_expr OR_OR_SYM simple_expr { @@ -1456,7 +1465,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; } -@@ -9287,25 +9204,25 @@ simple_expr: +@@ -9301,25 +9218,25 @@ simple_expr: } | '-' simple_expr %prec NEG { @@ -1486,7 +1495,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; } -@@ -9314,20 +9231,20 @@ simple_expr: +@@ -9328,20 +9245,20 @@ simple_expr: | '(' expr ',' expr_list ')' { $4->push_front($2); @@ -1510,7 +1519,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; } -@@ -9364,7 +9281,7 @@ simple_expr: +@@ -9378,7 +9295,7 @@ simple_expr: type= MYSQL_TYPE_DATETIME; } if (type != MYSQL_TYPE_STRING) @@ -1519,7 +1528,7 @@ index 0c9e81d..765e389 100644 str.ptr(), str.length(), system_charset_info, type, false); -@@ -9375,7 +9292,7 @@ simple_expr: +@@ -9389,7 +9306,7 @@ simple_expr: | MATCH ident_list_arg AGAINST '(' bit_expr fulltext_options ')' { $2->push_front($5); @@ -1528,7 +1537,7 @@ index 0c9e81d..765e389 100644 if (i1 == NULL) MYSQL_YYABORT; Select->add_ftfunc_to_list(i1); -@@ -9383,7 +9300,7 @@ simple_expr: +@@ -9397,7 +9314,7 @@ simple_expr: } | BINARY simple_expr %prec NEG { @@ -1537,7 +1546,7 @@ index 0c9e81d..765e389 100644 &my_charset_bin); if ($$ == NULL) MYSQL_YYABORT; -@@ -9391,27 +9308,27 @@ simple_expr: +@@ -9405,27 +9322,27 @@ simple_expr: | CAST_SYM '(' expr AS cast_type ')' { LEX *lex= Lex; @@ -1569,7 +1578,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; } -@@ -9424,14 +9341,14 @@ simple_expr: +@@ -9438,14 +9355,14 @@ simple_expr: my_error(ER_WRONG_COLUMN_NAME, MYF(0), il->m_name.ptr()); MYSQL_YYABORT; } @@ -1586,7 +1595,7 @@ index 0c9e81d..765e389 100644 $3); if ($$ == NULL) MYSQL_YYABORT; -@@ -9439,7 +9356,7 @@ simple_expr: +@@ -9453,7 +9370,7 @@ simple_expr: | INTERVAL_SYM expr interval '+' expr %prec INTERVAL_SYM /* we cannot put interval before - */ { @@ -1595,7 +1604,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; } -@@ -9454,19 +9371,19 @@ simple_expr: +@@ -9468,19 +9385,19 @@ simple_expr: function_call_keyword: CHAR_SYM '(' expr_list ')' { @@ -1618,7 +1627,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; Lex->set_stmt_unsafe(LEX::BINLOG_STMT_UNSAFE_SYSTEM_FUNCTION); -@@ -9474,31 +9391,30 @@ function_call_keyword: +@@ -9488,31 +9405,30 @@ function_call_keyword: } | DATE_SYM '(' expr ')' { @@ -1654,7 +1663,7 @@ index 0c9e81d..765e389 100644 List *list= new (thd->mem_root) List; if (list == NULL) MYSQL_YYABORT; -@@ -9513,7 +9429,6 @@ function_call_keyword: +@@ -9527,7 +9443,6 @@ function_call_keyword: } | INTERVAL_SYM '(' expr ',' expr ',' expr_list ')' %prec INTERVAL_SYM { @@ -1662,7 +1671,7 @@ index 0c9e81d..765e389 100644 $7->push_front($5); $7->push_front($3); Item_row *item= new (thd->mem_root) Item_row(*$7); -@@ -9525,103 +9440,103 @@ function_call_keyword: +@@ -9539,103 +9454,103 @@ function_call_keyword: } | LEFT '(' expr ',' expr ')' { @@ -1783,7 +1792,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; Lex->set_stmt_unsafe(LEX::BINLOG_STMT_UNSAFE_SYSTEM_FUNCTION); -@@ -9629,7 +9544,7 @@ function_call_keyword: +@@ -9643,7 +9558,7 @@ function_call_keyword: } | YEAR_SYM '(' expr ')' { @@ -1792,7 +1801,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; } -@@ -9650,27 +9565,27 @@ function_call_keyword: +@@ -9664,27 +9579,27 @@ function_call_keyword: function_call_nonkeyword: ADDDATE_SYM '(' expr ',' expr ')' { @@ -1824,7 +1833,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; Lex->safe_to_cache_query=0; -@@ -9678,26 +9593,26 @@ function_call_nonkeyword: +@@ -9692,26 +9607,26 @@ function_call_nonkeyword: | DATE_ADD_INTERVAL '(' expr ',' INTERVAL_SYM expr interval ')' %prec INTERVAL_SYM { @@ -1855,7 +1864,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; } -@@ -9708,44 +9623,44 @@ function_call_nonkeyword: +@@ -9722,44 +9637,44 @@ function_call_nonkeyword: } | POSITION_SYM '(' bit_expr IN_SYM expr ')' { @@ -1907,7 +1916,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; } -@@ -9760,42 +9675,42 @@ function_call_nonkeyword: +@@ -9774,42 +9689,42 @@ function_call_nonkeyword: */ Lex->set_stmt_unsafe(LEX::BINLOG_STMT_UNSAFE_SYSTEM_FUNCTION); if (global_system_variables.sysdate_is_now == 0) @@ -1957,7 +1966,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; Lex->safe_to_cache_query=0; -@@ -9810,75 +9725,74 @@ function_call_nonkeyword: +@@ -9824,75 +9739,74 @@ function_call_nonkeyword: function_call_conflict: ASCII_SYM '(' expr ')' { @@ -2044,7 +2053,7 @@ index 0c9e81d..765e389 100644 Item* i1; Lex->contains_plaintext_password= true; if (thd->variables.old_passwords == 1) -@@ -9891,31 +9805,31 @@ function_call_conflict: +@@ -9905,31 +9819,31 @@ function_call_conflict: } | QUARTER_SYM '(' expr ')' { @@ -2081,7 +2090,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; Lex->set_stmt_unsafe(LEX::BINLOG_STMT_UNSAFE_SYSTEM_FUNCTION); -@@ -9923,13 +9837,12 @@ function_call_conflict: +@@ -9937,13 +9851,12 @@ function_call_conflict: } | TRUNCATE_SYM '(' expr ',' expr ')' { @@ -2096,7 +2105,7 @@ index 0c9e81d..765e389 100644 Item *i1= new (thd->mem_root) Item_int(NAME_STRING("0"), thd->variables.default_week_format, 1); -@@ -9941,19 +9854,19 @@ function_call_conflict: +@@ -9955,19 +9868,19 @@ function_call_conflict: } | WEEK_SYM '(' expr ',' expr ')' { @@ -2119,7 +2128,7 @@ index 0c9e81d..765e389 100644 Item_func_weight_string($3, 0, $6, $7 | MY_STRXFRM_PAD_WITH_SPACE); if ($$ == NULL) -@@ -9961,17 +9874,17 @@ function_call_conflict: +@@ -9975,17 +9888,17 @@ function_call_conflict: } | WEIGHT_STRING_SYM '(' expr AS BINARY ws_nweights ')' { @@ -2140,7 +2149,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; } -@@ -9993,52 +9906,52 @@ function_call_conflict: +@@ -10007,52 +9920,52 @@ function_call_conflict: geometry_function: CONTAINS_SYM '(' expr ',' expr ')' { @@ -2201,7 +2210,7 @@ index 0c9e81d..765e389 100644 Item_func_spatial_collection(* $3, Geometry::wkb_polygon, Geometry::wkb_linestring)); -@@ -10076,7 +9989,6 @@ function_call_generic: +@@ -10090,7 +10003,6 @@ function_call_generic: } opt_udf_expr_list ')' { @@ -2209,7 +2218,7 @@ index 0c9e81d..765e389 100644 Create_func *builder; Item *item= NULL; -@@ -10130,7 +10042,6 @@ function_call_generic: +@@ -10144,7 +10056,6 @@ function_call_generic: } | ident '.' ident '(' opt_expr_list ')' { @@ -2217,7 +2226,7 @@ index 0c9e81d..765e389 100644 Create_qfunc *builder; Item *item= NULL; -@@ -10192,7 +10103,7 @@ opt_udf_expr_list: +@@ -10206,7 +10117,7 @@ opt_udf_expr_list: udf_expr_list: udf_expr { @@ -2226,7 +2235,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; $$->push_back($1); -@@ -10225,7 +10136,7 @@ udf_expr: +@@ -10239,7 +10150,7 @@ udf_expr: */ else if ($2->type() != Item::FIELD_ITEM && $2->type() != Item::REF_ITEM /* For HAVING */ ) @@ -2235,7 +2244,7 @@ index 0c9e81d..765e389 100644 $$= $2; } ; -@@ -10233,46 +10144,46 @@ udf_expr: +@@ -10247,46 +10158,46 @@ udf_expr: sum_expr: AVG_SYM '(' in_sum_expr ')' { @@ -2290,7 +2299,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; } -@@ -10282,13 +10193,13 @@ sum_expr: +@@ -10296,13 +10207,13 @@ sum_expr: { Select->in_sum_expr--; } ')' { @@ -2306,7 +2315,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; } -@@ -10299,55 +10210,55 @@ sum_expr: +@@ -10313,55 +10224,55 @@ sum_expr: */ | MIN_SYM '(' DISTINCT in_sum_expr ')' { @@ -2371,7 +2380,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; } -@@ -10359,7 +10270,7 @@ sum_expr: +@@ -10373,7 +10284,7 @@ sum_expr: { SELECT_LEX *sel= Select; sel->in_sum_expr--; @@ -2380,7 +2389,7 @@ index 0c9e81d..765e389 100644 Item_func_group_concat(Lex->current_context(), $3, $5, sel->gorder_list, $7); if ($$ == NULL) -@@ -10389,7 +10300,7 @@ variable_aux: +@@ -10403,7 +10314,7 @@ variable_aux: { Item_func_set_user_var *item; $$= item= @@ -2389,7 +2398,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; LEX *lex= Lex; -@@ -10398,7 +10309,7 @@ variable_aux: +@@ -10412,7 +10323,7 @@ variable_aux: } | ident_or_text { @@ -2398,7 +2407,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; LEX *lex= Lex; -@@ -10412,7 +10323,7 @@ variable_aux: +@@ -10426,7 +10337,7 @@ variable_aux: my_parse_error(ER(ER_SYNTAX_ERROR)); MYSQL_YYABORT; } @@ -2407,7 +2416,7 @@ index 0c9e81d..765e389 100644 MYSQL_YYABORT; if (!((Item_func_get_system_var*) $$)->is_written_to_binlog()) Lex->set_stmt_unsafe(LEX::BINLOG_STMT_UNSAFE_SYSTEM_VARIABLE); -@@ -10427,7 +10338,7 @@ opt_distinct: +@@ -10441,7 +10352,7 @@ opt_distinct: opt_gconcat_separator: /* empty */ { @@ -2416,7 +2425,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; } -@@ -10454,9 +10365,9 @@ opt_gorder_clause: +@@ -10468,9 +10379,9 @@ opt_gorder_clause: gorder_list: gorder_list ',' order_ident order_dir @@ -2428,7 +2437,7 @@ index 0c9e81d..765e389 100644 ; in_sum_expr: -@@ -10509,7 +10420,7 @@ opt_expr_list: +@@ -10523,7 +10434,7 @@ opt_expr_list: expr_list: expr { @@ -2437,7 +2446,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; $$->push_back($1); -@@ -10529,7 +10440,7 @@ ident_list_arg: +@@ -10543,7 +10454,7 @@ ident_list_arg: ident_list: simple_ident { @@ -2446,7 +2455,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; $$->push_back($1); -@@ -10629,7 +10540,7 @@ join_table: +@@ -10643,7 +10554,7 @@ join_table: { MYSQL_YYABORT_UNLESS($1 && $3); /* Change the current name resolution context to a local context. */ @@ -2455,7 +2464,7 @@ index 0c9e81d..765e389 100644 MYSQL_YYABORT; Select->parsing_place= IN_ON; } -@@ -10644,7 +10555,7 @@ join_table: +@@ -10658,7 +10569,7 @@ join_table: { MYSQL_YYABORT_UNLESS($1 && $3); /* Change the current name resolution context to a local context. */ @@ -2464,7 +2473,7 @@ index 0c9e81d..765e389 100644 MYSQL_YYABORT; Select->parsing_place= IN_ON; } -@@ -10674,7 +10585,7 @@ join_table: +@@ -10688,7 +10599,7 @@ join_table: { MYSQL_YYABORT_UNLESS($1 && $5); /* Change the current name resolution context to a local context. */ @@ -2473,7 +2482,7 @@ index 0c9e81d..765e389 100644 MYSQL_YYABORT; Select->parsing_place= IN_ON; } -@@ -10710,7 +10621,7 @@ join_table: +@@ -10724,7 +10635,7 @@ join_table: { MYSQL_YYABORT_UNLESS($1 && $5); /* Change the current name resolution context to a local context. */ @@ -2482,7 +2491,7 @@ index 0c9e81d..765e389 100644 MYSQL_YYABORT; Select->parsing_place= IN_ON; } -@@ -10781,7 +10692,7 @@ table_factor: +@@ -10795,7 +10706,7 @@ table_factor: } table_ident opt_use_partition opt_table_alias opt_key_definition { @@ -2491,7 +2500,7 @@ index 0c9e81d..765e389 100644 Select->get_table_join_options(), YYPS->m_lock_type, YYPS->m_mdl_type, -@@ -11090,7 +11001,7 @@ index_hints_list: +@@ -11104,7 +11015,7 @@ index_hints_list: opt_index_hints_list: /* empty */ @@ -2500,7 +2509,7 @@ index 0c9e81d..765e389 100644 ; opt_key_definition: -@@ -11099,15 +11010,15 @@ opt_key_definition: +@@ -11113,15 +11024,15 @@ opt_key_definition: ; opt_key_usage_list: @@ -2519,7 +2528,7 @@ index 0c9e81d..765e389 100644 ; key_usage_list: -@@ -11120,7 +11031,7 @@ using_list: +@@ -11134,7 +11045,7 @@ using_list: { if (!($$= new List)) MYSQL_YYABORT; @@ -2528,7 +2537,7 @@ index 0c9e81d..765e389 100644 $1.length, system_charset_info); if (s == NULL) -@@ -11129,7 +11040,7 @@ using_list: +@@ -11143,7 +11054,7 @@ using_list: } | using_list ',' ident { @@ -2537,7 +2546,7 @@ index 0c9e81d..765e389 100644 $3.length, system_charset_info); if (s == NULL) -@@ -11234,7 +11145,6 @@ opt_escape: +@@ -11248,7 +11159,6 @@ opt_escape: } | /* empty */ { @@ -2545,7 +2554,7 @@ index 0c9e81d..765e389 100644 Lex->escape_used= FALSE; $$= ((thd->variables.sql_mode & MODE_NO_BACKSLASH_ESCAPES) ? new (thd->mem_root) Item_string("", 0, &my_charset_latin1) : -@@ -11255,9 +11165,9 @@ group_clause: +@@ -11269,9 +11179,9 @@ group_clause: group_list: group_list ',' order_ident order_dir @@ -2557,7 +2566,7 @@ index 0c9e81d..765e389 100644 ; olap_opt: -@@ -11324,7 +11234,6 @@ alter_order_list: +@@ -11338,7 +11248,6 @@ alter_order_list: alter_order_item: simple_ident_nospvar order_dir { @@ -2565,7 +2574,7 @@ index 0c9e81d..765e389 100644 bool ascending= ($2 == 1) ? true : false; if (add_order_to_list(thd, $1, ascending)) MYSQL_YYABORT; -@@ -11377,9 +11286,9 @@ order_clause: +@@ -11391,9 +11300,9 @@ order_clause: order_list: order_list ',' order_ident order_dir @@ -2577,7 +2586,7 @@ index 0c9e81d..765e389 100644 ; order_dir: -@@ -11442,7 +11351,6 @@ limit_options: +@@ -11456,7 +11365,6 @@ limit_options: limit_option: ident { @@ -2585,7 +2594,7 @@ index 0c9e81d..765e389 100644 LEX *lex= Lex; Lex_input_stream *lip= YYLIP; sp_head *sp= lex->sphead; -@@ -11473,19 +11381,19 @@ limit_option: +@@ -11487,19 +11395,19 @@ limit_option: } | ULONGLONG_NUM { @@ -2608,7 +2617,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; } -@@ -11787,7 +11695,6 @@ drop: +@@ -11801,7 +11709,6 @@ drop: } | DROP FUNCTION_SYM if_exists ident '.' ident { @@ -2616,7 +2625,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; sp_name *spname; if ($4.str && -@@ -11808,7 +11715,6 @@ drop: +@@ -11822,7 +11729,6 @@ drop: } | DROP FUNCTION_SYM if_exists ident { @@ -2624,7 +2633,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; LEX_STRING db= {0, 0}; sp_name *spname; -@@ -11893,7 +11799,7 @@ table_list: +@@ -11907,7 +11813,7 @@ table_list: table_name: table_ident { @@ -2633,7 +2642,7 @@ index 0c9e81d..765e389 100644 TL_OPTION_UPDATING, YYPS->m_lock_type, YYPS->m_mdl_type)) -@@ -11904,7 +11810,7 @@ table_name: +@@ -11918,7 +11824,7 @@ table_name: table_name_with_opt_use_partition: table_ident opt_use_partition { @@ -2642,7 +2651,7 @@ index 0c9e81d..765e389 100644 TL_OPTION_UPDATING, YYPS->m_lock_type, YYPS->m_mdl_type, -@@ -11922,7 +11828,7 @@ table_alias_ref_list: +@@ -11936,7 +11842,7 @@ table_alias_ref_list: table_alias_ref: table_ident_opt_wild { @@ -2651,7 +2660,7 @@ index 0c9e81d..765e389 100644 TL_OPTION_UPDATING | TL_OPTION_ALIAS, YYPS->m_lock_type, YYPS->m_mdl_type)) -@@ -12011,12 +11917,12 @@ insert_lock_option: +@@ -12025,12 +11931,12 @@ insert_lock_option: | DELAYED_SYM { Lex->keyword_delayed_begin_offset= (uint)(YYLIP->get_tok_start() - @@ -2666,7 +2675,7 @@ index 0c9e81d..765e389 100644 ER_WARN_DEPRECATED_SYNTAX, ER(ER_WARN_DEPRECATED_SYNTAX), "INSERT DELAYED", "INSERT"); -@@ -12029,12 +11935,12 @@ replace_lock_option: +@@ -12043,12 +11949,12 @@ replace_lock_option: | DELAYED_SYM { Lex->keyword_delayed_begin_offset= (uint)(YYLIP->get_tok_start() - @@ -2681,7 +2690,7 @@ index 0c9e81d..765e389 100644 ER_WARN_DEPRECATED_SYNTAX, ER(ER_WARN_DEPRECATED_SYNTAX), "REPLACE DELAYED", "REPLACE"); -@@ -12151,7 +12057,7 @@ expr_or_default: +@@ -12165,7 +12071,7 @@ expr_or_default: expr { $$= $1;} | DEFAULT { @@ -2690,7 +2699,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; } -@@ -12204,7 +12110,7 @@ update_list: +@@ -12218,7 +12124,7 @@ update_list: update_elem: simple_ident_nospvar equal expr_or_default { @@ -2699,7 +2708,7 @@ index 0c9e81d..765e389 100644 MYSQL_YYABORT; } ; -@@ -12249,7 +12155,7 @@ delete: +@@ -12263,7 +12169,7 @@ delete: single_multi: FROM table_ident opt_use_partition { @@ -2708,7 +2717,7 @@ index 0c9e81d..765e389 100644 YYPS->m_lock_type, YYPS->m_mdl_type, NULL, -@@ -12295,7 +12201,7 @@ table_wild_one: +@@ -12309,7 +12215,7 @@ table_wild_one: Table_ident *ti= new Table_ident($1); if (ti == NULL) MYSQL_YYABORT; @@ -2717,7 +2726,7 @@ index 0c9e81d..765e389 100644 ti, NULL, TL_OPTION_UPDATING | TL_OPTION_ALIAS, -@@ -12305,10 +12211,10 @@ table_wild_one: +@@ -12319,10 +12225,10 @@ table_wild_one: } | ident '.' ident opt_wild { @@ -2730,7 +2739,7 @@ index 0c9e81d..765e389 100644 ti, NULL, TL_OPTION_UPDATING | TL_OPTION_ALIAS, -@@ -12348,7 +12254,6 @@ truncate: +@@ -12362,7 +12268,6 @@ truncate: } table_name { @@ -2738,7 +2747,7 @@ index 0c9e81d..765e389 100644 LEX* lex= thd->lex; DBUG_ASSERT(!lex->m_sql_cmd); lex->m_sql_cmd= new (thd->mem_root) Sql_cmd_truncate_table(); -@@ -12442,7 +12347,7 @@ show_param: +@@ -12456,7 +12361,7 @@ show_param: { LEX *lex= Lex; lex->sql_command= SQLCOM_SHOW_DATABASES; @@ -2747,7 +2756,7 @@ index 0c9e81d..765e389 100644 MYSQL_YYABORT; } | opt_full TABLES opt_db wild_and_where -@@ -12450,7 +12355,7 @@ show_param: +@@ -12464,7 +12369,7 @@ show_param: LEX *lex= Lex; lex->sql_command= SQLCOM_SHOW_TABLES; lex->select_lex.db= $3; @@ -2756,7 +2765,7 @@ index 0c9e81d..765e389 100644 MYSQL_YYABORT; } | opt_full TRIGGERS_SYM opt_db wild_and_where -@@ -12458,7 +12363,7 @@ show_param: +@@ -12472,7 +12377,7 @@ show_param: LEX *lex= Lex; lex->sql_command= SQLCOM_SHOW_TRIGGERS; lex->select_lex.db= $3; @@ -2765,7 +2774,7 @@ index 0c9e81d..765e389 100644 MYSQL_YYABORT; } | EVENTS_SYM opt_db wild_and_where -@@ -12466,7 +12371,7 @@ show_param: +@@ -12480,7 +12385,7 @@ show_param: LEX *lex= Lex; lex->sql_command= SQLCOM_SHOW_EVENTS; lex->select_lex.db= $2; @@ -2774,7 +2783,7 @@ index 0c9e81d..765e389 100644 MYSQL_YYABORT; } | TABLE_SYM STATUS_SYM opt_db wild_and_where -@@ -12474,7 +12379,7 @@ show_param: +@@ -12488,7 +12393,7 @@ show_param: LEX *lex= Lex; lex->sql_command= SQLCOM_SHOW_TABLE_STATUS; lex->select_lex.db= $3; @@ -2783,7 +2792,7 @@ index 0c9e81d..765e389 100644 MYSQL_YYABORT; } | OPEN_SYM TABLES opt_db wild_and_where -@@ -12482,14 +12387,14 @@ show_param: +@@ -12496,14 +12401,14 @@ show_param: LEX *lex= Lex; lex->sql_command= SQLCOM_SHOW_OPEN_TABLES; lex->select_lex.db= $3; @@ -2800,7 +2809,7 @@ index 0c9e81d..765e389 100644 MYSQL_YYABORT; } | ENGINE_SYM known_storage_engines show_engine_param -@@ -12502,7 +12407,7 @@ show_param: +@@ -12516,7 +12421,7 @@ show_param: lex->sql_command= SQLCOM_SHOW_FIELDS; if ($5) $4->change_db($5); @@ -2809,7 +2818,7 @@ index 0c9e81d..765e389 100644 MYSQL_YYABORT; } | master_or_binary LOGS_SYM -@@ -12529,14 +12434,14 @@ show_param: +@@ -12543,14 +12448,14 @@ show_param: lex->sql_command= SQLCOM_SHOW_KEYS; if ($4) $3->change_db($4); @@ -2826,7 +2835,7 @@ index 0c9e81d..765e389 100644 MYSQL_YYABORT; } | PRIVILEGES -@@ -12554,7 +12459,7 @@ show_param: +@@ -12568,7 +12473,7 @@ show_param: { Lex->sql_command = SQLCOM_SHOW_ERRORS;} | PROFILES_SYM { @@ -2835,7 +2844,7 @@ index 0c9e81d..765e389 100644 ER_WARN_DEPRECATED_SYNTAX, ER(ER_WARN_DEPRECATED_SYNTAX), "SHOW PROFILES", "Performance Schema"); -@@ -12562,13 +12467,13 @@ show_param: +@@ -12576,13 +12481,13 @@ show_param: } | PROFILE_SYM opt_profile_defs opt_profile_args opt_limit_clause_init { @@ -2851,7 +2860,7 @@ index 0c9e81d..765e389 100644 YYABORT; } | opt_var_type STATUS_SYM wild_and_where -@@ -12576,7 +12481,7 @@ show_param: +@@ -12590,7 +12495,7 @@ show_param: LEX *lex= Lex; lex->sql_command= SQLCOM_SHOW_STATUS; lex->option_type= $1; @@ -2860,7 +2869,7 @@ index 0c9e81d..765e389 100644 MYSQL_YYABORT; } | opt_full PROCESSLIST_SYM -@@ -12586,21 +12491,21 @@ show_param: +@@ -12600,21 +12505,21 @@ show_param: LEX *lex= Lex; lex->sql_command= SQLCOM_SHOW_VARIABLES; lex->option_type= $1; @@ -2885,7 +2894,7 @@ index 0c9e81d..765e389 100644 MYSQL_YYABORT; } | GRANTS -@@ -12630,7 +12535,7 @@ show_param: +@@ -12644,7 +12549,7 @@ show_param: { LEX *lex= Lex; lex->sql_command = SQLCOM_SHOW_CREATE; @@ -2894,7 +2903,7 @@ index 0c9e81d..765e389 100644 MYSQL_YYABORT; lex->only_view= 0; lex->create_info.storage_media= HA_SM_DEFAULT; -@@ -12639,7 +12544,7 @@ show_param: +@@ -12653,7 +12558,7 @@ show_param: { LEX *lex= Lex; lex->sql_command = SQLCOM_SHOW_CREATE; @@ -2903,7 +2912,7 @@ index 0c9e81d..765e389 100644 MYSQL_YYABORT; lex->only_view= 1; } -@@ -12660,35 +12565,35 @@ show_param: +@@ -12674,35 +12579,35 @@ show_param: { LEX *lex= Lex; Lex->sql_command= SQLCOM_SELECT; @@ -2944,7 +2953,7 @@ index 0c9e81d..765e389 100644 MYSQL_YYABORT; } | CREATE PROCEDURE_SYM sp_name -@@ -12715,14 +12620,14 @@ show_param: +@@ -12729,14 +12634,14 @@ show_param: { LEX *lex= Lex; lex->sql_command= SQLCOM_SHOW_STATUS_PROC; @@ -2961,7 +2970,7 @@ index 0c9e81d..765e389 100644 MYSQL_YYABORT; } | PROCEDURE_SYM CODE_SYM sp_name -@@ -12790,7 +12695,7 @@ wild_and_where: +@@ -12804,7 +12709,7 @@ wild_and_where: /* empty */ | LIKE TEXT_STRING_sys { @@ -2970,7 +2979,7 @@ index 0c9e81d..765e389 100644 system_charset_info); if (Lex->wild == NULL) MYSQL_YYABORT; -@@ -12813,7 +12718,7 @@ describe: +@@ -12827,7 +12732,7 @@ describe: lex->sql_command= SQLCOM_SHOW_FIELDS; lex->select_lex.db= 0; lex->verbose= 0; @@ -2979,7 +2988,7 @@ index 0c9e81d..765e389 100644 MYSQL_YYABORT; } opt_describe_column -@@ -12883,7 +12788,7 @@ opt_describe_column: +@@ -12897,7 +12802,7 @@ opt_describe_column: | text_string { Lex->wild= $1; } | ident { @@ -2988,7 +2997,7 @@ index 0c9e81d..765e389 100644 $1.length, system_charset_info); if (Lex->wild == NULL) -@@ -13123,7 +13028,6 @@ use: +@@ -13137,7 +13042,6 @@ use: load: LOAD data_or_xml { @@ -2996,7 +3005,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; if (lex->sphead) -@@ -13146,7 +13050,7 @@ load: +@@ -13160,7 +13064,7 @@ load: opt_duplicate INTO TABLE_SYM table_ident opt_use_partition { LEX *lex=Lex; @@ -3005,7 +3014,7 @@ index 0c9e81d..765e389 100644 $4, MDL_SHARED_WRITE, NULL, $13)) MYSQL_YYABORT; lex->field_list.empty(); -@@ -13289,7 +13193,7 @@ field_or_var: +@@ -13303,7 +13207,7 @@ field_or_var: simple_ident_nospvar {$$= $1;} | '@' ident_or_text { @@ -3014,7 +3023,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; } -@@ -13310,16 +13214,16 @@ load_data_set_elem: +@@ -13324,16 +13228,16 @@ load_data_set_elem: { LEX *lex= Lex; uint length= (uint) ($5 - $3); @@ -3034,7 +3043,7 @@ index 0c9e81d..765e389 100644 } ; -@@ -13329,7 +13233,6 @@ text_literal: +@@ -13343,7 +13247,6 @@ text_literal: TEXT_STRING { LEX_STRING tmp; @@ -3042,7 +3051,7 @@ index 0c9e81d..765e389 100644 const CHARSET_INFO *cs_con= thd->variables.collation_connection; const CHARSET_INFO *cs_cli= thd->variables.character_set_client; uint repertoire= thd->lex->text_string_is_7bit && -@@ -13355,7 +13258,7 @@ text_literal: +@@ -13369,7 +13272,7 @@ text_literal: uint repertoire= Lex->text_string_is_7bit ? MY_REPERTOIRE_ASCII : MY_REPERTOIRE_UNICODE30; DBUG_ASSERT(my_charset_is_ascii_based(national_charset_info)); @@ -3051,7 +3060,7 @@ index 0c9e81d..765e389 100644 national_charset_info, DERIVATION_COERCIBLE, repertoire); -@@ -13364,7 +13267,7 @@ text_literal: +@@ -13378,7 +13281,7 @@ text_literal: } | UNDERSCORE_CHARSET TEXT_STRING { @@ -3060,7 +3069,7 @@ index 0c9e81d..765e389 100644 $2.length, $1); if (str == NULL) MYSQL_YYABORT; -@@ -13383,7 +13286,7 @@ text_literal: +@@ -13397,7 +13300,7 @@ text_literal: If the string has been pure ASCII so far, check the new part. */ @@ -3069,7 +3078,7 @@ index 0c9e81d..765e389 100644 item->collation.repertoire|= my_string_repertoire(cs, $2.str, $2.length); -@@ -13394,15 +13297,15 @@ text_literal: +@@ -13408,15 +13311,15 @@ text_literal: text_string: TEXT_STRING_literal { @@ -3088,7 +3097,7 @@ index 0c9e81d..765e389 100644 if (tmp == NULL) MYSQL_YYABORT; /* -@@ -13414,7 +13317,7 @@ text_string: +@@ -13428,7 +13331,7 @@ text_string: } | BIN_NUM { @@ -3097,7 +3106,7 @@ index 0c9e81d..765e389 100644 if (tmp == NULL) MYSQL_YYABORT; /* -@@ -13429,7 +13332,6 @@ text_string: +@@ -13443,7 +13346,6 @@ text_string: param_marker: PARAM_MARKER { @@ -3105,7 +3114,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; Lex_input_stream *lip= YYLIP; Item_param *item; -@@ -13464,38 +13366,38 @@ literal: +@@ -13478,38 +13380,38 @@ literal: | temporal_literal { $$= $1; } | NULL_SYM { @@ -3150,7 +3159,7 @@ index 0c9e81d..765e389 100644 if (tmp == NULL) MYSQL_YYABORT; /* -@@ -13506,7 +13408,7 @@ literal: +@@ -13520,7 +13422,7 @@ literal: String *str= tmp->val_str((String*) 0); Item_string *item_str; @@ -3159,7 +3168,7 @@ index 0c9e81d..765e389 100644 Item_string(null_name_string, /* name will be set in select_item */ str ? str->ptr() : "", str ? str->length() : 0, -@@ -13524,7 +13426,7 @@ literal: +@@ -13538,7 +13440,7 @@ literal: } | UNDERSCORE_CHARSET BIN_NUM { @@ -3168,7 +3177,7 @@ index 0c9e81d..765e389 100644 if (tmp == NULL) MYSQL_YYABORT; /* -@@ -13535,7 +13437,7 @@ literal: +@@ -13549,7 +13451,7 @@ literal: String *str= tmp->val_str((String*) 0); Item_string *item_str; @@ -3177,7 +3186,7 @@ index 0c9e81d..765e389 100644 Item_string(null_name_string, /* name will be set in select_item */ str ? str->ptr() : "", str ? str->length() : 0, -@@ -13556,7 +13458,7 @@ NUM_literal: +@@ -13570,7 +13472,7 @@ NUM_literal: NUM { int error; @@ -3186,7 +3195,7 @@ index 0c9e81d..765e389 100644 Item_int($1, (longlong) my_strtoll10($1.str, NULL, &error), $1.length); -@@ -13566,7 +13468,7 @@ NUM_literal: +@@ -13580,7 +13482,7 @@ NUM_literal: | LONG_NUM { int error; @@ -3195,7 +3204,7 @@ index 0c9e81d..765e389 100644 Item_int($1, (longlong) my_strtoll10($1.str, NULL, &error), $1.length); -@@ -13575,23 +13477,23 @@ NUM_literal: +@@ -13589,23 +13491,23 @@ NUM_literal: } | ULONGLONG_NUM { @@ -3225,7 +3234,7 @@ index 0c9e81d..765e389 100644 { MYSQL_YYABORT; } -@@ -13602,19 +13504,19 @@ NUM_literal: +@@ -13616,19 +13518,19 @@ NUM_literal: temporal_literal: DATE_SYM TEXT_STRING { @@ -3248,7 +3257,7 @@ index 0c9e81d..765e389 100644 MYSQL_TYPE_DATETIME, true))) MYSQL_YYABORT; } -@@ -13636,7 +13538,7 @@ table_wild: +@@ -13650,7 +13552,7 @@ table_wild: ident '.' '*' { SELECT_LEX *sel= Select; @@ -3257,7 +3266,7 @@ index 0c9e81d..765e389 100644 NullS, $1.str, "*"); if ($$ == NULL) MYSQL_YYABORT; -@@ -13644,7 +13546,6 @@ table_wild: +@@ -13658,7 +13560,6 @@ table_wild: } | ident '.' ident '.' '*' { @@ -3265,7 +3274,7 @@ index 0c9e81d..765e389 100644 SELECT_LEX *sel= Select; const char* schema= thd->client_capabilities & CLIENT_NO_SCHEMA ? NullS : $1.str; -@@ -13664,7 +13565,6 @@ order_ident: +@@ -13678,7 +13579,6 @@ order_ident: simple_ident: ident { @@ -3273,7 +3282,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; sp_pcontext *pctx = lex->get_sp_current_parsing_ctx(); sp_variable *spv; -@@ -13719,7 +13619,6 @@ simple_ident: +@@ -13733,7 +13633,6 @@ simple_ident: simple_ident_nospvar: ident { @@ -3281,7 +3290,7 @@ index 0c9e81d..765e389 100644 SELECT_LEX *sel=Select; if ((sel->parsing_place != IN_HAVING) || (sel->get_in_sum_expr() > 0)) -@@ -13741,7 +13640,6 @@ simple_ident_nospvar: +@@ -13755,7 +13654,6 @@ simple_ident_nospvar: simple_ident_q: ident '.' ident { @@ -3289,7 +3298,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; sp_head *sp= lex->sphead; -@@ -13821,7 +13719,6 @@ simple_ident_q: +@@ -13835,7 +13733,6 @@ simple_ident_q: } | '.' ident '.' ident { @@ -3297,7 +3306,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; SELECT_LEX *sel= lex->current_select; if (sel->no_table_names_allowed) -@@ -13846,7 +13743,6 @@ simple_ident_q: +@@ -13860,7 +13757,6 @@ simple_ident_q: } | ident '.' ident '.' ident { @@ -3305,7 +3314,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; SELECT_LEX *sel= lex->current_select; const char* schema= (thd->client_capabilities & CLIENT_NO_SCHEMA ? -@@ -13914,7 +13810,7 @@ table_ident: +@@ -13928,7 +13824,7 @@ table_ident: } | ident '.' ident { @@ -3314,7 +3323,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; } -@@ -13936,7 +13832,7 @@ table_ident_opt_wild: +@@ -13950,7 +13846,7 @@ table_ident_opt_wild: } | ident '.' ident opt_wild { @@ -3323,7 +3332,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; } -@@ -13946,7 +13842,7 @@ table_ident_nodb: +@@ -13960,7 +13856,7 @@ table_ident_nodb: ident { LEX_STRING db={(char*) any_db,3}; @@ -3332,7 +3341,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; } -@@ -13956,8 +13852,6 @@ IDENT_sys: +@@ -13970,8 +13866,6 @@ IDENT_sys: IDENT { $$= $1; } | IDENT_QUOTED { @@ -3341,7 +3350,7 @@ index 0c9e81d..765e389 100644 if (thd->charset_is_system_charset) { const CHARSET_INFO *cs= system_charset_info; -@@ -13999,8 +13893,6 @@ TEXT_STRING_sys_nonewline: +@@ -14013,8 +13907,6 @@ TEXT_STRING_sys_nonewline: TEXT_STRING_sys: TEXT_STRING { @@ -3350,7 +3359,7 @@ index 0c9e81d..765e389 100644 if (thd->charset_is_system_charset) $$= $1; else -@@ -14015,8 +13907,6 @@ TEXT_STRING_sys: +@@ -14029,8 +13921,6 @@ TEXT_STRING_sys: TEXT_STRING_literal: TEXT_STRING { @@ -3359,7 +3368,7 @@ index 0c9e81d..765e389 100644 if (thd->charset_is_collation_connection) $$= $1; else -@@ -14031,8 +13921,6 @@ TEXT_STRING_literal: +@@ -14045,8 +13935,6 @@ TEXT_STRING_literal: TEXT_STRING_filesystem: TEXT_STRING { @@ -3368,7 +3377,7 @@ index 0c9e81d..765e389 100644 if (thd->charset_is_character_set_filesystem) $$= $1; else -@@ -14049,7 +13937,6 @@ ident: +@@ -14063,7 +13951,6 @@ ident: IDENT_sys { $$=$1; } | keyword { @@ -3376,7 +3385,7 @@ index 0c9e81d..765e389 100644 $$.str= thd->strmake($1.str, $1.length); if ($$.str == NULL) MYSQL_YYABORT; -@@ -14061,7 +13948,6 @@ label_ident: +@@ -14075,7 +13962,6 @@ label_ident: IDENT_sys { $$=$1; } | keyword_sp { @@ -3384,7 +3393,7 @@ index 0c9e81d..765e389 100644 $$.str= thd->strmake($1.str, $1.length); if ($$.str == NULL) MYSQL_YYABORT; -@@ -14078,7 +13964,6 @@ ident_or_text: +@@ -14092,7 +13978,6 @@ ident_or_text: user: ident_or_text { @@ -3392,7 +3401,7 @@ index 0c9e81d..765e389 100644 if (!($$=(LEX_USER*) thd->alloc(sizeof(st_lex_user)))) MYSQL_YYABORT; $$->user= $1; -@@ -14105,7 +13990,6 @@ user: +@@ -14119,7 +14004,6 @@ user: } | ident_or_text '@' ident_or_text { @@ -3400,7 +3409,7 @@ index 0c9e81d..765e389 100644 if (!($$=(LEX_USER*) thd->alloc(sizeof(st_lex_user)))) MYSQL_YYABORT; $$->user= $1; -@@ -14138,7 +14022,7 @@ user: +@@ -14152,7 +14036,7 @@ user: } | CURRENT_USER optional_braces { @@ -3409,7 +3418,7 @@ index 0c9e81d..765e389 100644 MYSQL_YYABORT; /* empty LEX_USER means current_user and -@@ -14542,7 +14426,7 @@ set: +@@ -14557,7 +14441,7 @@ set: lex->one_shot_set= 0; lex->autocommit= 0; @@ -3418,7 +3427,7 @@ index 0c9e81d..765e389 100644 } start_option_value_list {} -@@ -14553,7 +14437,7 @@ set: +@@ -14596,7 +14480,7 @@ set_stmt_option_value_following_option_type_list: start_option_value_list: option_value_no_option_type { @@ -3427,7 +3436,7 @@ index 0c9e81d..765e389 100644 MYSQL_YYABORT; } option_value_list_continued -@@ -14563,7 +14447,7 @@ start_option_value_list: +@@ -14606,7 +14490,7 @@ start_option_value_list: } transaction_characteristics { @@ -3436,7 +3445,7 @@ index 0c9e81d..765e389 100644 MYSQL_YYABORT; } | option_type -@@ -14578,13 +14462,13 @@ start_option_value_list: +@@ -14621,13 +14505,13 @@ start_option_value_list: start_option_value_list_following_option_type: option_value_following_option_type { @@ -3452,7 +3461,7 @@ index 0c9e81d..765e389 100644 MYSQL_YYABORT; } ; -@@ -14598,20 +14482,20 @@ option_value_list_continued: +@@ -14641,20 +14525,20 @@ option_value_list_continued: // Repeating list of option values after first option value. option_value_list: { @@ -3477,15 +3486,15 @@ index 0c9e81d..765e389 100644 MYSQL_YYABORT; } ; -@@ -14650,7 +14534,6 @@ opt_var_ident_type: +@@ -14693,7 +14577,6 @@ opt_var_ident_type: option_value_following_option_type: internal_variable_name equal set_expr_or_default { - THD *thd= YYTHD; LEX *lex= Lex; - - if ($1.var && $1.var != trg_new_row_fake_var) -@@ -14682,7 +14565,6 @@ option_value_no_option_type: + /* + Ignore SET STATEMENT variables list on slaves because system +@@ -14733,7 +14616,6 @@ option_value_no_option_type: } set_expr_or_default { @@ -3493,7 +3502,7 @@ index 0c9e81d..765e389 100644 LEX *lex= Lex; sp_head *sp= lex->sphead; const char *expr_start_ptr= NULL; -@@ -14776,7 +14658,7 @@ option_value_no_option_type: +@@ -14827,7 +14709,7 @@ option_value_no_option_type: | '@' ident_or_text equal expr { Item_func_set_user_var *item; @@ -3502,7 +3511,7 @@ index 0c9e81d..765e389 100644 if (item == NULL) MYSQL_YYABORT; set_var_user *var= new set_var_user(item); -@@ -14786,7 +14668,6 @@ option_value_no_option_type: +@@ -14837,7 +14719,6 @@ option_value_no_option_type: } | '@' '@' opt_var_ident_type internal_variable_name equal set_expr_or_default { @@ -3510,7 +3519,7 @@ index 0c9e81d..765e389 100644 struct sys_var_with_base tmp= $4; /* Lookup if necessary: must be a system variable. */ if (tmp.var == NULL) -@@ -14799,7 +14680,6 @@ option_value_no_option_type: +@@ -14850,7 +14731,6 @@ option_value_no_option_type: } | charset old_or_new_charset_name_or_default { @@ -3518,7 +3527,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; int flags= $2 ? 0 : set_var_collation_client::SET_CS_DEFAULT; const CHARSET_INFO *cs2; -@@ -14850,7 +14730,6 @@ option_value_no_option_type: +@@ -14901,7 +14781,6 @@ option_value_no_option_type: } | PASSWORD equal text_or_password { @@ -3526,7 +3535,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; sp_head *sp= lex->sphead; sp_pcontext *pctx= lex->get_sp_current_parsing_ctx(); -@@ -14927,7 +14806,6 @@ option_value_no_option_type: +@@ -14978,7 +14857,6 @@ option_value_no_option_type: internal_variable_name: ident { @@ -3534,7 +3543,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; sp_pcontext *pctx= lex->get_sp_current_parsing_ctx(); sp_variable *spv; -@@ -14990,7 +14868,7 @@ internal_variable_name: +@@ -15041,7 +14919,7 @@ internal_variable_name: } else { @@ -3543,7 +3552,7 @@ index 0c9e81d..765e389 100644 if (!tmp) MYSQL_YYABORT; if (!tmp->is_struct()) -@@ -15001,7 +14879,7 @@ internal_variable_name: +@@ -15052,7 +14930,7 @@ internal_variable_name: } | DEFAULT '.' ident { @@ -3552,7 +3561,7 @@ index 0c9e81d..765e389 100644 if (!tmp) MYSQL_YYABORT; if (!tmp->is_struct()) -@@ -15022,7 +14900,6 @@ transaction_characteristics: +@@ -15073,7 +14951,6 @@ transaction_characteristics: transaction_access_mode: transaction_access_mode_types { @@ -3560,7 +3569,7 @@ index 0c9e81d..765e389 100644 LEX *lex=Lex; Item *item= new (thd->mem_root) Item_int((int32) $1); if (item == NULL) -@@ -15040,7 +14917,6 @@ transaction_access_mode: +@@ -15091,7 +14968,6 @@ transaction_access_mode: isolation_level: ISOLATION LEVEL_SYM isolation_types { @@ -3568,7 +3577,7 @@ index 0c9e81d..765e389 100644 LEX *lex=Lex; Item *item= new (thd->mem_root) Item_int((int32) $3); if (item == NULL) -@@ -15074,13 +14950,13 @@ text_or_password: +@@ -15125,13 +15001,13 @@ text_or_password: if ($3.length == 0) $$= $3.str; else @@ -3585,7 +3594,7 @@ index 0c9e81d..765e389 100644 break; } if ($$ == NULL) -@@ -15090,7 +14966,7 @@ text_or_password: +@@ -15141,7 +15017,7 @@ text_or_password: | OLD_PASSWORD '(' TEXT_STRING ')' { $$= $3.length ? Item_func_old_password:: @@ -3594,7 +3603,7 @@ index 0c9e81d..765e389 100644 $3.str; if ($$ == NULL) MYSQL_YYABORT; -@@ -15104,19 +14980,19 @@ set_expr_or_default: +@@ -15155,19 +15031,19 @@ set_expr_or_default: | DEFAULT { $$=0; } | ON { @@ -3617,7 +3626,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; } -@@ -15155,7 +15031,7 @@ table_lock: +@@ -15206,7 +15082,7 @@ table_lock: { thr_lock_type lock_type= (thr_lock_type) $3; bool lock_for_write= (lock_type >= TL_WRITE_ALLOW_WRITE); @@ -3626,7 +3635,7 @@ index 0c9e81d..765e389 100644 (lock_for_write ? MDL_SHARED_NO_READ_WRITE : MDL_SHARED_READ))) -@@ -15169,7 +15045,7 @@ lock_option: +@@ -15220,7 +15096,7 @@ lock_option: | LOW_PRIORITY WRITE_SYM { $$= TL_WRITE_LOW_PRIORITY; @@ -3635,7 +3644,7 @@ index 0c9e81d..765e389 100644 } | READ_SYM LOCAL_SYM { $$= TL_READ; } ; -@@ -15197,7 +15073,6 @@ unlock: +@@ -15248,7 +15124,6 @@ unlock: handler: HANDLER_SYM table_ident OPEN_SYM opt_table_alias { @@ -3643,7 +3652,7 @@ index 0c9e81d..765e389 100644 LEX *lex= Lex; if (lex->sphead) { -@@ -15213,7 +15088,6 @@ handler: +@@ -15264,7 +15139,6 @@ handler: } | HANDLER_SYM table_ident_nodb CLOSE_SYM { @@ -3651,7 +3660,7 @@ index 0c9e81d..765e389 100644 LEX *lex= Lex; if (lex->sphead) { -@@ -15237,7 +15111,7 @@ handler: +@@ -15288,7 +15162,7 @@ handler: } lex->expr_allows_subselect= FALSE; lex->sql_command = SQLCOM_HA_READ; @@ -3660,7 +3669,7 @@ index 0c9e81d..765e389 100644 if (one == NULL) MYSQL_YYABORT; lex->current_select->select_limit= one; -@@ -15247,7 +15121,6 @@ handler: +@@ -15298,7 +15172,6 @@ handler: } handler_read_or_scan where_clause opt_limit_clause { @@ -3668,7 +3677,7 @@ index 0c9e81d..765e389 100644 LEX *lex= Lex; Lex->expr_allows_subselect= TRUE; /* Stored functions are not supported for HANDLER READ. */ -@@ -15282,7 +15155,7 @@ handler_rkey_function: +@@ -15333,7 +15206,7 @@ handler_rkey_function: | LAST_SYM { $$= RLAST; } | handler_rkey_mode { @@ -3677,7 +3686,7 @@ index 0c9e81d..765e389 100644 Lex->insert_list= new List_item; if (! Lex->insert_list) MYSQL_YYABORT; -@@ -15590,8 +15463,8 @@ grant_user: +@@ -15641,8 +15514,8 @@ grant_user: my_parse_error(ER(ER_SYNTAX_ERROR)); MYSQL_YYABORT; } @@ -3688,7 +3697,7 @@ index 0c9e81d..765e389 100644 check_password_policy(password); /* 1. Plugin must be resolved -@@ -15611,8 +15484,8 @@ grant_user: +@@ -15662,8 +15535,8 @@ grant_user: $1->password= $5; if (!strcmp($5.str, "")) { @@ -3699,7 +3708,7 @@ index 0c9e81d..765e389 100644 check_password_policy(password); } /* -@@ -15670,7 +15543,7 @@ column_list: +@@ -15721,7 +15594,7 @@ column_list: column_list_id: ident { @@ -3708,7 +3717,7 @@ index 0c9e81d..765e389 100644 if (new_str == NULL) MYSQL_YYABORT; List_iterator iter(Lex->columns); -@@ -15880,7 +15753,6 @@ opt_union_order_or_limit: +@@ -15931,7 +15804,6 @@ opt_union_order_or_limit: union_order_or_limit: { @@ -3716,7 +3725,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; DBUG_ASSERT(lex->current_select->linkage != GLOBAL_OPTIONS_TYPE); SELECT_LEX *sel= lex->current_select; -@@ -15896,7 +15768,6 @@ union_order_or_limit: +@@ -15947,7 +15819,6 @@ union_order_or_limit: } order_or_limit { @@ -3724,7 +3733,7 @@ index 0c9e81d..765e389 100644 thd->lex->current_select->no_table_names_allowed= 0; thd->where= ""; } -@@ -16078,14 +15949,14 @@ no_definer: +@@ -16129,14 +16000,14 @@ no_definer: from older master servers (i.e. to create non-suid trigger in this case). */ @@ -3741,7 +3750,7 @@ index 0c9e81d..765e389 100644 } ; -@@ -16130,7 +16001,6 @@ view_suid: +@@ -16181,7 +16052,6 @@ view_suid: view_tail: view_suid VIEW_SYM table_ident { @@ -3749,7 +3758,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; lex->sql_command= SQLCOM_CREATE_VIEW; /* first table in list is target VIEW name */ -@@ -16174,7 +16044,6 @@ view_select: +@@ -16225,7 +16095,6 @@ view_select: } view_select_aux view_check_option { @@ -3757,7 +3766,7 @@ index 0c9e81d..765e389 100644 LEX *lex= Lex; uint len= YYLIP->get_cpp_ptr() - lex->create_view_select.str; void *create_view_select= thd->memdup(lex->create_view_select.str, len); -@@ -16266,7 +16135,6 @@ trigger_tail: +@@ -16317,7 +16186,6 @@ trigger_tail: EACH_SYM /* $13 */ ROW_SYM /* $14 */ { /* $15 */ @@ -3765,7 +3774,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; Lex_input_stream *lip= YYLIP; -@@ -16296,7 +16164,6 @@ trigger_tail: +@@ -16347,7 +16215,6 @@ trigger_tail: } sp_proc_stmt /* $16 */ { /* $17 */ @@ -3773,7 +3782,7 @@ index 0c9e81d..765e389 100644 LEX *lex= Lex; sp_head *sp= lex->sphead; -@@ -16331,7 +16198,6 @@ udf_tail: +@@ -16382,7 +16249,6 @@ udf_tail: AGGREGATE_SYM remember_name FUNCTION_SYM ident RETURNS_SYM udf_type SONAME_SYM TEXT_STRING_sys { @@ -3781,7 +3790,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; if (is_native_function(thd, & $4)) { -@@ -16349,7 +16215,6 @@ udf_tail: +@@ -16400,7 +16266,6 @@ udf_tail: | remember_name FUNCTION_SYM ident RETURNS_SYM udf_type SONAME_SYM TEXT_STRING_sys { @@ -3789,7 +3798,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; if (is_native_function(thd, & $3)) { -@@ -16372,7 +16237,6 @@ sf_tail: +@@ -16423,7 +16288,6 @@ sf_tail: sp_name /* $3 */ '(' /* $4 */ { /* $5 */ @@ -3797,7 +3806,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; lex->stmt_definition_begin= $1; -@@ -16431,7 +16295,7 @@ sf_tail: +@@ -16482,7 +16346,7 @@ sf_tail: MYSQL_YYABORT; } @@ -3806,7 +3815,7 @@ index 0c9e81d..765e389 100644 (enum enum_field_types) $11, &sp->m_return_field_def)) MYSQL_YYABORT; -@@ -16440,7 +16304,6 @@ sf_tail: +@@ -16491,7 +16355,6 @@ sf_tail: } sp_c_chistics /* $13 */ { /* $14 */ @@ -3814,7 +3823,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; lex->sphead->m_chistics= &lex->sp_chistics; -@@ -16448,7 +16311,6 @@ sf_tail: +@@ -16499,7 +16362,6 @@ sf_tail: } sp_proc_stmt /* $15 */ { @@ -3822,7 +3831,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; sp_head *sp= lex->sphead; -@@ -16506,7 +16368,6 @@ sf_tail: +@@ -16557,7 +16419,6 @@ sf_tail: sp_tail: PROCEDURE_SYM remember_name sp_name { @@ -3830,7 +3839,7 @@ index 0c9e81d..765e389 100644 LEX *lex= Lex; if (lex->sphead) -@@ -16539,7 +16400,6 @@ sp_tail: +@@ -16590,7 +16451,6 @@ sp_tail: sp_pdparam_list ')' { @@ -3838,7 +3847,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; Lex->sphead->m_parser_data.set_parameter_end_ptr( -@@ -16549,7 +16409,6 @@ sp_tail: +@@ -16600,7 +16460,6 @@ sp_tail: } sp_c_chistics { @@ -3846,7 +3855,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; lex->sphead->m_chistics= &lex->sp_chistics; -@@ -16557,7 +16416,6 @@ sp_tail: +@@ -16608,7 +16467,6 @@ sp_tail: } sp_proc_stmt { @@ -3854,7 +3863,7 @@ index 0c9e81d..765e389 100644 LEX *lex= Lex; sp_finish_parsing(thd); -@@ -16599,21 +16457,21 @@ xid: +@@ -16650,21 +16508,21 @@ xid: text_string { MYSQL_YYABORT_UNLESS($1->length() <= MAXGTRIDSIZE); diff --git a/community/pidgin-hotkeys/PKGBUILD b/community/pidgin-hotkeys/PKGBUILD index bd2130cab..98a10a1c5 100644 --- a/community/pidgin-hotkeys/PKGBUILD +++ b/community/pidgin-hotkeys/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 80723 2012-12-01 13:56:24Z fyan $ +# $Id: PKGBUILD 99153 2013-10-25 05:05:18Z fyan $ # Maintainer: Felix Yan # Contributor: Lukas Fleischer # Contributor: detto pkgname=pidgin-hotkeys pkgver=0.2.4 -pkgrel=2 +pkgrel=3 pkgdesc="A Pidgin plugin that allows you to define global hotkeys." arch=('i686' 'x86_64') url="http://pidgin-hotkeys.sourceforge.net" diff --git a/community/plank/PKGBUILD b/community/plank/PKGBUILD new file mode 100644 index 000000000..c36204e7b --- /dev/null +++ b/community/plank/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 99220 2013-10-25 21:06:18Z alucryd $ +# Maintainer: Maxime Gauduin +# Contributor: Ner0 +# Contributor: dcelasun + +pkgname=plank +pkgver=0.4.0 +pkgrel=1 +pkgdesc="Elegant, simple, clean dock" +arch=('i686' 'x86_64') +url="https://launchpad.net/plank" +license=('GPL3') +depends=('bamf' 'libdbusmenu-gtk3' 'libgee' 'python2') +makedepends=('gnome-common' 'intltool' 'vala') +install="${pkgname}.install" +source=("https://launchpad.net/${pkgname}/1.0/${pkgver}/+download/${pkgname}-${pkgver}.tar.xz") +sha256sums=('b8417bce7d88ac1f339e948c964822049a9261f9d9dedc0d0e636c73442856fe') + +prepare() { + cd ${pkgname}-${pkgver} + + sed -i 's|^#!.*python$|#!/usr/bin/python2|' $(grep -rl '^#!.*python') +} + +build() { + cd ${pkgname}-${pkgver} + + ./configure --prefix='/usr' --sysconfdir='/etc' --localstatedir='/var' + make +} + +package() { + cd ${pkgname}-${pkgver} + + make DESTDIR="${pkgdir}" install + rm -rf "${pkgdir}"/{etc,usr/share/apport} +} + +# vim: ts=2 sw=2 et: diff --git a/community/plank/plank.install b/community/plank/plank.install new file mode 100644 index 000000000..197190dd8 --- /dev/null +++ b/community/plank/plank.install @@ -0,0 +1,15 @@ +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/portaudio/PKGBUILD b/community/portaudio/PKGBUILD index 273b36d6d..e506b5ee2 100644 --- a/community/portaudio/PKGBUILD +++ b/community/portaudio/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 96889 2013-09-07 11:45:00Z bgyorgy $ +# $Id: PKGBUILD 99139 2013-10-25 01:57:21Z bisson $ # Maintainer: Lukas Fleischer # Contributor: Eric Belanger # Contributor: Darwin Bautista @@ -6,7 +6,7 @@ pkgname=portaudio pkgver=19_20111121 -pkgrel=2 +pkgrel=3 pkgdesc='A free, cross-platform, open source, audio I/O library.' arch=('i686' 'x86_64') url='http://www.portaudio.com/' diff --git a/community/proxychains/PKGBUILD b/community/proxychains/PKGBUILD index 4237a830b..5b120adc2 100644 --- a/community/proxychains/PKGBUILD +++ b/community/proxychains/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 95519 2013-08-13 06:25:46Z fyan $ +# $Id: PKGBUILD 99154 2013-10-25 05:05:19Z fyan $ # Maintainer: Felix Yan # Contributor: Michael Düll PGP-Key: AAAEE882 # Contributor: Dan Serban @@ -6,20 +6,19 @@ pkgname=proxychains pkgver=3.1 -pkgrel=6 +pkgrel=7 pkgdesc='A program proxifier: Runs programs from behind a proxy server, similar to tsocks. TCP & DNS tunneling. HTTP, SOCKS4 & SOCKS5.' url='http://proxychains.sourceforge.net/' arch=('i686' 'x86_64') license=('GPL') depends=('dnsutils') -options=('!libtool') backup=('etc/proxychains.conf') source=("http://downloads.sourceforge.net/sourceforge/proxychains/proxychains-${pkgver}.tar.gz") build() { cd proxychains-${pkgver} sed -i 's/servlen, unsigned int/servlen, int/' proxychains/libproxychains.c -# sed -i 's#export LD_PRELOAD=libproxychains.so#export LD_PRELOAD=/usr/lib/libproxychains.so#' proxychains/proxychains + #sed -i 's#export LD_PRELOAD=libproxychains.so#export LD_PRELOAD=/usr/lib/libproxychains.so#' proxychains/proxychains ./configure --prefix=/usr make } diff --git a/community/python2-xapian/PKGBUILD b/community/python2-xapian/PKGBUILD index 9e02f497c..d6c8a1882 100644 --- a/community/python2-xapian/PKGBUILD +++ b/community/python2-xapian/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 98807 2013-10-19 01:51:15Z fyan $ +# $Id: PKGBUILD 99157 2013-10-25 05:16:11Z fyan $ # Maintainer: Felix Yan # Contributor: DonVla # Contributor: Hervé Cauwelier @@ -7,7 +7,7 @@ pkgname=python2-xapian _realname=xapian-bindings pkgver=1.2.15 epoch=1 -pkgrel=1 +pkgrel=2 pkgdesc="Python bindings for Xapian" arch=(i686 x86_64) url="http://xapian.org/docs/bindings/python/" @@ -18,18 +18,18 @@ source=("http://oligarchy.co.uk/xapian/${pkgver}/${_realname}-$pkgver.tar.gz") build() { cd "$srcdir/${_realname}-$pkgver" - ./configure XAPIAN_CONFIG=/usr/bin/xapian-config \ + LDFLAGS=-lpython2.7 ./configure XAPIAN_CONFIG=/usr/bin/xapian-config \ --prefix=/usr --with-python \ PYTHON=/usr/bin/python2 make } - package() { cd "$srcdir/${_realname}-$pkgver" make DESTDIR="$pkgdir" install } + # vim:set ts=2 sw=2 et: sha512sums=('b3733308f0446fa041dcae677b3d3316bd8e775fcd1a1770ca2fab5b60e40463bbbce210cb1161161f6e9f1ff5e5473d38c2dab922b7f4f2705ac165d991c0ec') diff --git a/community/rtl-sdr/PKGBUILD b/community/rtl-sdr/PKGBUILD index 260b5c4fe..e19179288 100644 --- a/community/rtl-sdr/PKGBUILD +++ b/community/rtl-sdr/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 99108 2013-10-24 13:05:39Z kkeen $ +# $Id: PKGBUILD 99146 2013-10-25 04:57:24Z kkeen $ # Maintainer: Kyle Keen # Contributor: Michael Düll pkgname=rtl-sdr # they are just starting to play with tags # consider using tags for the pkgver in the future -pkgver=20130913 -_commit=4914b5d4314b752 -pkgrel=2 +pkgver=20131024 +_commit=dbede4e3c0a +pkgrel=1 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" @@ -28,8 +28,8 @@ build() { cd "$srcdir/$_gitname" mkdir build cd build - cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr -Wno-dev ../ - #cmake ../ -DINSTALL_UDEV_RULES=ON + cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr \ + -DINSTALL_UDEV_RULES=ON -Wno-dev ../ make } diff --git a/community/scite/PKGBUILD b/community/scite/PKGBUILD index 327c0f071..9a29bc5e1 100644 --- a/community/scite/PKGBUILD +++ b/community/scite/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 96605 2013-09-02 09:39:10Z arodseth $ +# $Id: PKGBUILD 99178 2013-10-25 10:00:48Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: Thomas S Hatch # Contributor: Corrado 'bardo' Primier @@ -6,7 +6,7 @@ # Contributor: Daniel J Griffiths pkgname=scite -pkgver=3.3.5 +pkgver=3.3.6 pkgrel=1 pkgdesc='Editor with facilities for building and running programs' arch=('x86_64' 'i686') @@ -17,7 +17,7 @@ makedepends=('setconf') backup=('usr/share/scite/SciTEGlobal.properties') install="$pkgname.install" source=("http://downloads.sourceforge.net/sourceforge/scintilla/${pkgname}${pkgver//./}.tgz") -sha256sums=('5acd167046afe7dfa280c034ab9c7dc5d1be1d548e4999c2456fb2a61468fa89') +sha256sums=('9f3f9c9867e93af37af7a59e962aad76897c9e816c683c03e922baed6be506a5') prepare() { if [ $?CXXBASEFLAGS == 1 ]; then diff --git a/community/simavr/PKGBUILD b/community/simavr/PKGBUILD index aa2e8370f..4f9a5a82a 100644 --- a/community/simavr/PKGBUILD +++ b/community/simavr/PKGBUILD @@ -1,31 +1,28 @@ # Maintainer: schuay pkgname=simavr -pkgver=1.0 -pkgrel=2 +pkgver=1.1 +pkgrel=1 pkgdesc='A lean, mean and hackable AVR simulator' arch=('i686' 'x86_64') url="https://github.com/buserror-uk/simavr" license=('GPL3') depends=('elfutils') -makedepends=('avr-libc') -source=("https://github.com/downloads/buserror-uk/simavr/$pkgname-$pkgver.tar.bz2") +makedepends=('avr-libc' 'git') +source=("${pkgname}::git+https://github.com/buserror-uk/simavr.git#tag=v${pkgver}") options=(!strip) +md5sums=('SKIP') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$pkgname" - # The original Makefile depends on git, hardcode the version until it's fixed upstream. - sed -i "s/^\(SIMAVR_VERSION\).*/\1 = ${pkgver}/" simavr/Makefile - - make AVR_ROOT=/usr/avr SIMAVR_VERSION=1.0 \ - CFLAGS="-Wall -Wextra -fPIC -std=gnu99 -Wno-sign-compare -Wno-unused-parameter" \ + make AVR_ROOT=/usr/avr RELEASE=1 \ + CFLAGS="-Wall -Wextra -fPIC -O2 -std=gnu99 -Wno-sign-compare -Wno-unused-parameter" \ build-simavr } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$pkgname" make PREFIX="/usr" DESTDIR="$pkgdir/usr" install } -md5sums=('82c9704a4e8569548f01931e32ebfe0c') diff --git a/community/synergy/PKGBUILD b/community/synergy/PKGBUILD index 2f14f1661..8066854cd 100644 --- a/community/synergy/PKGBUILD +++ b/community/synergy/PKGBUILD @@ -5,7 +5,7 @@ # Contributor: Michael Düll pkgname=synergy -pkgver=1.4.14 +pkgver=1.4.15 pkgrel=1 pkgdesc="Share a single mouse and keyboard between multiple computers" url="http://synergy-foss.org" @@ -17,7 +17,7 @@ license=('GPL2') source=("http://synergy.googlecode.com/files/$pkgname-$pkgver-Source.tar.gz" "synergys.socket" "synergys.service") -sha512sums=('3e9ca96f36573e400c9694daba026322cbf36bbabdbf69687cbadb6010834d1afd81845533775564ba7aadbf3a8be8582d9e5b9d33abfa483a174b40e084add4' +sha512sums=('857e8cbfb0b32c7dc325de5765f182f4e4fb198443b4a3e26d38c2d3dec3819e57057b91a202b53c86d4fad18154d1d58b401812dd8fabc384255e44d4b4b01a' 'f7d918faf4a25654786f270fc48b6e4089ecd1b2f504bb90de543b47a862733f7be067e06fd613d621bba48d20dc63214966e2cfbd2cb3fcbfe623d6d41f10ad' 'a10dfe5b24ac6f4a2ef3a3a9f8a6a3c432b91d5e59d1fae2258d37c5be00ac8f172656fa0d213012c7dc94ab8c04c3945ae33acfcd5db5fad8b37ccc9f5e980f') diff --git a/community/xmlrpc-c/PKGBUILD b/community/xmlrpc-c/PKGBUILD index 7083d92a4..91bc3ff40 100644 --- a/community/xmlrpc-c/PKGBUILD +++ b/community/xmlrpc-c/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 87246 2013-03-29 00:18:37Z arodseth $ +# $Id: PKGBUILD 99137 2013-10-25 01:54:42Z bisson $ # Maintainer: Alexander Rødseth # Contributor: Daenyth # Contributor: Pierre Schmitz # Contributor: Vitaliy Berdinskikh pkgname=xmlrpc-c -pkgver=1.33.03 +pkgver=1.36.00 pkgrel=1 epoch=1 pkgdesc='XML-RPC for C and C++' @@ -15,8 +15,8 @@ license=('custom') depends=('curl' 'libxml2') makedepends=('libtool' 'setconf') options=('!makeflags' '!libtool' '!emptydirs') -source=("$pkgname-advanced-$pkgver.tar.gz::http://xmlrpc-c.svn.sourceforge.net/viewvc/xmlrpc-c/advanced/?view=tar") -sha256sums=('5e52978f4c96591c9732b4e7a336a4abb75550b1403ba0ed59fb3ddd49595309') +source=('svn://svn.code.sf.net/p/xmlrpc-c/code/advanced#revision=2545') +sha1sums=('SKIP') build() { cd "$srcdir/advanced" diff --git a/community/zathura-pdf-mupdf/PKGBUILD b/community/zathura-pdf-mupdf/PKGBUILD index db543f2a9..a32bbf391 100644 --- a/community/zathura-pdf-mupdf/PKGBUILD +++ b/community/zathura-pdf-mupdf/PKGBUILD @@ -4,16 +4,22 @@ # Contributor: Moritz Lipp pkgname=zathura-pdf-mupdf -pkgver=0.2.4 +pkgver=0.2.5 pkgrel=1 pkgdesc="Adds pdf support to zathura by using the mupdf library" arch=('i686' 'x86_64') url="https://pwmt.org/projects/zathura/plugins/zathura-pdf-mupdf/" license=('custom') -depends=('mupdf>=1.1' 'zathura') +depends=('mupdf>=1.3' 'zathura' + 'jbig2dec' 'openjpeg') conflicts=('zathura-pdf-poppler') source=("https://pwmt.org/projects/zathura/plugins/download/$pkgname-$pkgver.tar.gz") -md5sums=('aa9667425dab93147dd8605eda020e59') +md5sums=('42dcdf2511ffc8f87ca6baba6c566f91') + +prepare() { + cd $srcdir/$pkgname-$pkgver + sed -i 's|openjp2|openjpeg|g' config.mk +} build() { make -C "${srcdir}/$pkgname-$pkgver" diff --git a/community/zh-autoconvert/PKGBUILD b/community/zh-autoconvert/PKGBUILD index 24afc94ae..66c87cd94 100644 --- a/community/zh-autoconvert/PKGBUILD +++ b/community/zh-autoconvert/PKGBUILD @@ -4,13 +4,12 @@ pkgname=zh-autoconvert pkgver=0.3.16 -pkgrel=2 +pkgrel=3 pkgdesc="An intelligent Chinese Encoding converter" url="http://libhz.googlecode.com/" license=('LGPL') arch=('i686' 'x86_64') depends=('glibc') -makedepends=('pkgconfig') source=(${url}/files/${pkgname}-${pkgver}.tar.gz autoconvert.patch) md5sums=('1f4aa2332afc076910b5d510b8c81966' diff --git a/community/zinnia/PKGBUILD b/community/zinnia/PKGBUILD index 48784f97b..2551cbf5f 100644 --- a/community/zinnia/PKGBUILD +++ b/community/zinnia/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 81446 2012-12-21 04:42:33Z fyan $ +# $Id: PKGBUILD 99156 2013-10-25 05:05:21Z fyan $ # Maintainer: Felix Yan # Contributor: Humbert Julien pkgname=zinnia pkgver=0.06 -pkgrel=2 +pkgrel=3 pkgdesc="Simple, customizable and portable online hand recognition system based on Support Vector Machines" arch=('i686' 'x86_64') url="http://zinnia.sourceforge.net/" diff --git a/core/acl/PKGBUILD b/core/acl/PKGBUILD index 0b5f41665..9a5deba1a 100644 --- a/core/acl/PKGBUILD +++ b/core/acl/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 188195 2013-06-12 15:53:07Z thomas $ +# $Id: PKGBUILD 197385 2013-10-25 08:24:54Z thomas $ # Maintainer: Thomas Bächler pkgname=acl pkgver=2.2.52 -pkgrel=1 +pkgrel=2 pkgdesc="Access control list utilities, libraries and headers" arch=('i686' 'x86_64') url="http://savannah.nongnu.org/projects/acl" @@ -12,7 +12,6 @@ depends=('attr>=2.4.46') replaces=('xfsacl') provides=('xfsacl') conflicts=('xfsacl') -options=('!libtool') source=("http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.src.tar.gz"{,.sig}) sha256sums=('179074bb0580c06c4b4137be4c5a92a701583277967acdb5546043c7874e0d23' 'SKIP') diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD index 3cd19c24e..6ed0ff9e7 100644 --- a/core/gcc/PKGBUILD +++ b/core/gcc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 196786 2013-10-19 06:54:05Z allan $ +# $Id: PKGBUILD 197286 2013-10-25 01:09:21Z allan $ # Maintainer: Allan McRae # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc @@ -6,7 +6,7 @@ pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-ada' 'gcc-go') pkgver=4.8.2 -pkgrel=1 +pkgrel=3 #_snapshot=4.8-20130725 pkgdesc="The GNU Compiler Collection" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ license=('GPL' 'LGPL' 'FDL' 'custom') url="http://gcc.gnu.org" makedepends=('binutils>=2.23' 'libmpc' 'cloog' 'gcc-ada' 'doxygen') checkdepends=('dejagnu' 'inetutils') -options=('!libtool' '!emptydirs') +options=('!emptydirs') source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2 #ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2 gcc-4.8-filename-output.patch) @@ -131,6 +131,7 @@ package_gcc() pkgdesc="The GNU Compiler Collection - C and C++ frontends" depends=("gcc-libs=$pkgver-$pkgrel" 'binutils>=2.23' 'libmpc' 'cloog') groups=('base-devel') + options=('staticlibs') install=gcc.install cd ${srcdir}/gcc-build @@ -152,6 +153,10 @@ package_gcc() rm $pkgdir/usr/share/info/{gccgo,gfortran,gnat*,libgomp,libquadmath,libitm}.info rm $pkgdir/usr/share/locale/{de,fr}/LC_MESSAGES/libstdc++.mo rm $pkgdir/usr/share/man/man1/{gccgo,gfortran}.1 + + # remove static libraries - note libstdc++.a is needed for the binutils and glibc testsuite + rm $pkgdir/usr/lib/lib{asan,gomp,itm,mudflap{,th},quadmath}.a + [[ $CARCH = "x86_64" ]] && rm $pkgdir/usr/lib/libtsan.a # many packages expect this symlinks ln -s gcc ${pkgdir}/usr/bin/cc @@ -199,6 +204,7 @@ package_gcc-fortran() { pkgdesc="Fortran front-end for GCC" depends=("gcc=$pkgver-$pkgrel") + options=('staticlibs' '!emptydirs') install=gcc-fortran.install cd ${srcdir}/gcc-build @@ -209,12 +215,13 @@ package_gcc-fortran() ln -s gfortran ${pkgdir}/usr/bin/f95 - # remove files included in gcc-libs or gcc + # remove files included in gcc-libs or gcc and unnneeded static lib rm ${pkgdir}/usr/lib/lib{gfortran,gcc_s}.so* rm ${pkgdir}/usr/lib/libquadmath.{a,so*} rm ${pkgdir}/usr/lib/gcc/$CHOST/${pkgver}/{*.o,libgc*} rm ${pkgdir}/usr/share/info/libquadmath.info rm -r ${pkgdir}/usr/lib/gcc/$CHOST/${pkgver}/include + rm ${pkgdir}/usr/lib/libgfortran.a # Install Runtime Library Exception install -Dm644 ${srcdir}/${_basedir}/COPYING.RUNTIME \ @@ -245,6 +252,7 @@ package_gcc-ada() { pkgdesc="Ada front-end for GCC (GNAT)" depends=("gcc=$pkgver-$pkgrel") + options=('staticlibs' '!emptydirs') install=gcc-ada.install cd ${srcdir}/gcc-build/gcc @@ -252,7 +260,7 @@ package_gcc-ada() install -m755 gnat1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver ln -s gcc ${pkgdir}/usr/bin/gnatgcc - + # Install Runtime Library Exception install -Dm644 ${srcdir}/${_basedir}/COPYING.RUNTIME \ ${pkgdir}/usr/share/licenses/gcc-ada/RUNTIME.LIBRARY.EXCEPTION @@ -262,12 +270,14 @@ package_gcc-go() { pkgdesc="Go front-end for GCC" depends=("gcc=$pkgver-$pkgrel") + options=('staticlibs' '!emptydirs') install=gcc-go.install cd ${srcdir}/gcc-build make -j1 DESTDIR=$pkgdir install-target-libgo make -j1 -C gcc DESTDIR=$pkgdir go.install-{common,man,info} install -Dm755 gcc/go1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/go1 + rm $pkgdir/usr/lib/lib{atomic,go}.a # Install Runtime Library Exception install -Dm644 ${srcdir}/${_basedir}/COPYING.RUNTIME \ diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD index c0cf2112b..a5cbade42 100644 --- a/core/glibc/PKGBUILD +++ b/core/glibc/PKGBUILD @@ -1,12 +1,14 @@ -# $Id: PKGBUILD 195163 2013-09-26 03:20:58Z allan $ +# $Id: PKGBUILD 197285 2013-10-25 01:09:19Z allan $ # Maintainer: Allan McRae # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc # NOTE: valgrind requires rebuilt with each major glibc version +# NOTE: adjust version in install script when locale files are updated + pkgname=glibc pkgver=2.18 -pkgrel=5 +pkgrel=8 pkgdesc="GNU C Library" arch=('i686' 'x86_64') url="http://www.gnu.org/software/libc" @@ -17,13 +19,14 @@ makedepends=('gcc>=4.7') backup=(etc/gai.conf etc/locale.gen etc/nscd.conf) -options=('!strip') +options=('!strip' 'staticlibs') install=glibc.install source=(http://ftp.gnu.org/gnu/libc/${pkgname}-${pkgver}.tar.xz{,.sig} + glibc-2.18-make-4.patch glibc-2.18-readdir_r-CVE-2013-4237.patch - glibc-2.18-malloc-corrupt-CVE-2013-4332.patch - glibc-2.18-strcoll-CVE-2012-4412+4424.patch - glibc-2.18-ptr-mangle-CVE-2013-4788.patch + glibc-2.18-malloc-corrupt-CVE-2013-4332.patch + glibc-2.18-strcoll-CVE-2012-4412+4424.patch + glibc-2.18-ptr-mangle-CVE-2013-4788.patch glibc-2.18-strstr-hackfix.patch nscd.service nscd.tmpfiles @@ -31,6 +34,7 @@ source=(http://ftp.gnu.org/gnu/libc/${pkgname}-${pkgver}.tar.xz{,.sig} locale-gen) md5sums=('88fbbceafee809e82efd52efa1e3c58f' 'SKIP' + 'e1883c2d1b01ff73650db5f5bb5a5a52' '154da6bf5a5248f42a7bf5bf08e01a47' 'b79561ab9dce900e9bbeaf0d49927c2b' 'c7264b99d0f7e51922a4d3126182c40a' @@ -39,11 +43,14 @@ md5sums=('88fbbceafee809e82efd52efa1e3c58f' 'd5fab2cd3abea65aa5ae696ea4a47d6b' 'da662ca76e7c8d7efbc7986ab7acea2d' '07ac979b6ab5eeb778d55f041529d623' - '476e9113489f93b348b21e144b6a8fcf') + 'b5fd017036fb91199ee76f670da8c15b') prepare() { cd ${srcdir}/${pkgname}-${pkgver} - + + # compatibility with make-4.0 (submitted upstream) + patch -p1 -i $srcdir/glibc-2.18-make-4.patch + # upstream commit 91ce4085 patch -p1 -i $srcdir/glibc-2.18-readdir_r-CVE-2013-4237.patch @@ -108,7 +115,7 @@ build() { } check() { - # bug to file - the linker commands need to be reordered + # the linker commands need to be reordered - fixed in 2.19 LDFLAGS=${LDFLAGS/--as-needed,/} cd ${srcdir}/glibc-build @@ -140,6 +147,11 @@ package() { sed -e '1,3d' -e 's|/| |g' -e 's|\\| |g' -e 's|^|#|g' \ ${srcdir}/glibc-${pkgver}/localedata/SUPPORTED >> ${pkgdir}/etc/locale.gen + # remove the static libraries that have a shared counterpart + cd $pkgdir/usr/lib + # note: keep libc, libdl, libm, libpthread for binutils testsuite + rm lib{anl,BrokenLocale,crypt,nsl,resolv,rt,util}.a + # Do not strip the following files for improved debugging support # ("improved" as in not breaking gdb and valgrind...): # ld-${pkgver}.so diff --git a/core/glibc/glibc-2.18-make-4.patch b/core/glibc/glibc-2.18-make-4.patch new file mode 100644 index 000000000..374933464 --- /dev/null +++ b/core/glibc/glibc-2.18-make-4.patch @@ -0,0 +1,45 @@ +From dc76f0c32dae689a08aa21a1d206d4cd62adb278 Mon Sep 17 00:00:00 2001 +From: Marc-Antoine Perennou +Date: Thu, 10 Oct 2013 14:26:12 +0900 +Subject: [PATCH] configure: allow building with GNU Make 4 + +Currently, configure errors telling make 4 is too old +since it does not match our regexp. + +configure.in: allow GNU Make 4.* + +Signed-off-by: Marc-Antoine Perennou +--- + configure | 2 +- + configure.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure b/configure +index 5e2f4d0..e139bf0 100755 +--- a/configure ++++ b/configure +@@ -4761,7 +4761,7 @@ $as_echo_n "checking version of $MAKE... " >&6; } + ac_prog_version=`$MAKE --version 2>&1 | sed -n 's/^.*GNU Make[^0-9]*\([0-9][0-9.]*\).*$/\1/p'` + case $ac_prog_version in + '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; +- 3.79* | 3.[89]*) ++ 3.79* | 3.[89]* | 4.*) + ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; + *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; + +diff --git a/configure.in b/configure.in +index a7f9881..95c36b6 100644 +--- a/configure.in ++++ b/configure.in +@@ -984,7 +984,7 @@ AC_CHECK_PROG_VER(CC, ${ac_tool_prefix}gcc ${ac_tool_prefix}cc, -v, + critic_missing="$critic_missing gcc") + AC_CHECK_PROG_VER(MAKE, gnumake gmake make, --version, + [GNU Make[^0-9]*\([0-9][0-9.]*\)], +- [3.79* | 3.[89]*], critic_missing="$critic_missing make") ++ [3.79* | 3.[89]* | 4.*], critic_missing="$critic_missing make") + + AC_CHECK_PROG_VER(MSGFMT, gnumsgfmt gmsgfmt msgfmt, --version, + [GNU gettext.* \([0-9]*\.[0-9.]*\)], +-- +1.8.4.1 + diff --git a/core/glibc/glibc.install b/core/glibc/glibc.install index f8147a6cf..6b405486e 100644 --- a/core/glibc/glibc.install +++ b/core/glibc/glibc.install @@ -3,7 +3,10 @@ filelist=(libc.info{,-1,-2,-3,-4,-5,-6,-7,-8,-9,-10,-11}) post_upgrade() { ldconfig -r . - locale-gen + + if [[ $(vercmp 2.18 $2) = 1 ]]; then + locale-gen + fi [[ -x usr/bin/install-info ]] || return 0 for file in ${filelist[@]}; do diff --git a/core/glibc/locale-gen b/core/glibc/locale-gen index 5aff344c4..51191f810 100755 --- a/core/glibc/locale-gen +++ b/core/glibc/locale-gen @@ -4,39 +4,53 @@ set -e LOCALEGEN=/etc/locale.gen LOCALES=/usr/share/i18n/locales -if [ -n "$POSIXLY_CORRECT" ]; then - unset POSIXLY_CORRECT -fi +unset POSIXLY_CORRECT - -[ -f $LOCALEGEN -a -s $LOCALEGEN ] || exit 0; +[ -s "$LOCALEGEN" ] || exit 0 # Remove all old locale dir and locale-archive before generating new # locale data. -rm -rf /usr/lib/locale/* || true +rm -rf /usr/lib/locale/* umask 022 -is_entry_ok() { - if [ -n "$locale" -a -n "$charset" ] ; then - true - else - echo "error: Bad entry '$locale $charset'" - false - fi +gen() { + local locale=$1 + local charset=$2 + local input= + + if [ -z "$locale" ] || [ -z "$charset" ]; then + echo "error: Bad entry '$locale $charset'" + return + fi + + printf ' %s.%s\n' "$(echo "$locale" | sed 's/\([^.\@]*\).*/\1/')" "$charset" + + if [ -f "$LOCALES/$locale" ]; then + input=$locale + else + input=$(echo $locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/') + fi + + localedef -i "$input" -c -f "$charset" -A /usr/share/locale/locale.alias "$locale" } +maxjobs=$(grep -c processor /proc/cpuinfo 2>/dev/null || echo 1) echo "Generating locales..." while read locale charset; do \ - case $locale in \#*) continue;; "") continue;; esac; \ - is_entry_ok || continue - echo -n " `echo $locale | sed 's/\([^.\@]*\).*/\1/'`"; \ - echo -n ".$charset"; \ - echo -n `echo $locale | sed 's/\([^\@]*\)\(\@.*\)*/\2/'`; \ - echo -n '...'; \ - if [ -f $LOCALES/$locale ]; then input=$locale; else \ - input=`echo $locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; fi; \ - localedef -i $input -c -f $charset -A /usr/share/locale/locale.alias $locale; \ - echo ' done'; \ + case $locale in + \#*|'') + continue + ;; + esac + gen "$locale" "$charset" & + + # keep no more than $maxjobs jobs in flight + while [ $(jobs | wc -l) -ge $maxjobs ]; do + sleep 0.25 + jobs >/dev/null + done done < $LOCALEGEN +wait + echo "Generation complete." diff --git a/extra/a52dec/PKGBUILD b/extra/a52dec/PKGBUILD index 7d4a34153..83c9d446c 100644 --- a/extra/a52dec/PKGBUILD +++ b/extra/a52dec/PKGBUILD @@ -1,17 +1,16 @@ -# $Id: PKGBUILD 191306 2013-07-23 13:24:20Z jgc $ +# $Id: PKGBUILD 197290 2013-10-25 01:17:05Z allan $ # Maintainer: # Contributor: Thomas Baechler # Contributor: Sarah Hay pkgname=a52dec pkgver=0.7.4 -pkgrel=7 +pkgrel=8 pkgdesc="A free library for decoding ATSC A/52 streams" url="http://liba52.sourceforge.net/" arch=('i686' 'x86_64') license=('GPL2') depends=('glibc') -options=(!libtool) source=("http://liba52.sourceforge.net/files/${pkgname}-${pkgver}.tar.gz" 'a52dec-0.7.4-build.patch') md5sums=('caa9f5bc44232dc8aeea773fea56be80' diff --git a/extra/audiofile/PKGBUILD b/extra/audiofile/PKGBUILD index 1528f366b..842672b01 100644 --- a/extra/audiofile/PKGBUILD +++ b/extra/audiofile/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 180118 2013-03-17 17:41:49Z schiv $ +# $Id: PKGBUILD 197359 2013-10-25 02:53:59Z bisson $ # Maintainer: Ray Rashif # Contributor: dorphell pkgname=audiofile pkgver=0.3.6 -pkgrel=1 +pkgrel=2 pkgdesc="Silicon Graphics Audio File Library" arch=('i686' 'x86_64') url="http://www.68k.org/~michael/audiofile/" diff --git a/extra/cfitsio/PKGBUILD b/extra/cfitsio/PKGBUILD index bddf6ee59..2692c2c60 100644 --- a/extra/cfitsio/PKGBUILD +++ b/extra/cfitsio/PKGBUILD @@ -1,19 +1,18 @@ -# $Id: PKGBUILD 189244 2013-07-01 10:04:11Z andrea $ +# $Id: PKGBUILD 197384 2013-10-25 03:23:34Z bisson $ # Maintainer: # Contributor: Andrea Scarpino # Contributor: Tobias Powalowski pkgname=cfitsio pkgver=3.350 -pkgrel=1 +pkgrel=2 pkgdesc="A library of C and Fortran subroutines for reading and writing data files in FITS (Flexible Image Transport System) data format" arch=('i686' 'x86_64') -url="http://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html" +url="http://heasarc.gsfc.nasa.gov/fitsio/" license=('custom') -depends=('glibc') options=('!libtool') source=("ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/${pkgname}${pkgver/./}.tar.gz") -md5sums=('3e61f17731fe8db503b1b39873e4a8c4') +sha1sums=('e928832708d6a5df21a1e17ae4a63036cab7c1b9') build() { cd ${pkgname} diff --git a/extra/dnsmasq/0001-Fix-failure-to-start-with-ENOTSOCK.patch b/extra/dnsmasq/0001-Fix-failure-to-start-with-ENOTSOCK.patch deleted file mode 100644 index 99f084930..000000000 --- a/extra/dnsmasq/0001-Fix-failure-to-start-with-ENOTSOCK.patch +++ /dev/null @@ -1,26 +0,0 @@ -From cfcad42ff1ddee8e64d120f18016a654152d0215 Mon Sep 17 00:00:00 2001 -From: Simon Kelley -Date: Fri, 17 May 2013 11:32:03 +0100 -Subject: [PATCH] Fix failure to start with ENOTSOCK - ---- - CHANGELOG | 6 ++++++ - src/dnsmasq.c | 2 +- - 2 files changed, 7 insertions(+), 1 deletion(-) - -diff --git a/src/dnsmasq.c b/src/dnsmasq.c -index 43b8cb1..b0f984d 100644 ---- a/src/dnsmasq.c -+++ b/src/dnsmasq.c -@@ -248,7 +248,7 @@ int main (int argc, char **argv) - #endif - - #if defined(HAVE_LINUX_NETWORK) && defined(HAVE_DHCP6) -- if (daemon->dhcp6) -+ if (daemon->doing_dhcp6) - bindtodevice(daemon->dhcp6fd); - #endif - } --- -1.8.3.2 - diff --git a/extra/dnsmasq/0001-Fix-wrong-size-in-memset-call.patch b/extra/dnsmasq/0001-Fix-wrong-size-in-memset-call.patch deleted file mode 100644 index 05223cdb2..000000000 --- a/extra/dnsmasq/0001-Fix-wrong-size-in-memset-call.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 71aaad9f663efda7032e27c201a7025ff6332a2d Mon Sep 17 00:00:00 2001 -From: Simon Kelley -Date: Thu, 18 Apr 2013 09:47:49 +0100 -Subject: [PATCH] Fix wrong size in memset() call. - -Thanks to Dave Reisner. ---- - src/ipset.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/ipset.c b/src/ipset.c -index a34ed96..f175fa4 100644 ---- a/src/ipset.c -+++ b/src/ipset.c -@@ -110,7 +110,7 @@ static int new_add_to_ipset(const char *setname, const struct all_addr *ipaddr, - return -1; - } - -- memset(buffer, 0, sizeof(buffer)); -+ memset(buffer, 0, BUFF_SZ); - - nlh = (struct nlmsghdr *)buffer; - nlh->nlmsg_len = NL_ALIGN(sizeof(struct nlmsghdr)); --- -1.8.2.1 - diff --git a/extra/dnsmasq/PKGBUILD b/extra/dnsmasq/PKGBUILD index 17a247520..e90179183 100644 --- a/extra/dnsmasq/PKGBUILD +++ b/extra/dnsmasq/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 189772 2013-07-07 19:08:06Z dreisner $ +# $Id: PKGBUILD 197411 2013-10-25 14:32:42Z dreisner $ # Maintainer: Dave Reisner # Contributor: Paul Mattal # Contributor: Tom Newsom pkgname=dnsmasq -pkgver=2.66 -pkgrel=2 +pkgver=2.67 +pkgrel=1 pkgdesc="Lightweight, easy to configure DNS forwarder and DHCP server" url="http://www.thekelleys.org.uk/dnsmasq/doc.html" arch=('i686' 'x86_64') @@ -14,28 +14,21 @@ depends=('glibc' 'dbus-core') install=$pkgname.install backup=('etc/dnsmasq.conf') source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.xz" - '0001-Fix-wrong-size-in-memset-call.patch' - '0001-Fix-failure-to-start-with-ENOTSOCK.patch' 'dnsmasq.service') -md5sums=('cd1c70dd66d2e3ad02b66ca6af4ebf20' - '05ccefefde68ebdebce5e40d2b3c78be' - '98cc950a6b0482eb7e61969dafb4f764' +md5sums=('3560068c6cc644a01924fa089a70bb9c' '7ac45726cabef4145db40d758cc7fedf') prepare() { cd "$pkgname-$pkgver" - patch -Np1 <"$srcdir/0001-Fix-wrong-size-in-memset-call.patch" - patch -Np1 <"$srcdir/0001-Fix-failure-to-start-with-ENOTSOCK.patch" + # link against dbus. this ugliness is needed to ensure that the + # compile time opts report properly on startup. yuck. + sed -i '/^#ifdef DNSMASQ_COMPILE_OPTS/ i#define HAVE_DBUS' src/config.h } build() { cd "$pkgname-$pkgver" - # link against dbus. this ugliness is needed to ensure that the - # compile time opts report properly on startup. yuck. - sed -i '/^#ifdef DNSMASQ_COMPILE_OPTS/ i#define HAVE_DBUS' src/config.h - make "CFLAGS=$CPPFLAGS $CFLAGS" "LDFLAGS=$LDFLAGS" } diff --git a/extra/elfutils/PKGBUILD b/extra/elfutils/PKGBUILD index 57a45fb85..5079cac65 100644 --- a/extra/elfutils/PKGBUILD +++ b/extra/elfutils/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 194689 2013-09-22 08:17:23Z lcarlier $ +# $Id: PKGBUILD 197292 2013-10-25 01:24:27Z allan $ # Maintainer: Stéphane Gaudreault # Contributor: Andrej Gelenberg pkgname=elfutils pkgver=0.156 -pkgrel=1 +pkgrel=2 pkgdesc="Libraries and utilities to handle ELF object files and DWARF debugging information" arch=('i686' 'x86_64') url="https://fedorahosted.org/elfutils/" @@ -14,6 +14,7 @@ provides=('libelf') replaces=('libelf') conflicts=('libelf') source=(https://fedorahosted.org/releases/e/l/elfutils/${pkgver}/elfutils-${pkgver}.tar.bz2{,.sig}) +options=('staticlibs') sha1sums=('48b30828eb0fb47787e45d80db05c05bbe0eaa76' 'SKIP') @@ -36,4 +37,6 @@ package() { cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install + + rm "${pkgdir}"/usr/lib/lib{asm,dw,elf}.a } diff --git a/extra/enca/PKGBUILD b/extra/enca/PKGBUILD index 754359963..42b68f841 100644 --- a/extra/enca/PKGBUILD +++ b/extra/enca/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 174764 2013-01-07 09:30:41Z giovanni $ +# $Id: PKGBUILD 197393 2013-10-25 11:15:36Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Filip Dvorak pkgname=enca -pkgver=1.14 +pkgver=1.15 pkgrel=1 pkgdesc="Charset analyser and converter" arch=('i686' 'x86_64') @@ -11,8 +11,9 @@ url="http://cihar.com/software/enca/" options=('!libtool') license=('GPL') depends=('recode') +options=('!docs') source=("http://dl.cihar.com/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('03792f25aed003d3ea33b3ce1be1f256') +md5sums=('fef132969d26e649719eae08297a4a52') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/exiv2/PKGBUILD b/extra/exiv2/PKGBUILD index b91c52182..4f7748b3c 100644 --- a/extra/exiv2/PKGBUILD +++ b/extra/exiv2/PKGBUILD @@ -1,9 +1,9 @@ -#$Id: PKGBUILD 164832 2012-08-06 23:07:10Z andrea $ +#$Id: PKGBUILD 197371 2013-10-25 03:01:26Z bisson $ # Maintainer: tobias pkgname=exiv2 pkgver=0.23 -pkgrel=1 +pkgrel=2 pkgdesc="Exif and Iptc metadata manipulation library and tools" arch=('i686' 'x86_64') url="http://exiv2.org" diff --git a/extra/ffmpeg-compat/PKGBUILD b/extra/ffmpeg-compat/PKGBUILD index 6d63a87a5..68ffd41cd 100644 --- a/extra/ffmpeg-compat/PKGBUILD +++ b/extra/ffmpeg-compat/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 193811 2013-09-02 08:57:55Z bpiotrowski $ +# $Id: PKGBUILD 197409 2013-10-25 13:13:16Z giovanni $ # Maintainer: Sergej Pupykin # Maintainer: BartÅ‚omiej Piotrowski # Contributor: Ionut Biru @@ -7,7 +7,7 @@ pkgname=ffmpeg-compat pkgver=0.10.8 -pkgrel=4 +pkgrel=5 epoch=1 pkgdesc='Complete and free Internet live audio and video broadcasting solution for Linux/Unix' arch=('i686' 'x86_64') diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD index f62f62fdb..b5e46a5fa 100644 --- a/extra/ffmpeg/PKGBUILD +++ b/extra/ffmpeg/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 196252 2013-10-09 20:32:23Z bpiotrowski $ +# $Id: PKGBUILD 197407 2013-10-25 13:06:38Z giovanni $ # Maintainer : Ionut Biru # Contributor: Tom Newsom # Contributor: Paul Mattal pkgname=ffmpeg pkgver=2.0.2 -pkgrel=2 +pkgrel=3 epoch=1 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" arch=('i686' 'x86_64') diff --git a/extra/fftw/PKGBUILD b/extra/fftw/PKGBUILD index 54a1c08ee..08943a759 100644 --- a/extra/fftw/PKGBUILD +++ b/extra/fftw/PKGBUILD @@ -1,17 +1,16 @@ -# $Id: PKGBUILD 176986 2013-02-03 11:04:50Z allan $ +# $Id: PKGBUILD 197299 2013-10-25 01:41:11Z allan $ # Maintainer: Ronald van Haren # Contributor: damir pkgname=fftw pkgver=3.3.3 -pkgrel=1 +pkgrel=2 pkgdesc="A library for computing the discrete Fourier transform (DFT)" arch=('i686' 'x86_64') license=('GPL2') url="http://www.fftw.org/" depends=('glibc' 'bash') makedepends=('gcc-fortran') -options=('!libtool') source=("http://www.fftw.org/${pkgname}-${pkgver}.tar.gz") install=fftw.install sha1sums=('11487180928d05746d431ebe7a176b52fe205cf9') diff --git a/extra/fuse/PKGBUILD b/extra/fuse/PKGBUILD index 0ab4c0cb2..fcfb387ea 100644 --- a/extra/fuse/PKGBUILD +++ b/extra/fuse/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 191856 2013-07-31 16:26:31Z bpiotrowski $ +# $Id: PKGBUILD 197300 2013-10-25 01:41:17Z allan $ # Maintainer: Ronald van Haren # Contributor: Tom Gundersen # Contributor: Mark Rosenstand pkgname=fuse pkgver=2.9.3 -pkgrel=1 +pkgrel=2 pkgdesc="A library that makes it possible to implement a filesystem in a userspace program." arch=('i686' 'x86_64') url="http://fuse.sourceforge.net/" @@ -15,7 +15,6 @@ makedepends=('pkg-config') backup=(etc/fuse.conf) source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz 'fuse.conf') -options=(!libtool) sha1sums=('94bd1974a9f2173ac3c2cf122f9fa3c35996b88e' '3b42e37a741d4651099225987dc40e7f02a716ad') diff --git a/extra/gd/PKGBUILD b/extra/gd/PKGBUILD index 7dd51bbe8..d2704cdb6 100644 --- a/extra/gd/PKGBUILD +++ b/extra/gd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 189861 2013-07-10 07:26:52Z bpiotrowski $ +# $Id: PKGBUILD 197382 2013-10-25 03:14:56Z bisson $ # Maintainer: Eric Belanger pkgname=gd pkgver=2.1.0 -pkgrel=1 +pkgrel=2 pkgdesc="Library for the dynamic creation of images by programmers" arch=('i686' 'x86_64') url="http://www.libgd.org/" diff --git a/extra/geoip/PKGBUILD b/extra/geoip/PKGBUILD index bfef8fbc1..c100284f9 100644 --- a/extra/geoip/PKGBUILD +++ b/extra/geoip/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 194736 2013-09-23 12:28:32Z jgc $ +# $Id: PKGBUILD 197302 2013-10-25 01:44:22Z allan $ # Maintainer: Dan McGee # Contributor: Manolis Tzanidakis pkgname=geoip pkgver=1.5.1 -pkgrel=1 +pkgrel=2 pkgdesc="Non-DNS IP-to-country resolver C library & utils" arch=('i686' 'x86_64') url="http://www.maxmind.com/app/c" license=('GPL') depends=('zlib' 'geoip-database') backup=('etc/geoip/GeoIP.conf') -options=('!libtool' '!emptydirs') +options=('!emptydirs') source=(http://www.maxmind.com/download/geoip/api/c/GeoIP-$pkgver.tar.gz pkgconfig.patch) sha256sums=('ec35ee73fcc54c493f4252565d1c81d022b398dd16de3af1522c8cab016f8731' diff --git a/extra/giblib/PKGBUILD b/extra/giblib/PKGBUILD index 7deebc84e..406d2779d 100644 --- a/extra/giblib/PKGBUILD +++ b/extra/giblib/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 137679 2011-09-10 11:58:36Z pierre $ +# $Id: PKGBUILD 197352 2013-10-25 02:50:40Z bisson $ # Maintainer: Giovanni Scafora # Contributor: Tom Newsom pkgname=giblib pkgver=1.2.4 -pkgrel=5 +pkgrel=6 pkgdesc="A library that feh uses as a wrapper to imlib2" arch=('i686' 'x86_64') url="http://freshmeat.net/projects/giblib/" diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD index 0ffcc7d61..6ccca8b21 100644 --- a/extra/gnutls/PKGBUILD +++ b/extra/gnutls/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 193808 2013-09-02 08:07:32Z andyrtr $ +# $Id: PKGBUILD 197414 2013-10-25 18:23:04Z andyrtr $ # Maintainer: Jan de Groot # Maintainer: Andreas Radke pkgname=gnutls -pkgver=3.2.4 +pkgver=3.2.5 pkgrel=1 pkgdesc="A library which provides a secure layer over a reliable transport layer" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ options=('!libtool' '!zipman') depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle' 'p11-kit') makedepends=('valgrind' 'strace' 'datefudge') source=(ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/${pkgname}-${pkgver}.tar.xz{,.sig}) -md5sums=('79ef8538d65128b7ed47046649b98c27' +md5sums=('c7c367ee06f7f05ddb1e36a444a142ed' 'SKIP') build() { diff --git a/extra/gsl/PKGBUILD b/extra/gsl/PKGBUILD index 3df3f01c4..fa9b4a28f 100644 --- a/extra/gsl/PKGBUILD +++ b/extra/gsl/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 171358 2012-11-17 09:32:49Z eric $ +# $Id: PKGBUILD 197374 2013-10-25 03:04:27Z bisson $ # Maintainer: Ronald van Haren # Contributor: Juergen Hoetzel # Contributor: Tom Newsom pkgname=gsl pkgver=1.15 -pkgrel=2 +pkgrel=3 pkgdesc="The GNU Scientific Library (GSL) is a modern numerical library for C and C++ programmers" url="http://www.gnu.org/software/gsl/gsl.html" -source=("http://ftp.belnet.be/mirror/ftp.gnu.org/gnu/gsl/$pkgname-$pkgver.tar.gz") +source=("http://ftp.gnu.org/gnu/gsl/$pkgname-$pkgver.tar.gz") install=gsl.install license=('GPL') arch=('i686' 'x86_64') diff --git a/extra/gupnp-igd/PKGBUILD b/extra/gupnp-igd/PKGBUILD index 45297def4..9658f1f09 100644 --- a/extra/gupnp-igd/PKGBUILD +++ b/extra/gupnp-igd/PKGBUILD @@ -1,33 +1,32 @@ -# $Id: PKGBUILD 183422 2013-04-21 22:11:03Z heftig $ +# $Id: PKGBUILD 197430 2013-10-25 20:13:38Z eric $ # Maintainer: Eric Bélanger -# Contributor: William Díaz pkgname=gupnp-igd pkgver=0.2.2 -pkgrel=1 +pkgrel=2 pkgdesc="A library to handle UPnP IGD port mapping" -arch=(i686 x86_64) +arch=('i686' 'x86_64') url="http://www.gupnp.org" -license=(LGPL) -depends=(gupnp python2-gobject2) -makedepends=(gettext) -options=('!libtool' '!makeflags') -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz) +license=('LGPL') +depends=('gupnp' 'python2-gobject2') +makedepends=('gobject-introspection') +options=('!makeflags') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver::3}/${pkgname}-${pkgver}.tar.xz) sha1sums=('bd24e98b224b3a233b0ab6714638ed4c6bf64b47') build() { - cd $pkgname-$pkgver + cd ${pkgname}-${pkgver} PYTHON=python2 ./configure --prefix=/usr make } check() { - cd $pkgname-$pkgver + cd ${pkgname}-${pkgver} make check } package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install + cd ${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install } diff --git a/extra/id3lib/PKGBUILD b/extra/id3lib/PKGBUILD index a8768b8bf..ec3027fcf 100644 --- a/extra/id3lib/PKGBUILD +++ b/extra/id3lib/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 151326 2012-02-25 14:15:27Z pierre $ +# $Id: PKGBUILD 197340 2013-10-25 02:40:25Z bisson $ # Contributor: Jochem Kossen pkgname=id3lib pkgver=3.8.3 -pkgrel=12 +pkgrel=13 pkgdesc="An open-source, cross-platform software development library for reading, writing, and manipulating ID3v1 and ID3v2 tags" arch=('i686' 'x86_64') license=('LGPL') diff --git a/extra/imlib2/PKGBUILD b/extra/imlib2/PKGBUILD index b38af74ae..2692d0b60 100644 --- a/extra/imlib2/PKGBUILD +++ b/extra/imlib2/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 191920 2013-08-01 06:59:49Z bpiotrowski $ +# $Id: PKGBUILD 197304 2013-10-25 02:05:00Z bisson $ # Maintainer: Ronald van Haren # Contributor: Arjan Timmerman # Contributor: Tom Newsom pkgname=imlib2 pkgver=1.4.5 -pkgrel=5 +pkgrel=6 pkgdesc="Library that does image file loading and saving as well as rendering, manipulation, arbitrary polygon support" url="http://sourceforge.net/projects/enlightenment/" arch=('i686' 'x86_64') diff --git a/extra/lame/PKGBUILD b/extra/lame/PKGBUILD index 7a090e7b4..6f5ffde79 100644 --- a/extra/lame/PKGBUILD +++ b/extra/lame/PKGBUILD @@ -1,18 +1,17 @@ -# $Id: PKGBUILD 151868 2012-03-03 15:54:16Z schiv $ +# $Id: PKGBUILD 197314 2013-10-25 02:23:01Z allan $ # Maintainer: Ray Rashif # Contributor: Ionut Biru # Contributor: Hugo Doria pkgname=lame pkgver=3.99.5 -pkgrel=1 +pkgrel=2 pkgdesc="A high quality MPEG Audio Layer III (MP3) encoder" arch=('i686' 'x86_64') url="http://lame.sourceforge.net/" depends=('ncurses') makedepends=('nasm') license=('LGPL') -options=('!libtool') source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz") md5sums=('84835b313d4a8b68f5349816d33e07ce') diff --git a/extra/lcms/PKGBUILD b/extra/lcms/PKGBUILD index 7271ad881..3a6e6b248 100644 --- a/extra/lcms/PKGBUILD +++ b/extra/lcms/PKGBUILD @@ -1,16 +1,15 @@ -# $Id: PKGBUILD 193922 2013-09-06 07:11:54Z bpiotrowski $ +# $Id: PKGBUILD 197316 2013-10-25 02:23:38Z allan $ # Maintainer: Tobias Kieslich # Contributor: Ben pkgname=lcms pkgver=1.19 -pkgrel=4 +pkgrel=5 pkgdesc="Lightweight color management development library/engine" arch=('i686' 'x86_64') license=('custom') depends=('libtiff') url="http://www.littlecms.com" -options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz cve-2013-4276.patch) md5sums=('8af94611baf20d9646c7c2c285859818' diff --git a/extra/libass/PKGBUILD b/extra/libass/PKGBUILD index 2985c3914..6e5812ea7 100644 --- a/extra/libass/PKGBUILD +++ b/extra/libass/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 174504 2013-01-05 07:26:20Z giovanni $ +# $Id: PKGBUILD 197391 2013-10-25 11:10:08Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: G_Syme pkgname=libass -pkgver=0.10.1 +pkgver=0.10.2 pkgrel=1 pkgdesc="A portable library for SSA/ASS subtitles rendering" arch=('i686' 'x86_64') @@ -11,9 +11,8 @@ url="http://code.google.com/p/libass/" license=('BSD') depends=('enca' 'fontconfig' 'fribidi') makedepends=('pkg-config') -options=(!libtool) source=("http://libass.googlecode.com/files/${pkgname}-${pkgver}.tar.xz") -md5sums=('0f54b1f3a24fa897ebbbcc5bc744b32a') +md5sums=('ce672ed5629c9708b3401b976f516744') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/libbsd/PKGBUILD b/extra/libbsd/PKGBUILD index 3d665b7a2..cc7b99336 100644 --- a/extra/libbsd/PKGBUILD +++ b/extra/libbsd/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 193609 2013-08-25 22:20:49Z allan $ +# $Id: PKGBUILD 197324 2013-10-25 02:28:32Z allan $ # Maintainer: Sven-Hendrik Haase # Contributor: Gerardo Exequiel Pozzi pkgname=libbsd pkgver=0.6.0 -pkgrel=1 +pkgrel=2 pkgdesc="Provides useful functions commonly found on BSD systems like strlcpy()" arch=('i686' 'x86_64') url="http://libbsd.freedesktop.org" license=('custom') depends=('glibc') -options=('!libtool') +options=('staticlibs') source=(http://libbsd.freedesktop.org/releases/$pkgname-$pkgver.tar.xz{,.asc}) md5sums=('f6c75f0a9818e323a589bcbd560a0eb4' 'SKIP') @@ -32,6 +32,7 @@ package() { cd $pkgname-$pkgver make DESTDIR="$pkgdir" install + rm "${pkgdir}"/usr/lib/libbsd.a install -D -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } diff --git a/extra/libcdaudio/PKGBUILD b/extra/libcdaudio/PKGBUILD index 2a287e556..09b8d1ad7 100644 --- a/extra/libcdaudio/PKGBUILD +++ b/extra/libcdaudio/PKGBUILD @@ -1,16 +1,15 @@ -# $Id: PKGBUILD 150528 2012-02-18 12:08:44Z pierre $ +# $Id: PKGBUILD 197332 2013-10-25 02:34:27Z allan $ # Maintainer: # Contributor Sarah Hay pkgname=libcdaudio pkgver=0.99.12 -pkgrel=6 +pkgrel=7 pkgdesc="Library for controlling Audio CDs and interacting with CDDB" arch=('i686' 'x86_64') url="http://libcdaudio.sourceforge.net/" license=('GPL') depends=('glibc') -options=('!libtool') source=("http://downloads.sourceforge.net/sourceforge/libcdaudio/${pkgname}-${pkgver}.tar.gz" '01-cddb-bufferoverflow.patch' '02-cddb-bufferoverflow.patch') diff --git a/extra/libcddb/PKGBUILD b/extra/libcddb/PKGBUILD index 51b3b7d02..e4d85cd1d 100644 --- a/extra/libcddb/PKGBUILD +++ b/extra/libcddb/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 137919 2011-09-12 12:54:52Z pierre $ +# $Id: PKGBUILD 197334 2013-10-25 02:35:39Z allan $ # Maintainer: Hugo Doria # Contributor: Sarah Hay pkgname=libcddb pkgver=1.3.2 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') pkgdesc="Library that implements the different protocols (CDDBP, HTTP, SMTP) to access data on a CDDB server (e.g. http://freedb.org)." url="http://sourceforge.net/projects/libcddb/" diff --git a/extra/libdv/PKGBUILD b/extra/libdv/PKGBUILD index fdeec4a35..770097ca6 100644 --- a/extra/libdv/PKGBUILD +++ b/extra/libdv/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 150457 2012-02-17 23:44:16Z allan $ +# $Id: PKGBUILD 197341 2013-10-25 02:40:30Z allan $ # Maintainer: # Contributor: Tom Newsom pkgname=libdv pkgver=1.0.0 -pkgrel=4 +pkgrel=5 pkgdesc="The Quasar DV codec (libdv) is a software codec for DV video" arch=('i686' 'x86_64') url="http://libdv.sourceforge.net/" @@ -12,7 +12,6 @@ license=('LGPL') depends=('popt') makedepends=('pkg-config' 'gtk' 'libxv') optdepends=('gtk: for using playdv' 'libxv: for using playdv') -options=('!libtool') source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz) md5sums=('f895162161cfa4bb4a94c070a7caa6c7') diff --git a/extra/libebml/PKGBUILD b/extra/libebml/PKGBUILD index d4baabe56..66bb5bc6e 100644 --- a/extra/libebml/PKGBUILD +++ b/extra/libebml/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 180600 2013-03-24 12:10:12Z giovanni $ +# $Id: PKGBUILD 197369 2013-10-25 03:00:48Z bisson $ # Maintainer: Giovanni Scafora # Contributor: 03/08/04 pkgname=libebml pkgver=1.3.0 -pkgrel=1 +pkgrel=2 pkgdesc="Extensible Binary Meta Language library" arch=('i686' 'x86_64') url="http://dl.matroska.org/downloads/libebml/" diff --git a/extra/libexif/PKGBUILD b/extra/libexif/PKGBUILD index 6fd0d675d..f3b485e78 100644 --- a/extra/libexif/PKGBUILD +++ b/extra/libexif/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 165030 2012-08-09 08:16:11Z jgc $ +# $Id: PKGBUILD 197336 2013-10-25 02:39:03Z bisson $ # Maintainer: Jan de Groot # Contributor: Tobias Kieslich pkgname=libexif pkgver=0.6.21 -pkgrel=1 +pkgrel=2 pkgdesc="A library to parse an EXIF file and read the data from those tags" arch=(i686 x86_64) license=('LGPL') diff --git a/extra/libftdi/PKGBUILD b/extra/libftdi/PKGBUILD index 61165b225..47e8a7584 100644 --- a/extra/libftdi/PKGBUILD +++ b/extra/libftdi/PKGBUILD @@ -1,16 +1,15 @@ -# $Id: PKGBUILD 153977 2012-03-21 07:09:24Z eric $ +# $Id: PKGBUILD 197346 2013-10-25 02:47:00Z allan $ # Contributor: Tobias Powalowski pkgname=libftdi pkgver=0.20 -pkgrel=1 +pkgrel=2 pkgdesc="A library to talk to FTDI chips" arch=('i686' 'x86_64') url="http://www.intra2net.com/en/developer/libftdi/download.php" license=('GPL2' 'LGPL2.1') depends=('libusb-compat' 'gcc-libs') makedepends=('boost') -options=('!libtool') source=(http://www.intra2net.com/en/developer/libftdi/download/$pkgname-$pkgver.tar.gz{,.sig}) sha1sums=('4bc6ce70c98a170ada303fbd00b8428d8a2c1aa2' '807d145147c9bee08b4cea4d7ca82ccaf1330f02') diff --git a/extra/libglade/PKGBUILD b/extra/libglade/PKGBUILD index 182b6718e..c72cc5b5c 100644 --- a/extra/libglade/PKGBUILD +++ b/extra/libglade/PKGBUILD @@ -1,16 +1,15 @@ -# $Id: PKGBUILD 151071 2012-02-24 17:50:27Z ibiru $ +# $Id: PKGBUILD 197348 2013-10-25 02:47:37Z allan $ # Maintainer: Jan de Groot pkgname=libglade pkgver=2.6.4 -pkgrel=3 +pkgrel=4 pkgdesc="Allows you to load glade interface files in a program at runtime" arch=(i686 x86_64) license=('LGPL') depends=('gtk2>=2.16.0' 'libxml2>=2.7.3') makedepends=('python2' 'pkgconfig') optdepends=('python2: libglade-convert script') -options=('!libtool') install=glade.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.6/${pkgname}-${pkgver}.tar.bz2 libglade-2.0.1-nowarning.patch) diff --git a/extra/libid3tag/PKGBUILD b/extra/libid3tag/PKGBUILD index 6f2b92906..68c14b637 100644 --- a/extra/libid3tag/PKGBUILD +++ b/extra/libid3tag/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 150540 2012-02-18 12:17:15Z pierre $ +# $Id: PKGBUILD 197319 2013-10-25 02:25:22Z bisson $ # Maintainer: # Contributor: dorphell pkgname=libid3tag pkgver=0.15.1b -pkgrel=7 +pkgrel=8 pkgdesc="library for id3 tagging" arch=('i686' 'x86_64') url="http://www.underbit.com/products/mad/" diff --git a/extra/libidl2/PKGBUILD b/extra/libidl2/PKGBUILD index d52fb7450..1b279642a 100644 --- a/extra/libidl2/PKGBUILD +++ b/extra/libidl2/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 150449 2012-02-17 23:08:28Z allan $ +# $Id: PKGBUILD 197354 2013-10-25 02:51:47Z allan $ # Maintainer: # Committer: Judd Vinet pkgname=libidl2 pkgver=0.8.14 -pkgrel=2 +pkgrel=3 pkgdesc="A front-end for CORBA 2.2 IDL and Netscape's XPIDL" arch=('i686' 'x86_64') license=('LGPL') depends=('glib2' 'texinfo') makedepends=('pkg-config') install=libidl2.install -options=('!libtool' '!emptydirs') +options=('!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/libIDL/0.8/libIDL-${pkgver}.tar.bz2) url="http://www.gnome.org" sha256sums=('c5d24d8c096546353fbc7cedf208392d5a02afe9d56ebcc1cccb258d7c4d2220') diff --git a/extra/libidn/PKGBUILD b/extra/libidn/PKGBUILD index ad516863b..d94c18904 100644 --- a/extra/libidn/PKGBUILD +++ b/extra/libidn/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 194235 2013-09-11 07:58:33Z bpiotrowski $ +# $Id: PKGBUILD 197347 2013-10-25 02:47:29Z bisson $ # Maintainer: Ronald van Haren # Contributor: Jan de Groot # Contributor: Eric Johnson pkgname=libidn pkgver=1.28 -pkgrel=1 +pkgrel=2 pkgdesc="Implementation of the Stringprep, Punycode and IDNA specifications" url="http://www.gnu.org/software/libidn/" arch=('i686' 'x86_64') diff --git a/extra/libisoburn/PKGBUILD b/extra/libisoburn/PKGBUILD index 97b2b507a..801c1a5ad 100644 --- a/extra/libisoburn/PKGBUILD +++ b/extra/libisoburn/PKGBUILD @@ -1,15 +1,18 @@ -# $Id: PKGBUILD 197089 2013-10-21 18:35:00Z andyrtr $ +# $Id: PKGBUILD 197415 2013-10-25 18:23:05Z andyrtr $ # Maintainer: Andreas Radke # Contributor: Gour pkgname=libisoburn pkgver=1.3.2 -pkgrel=2 +pkgrel=3 pkgdesc="frontend for libraries libburn and libisofs" url="http://libburnia-project.org" arch=('i686' 'x86_64') license=('GPL2') depends=('libburn>=1.3.2' 'libisofs>=1.3.2' 'readline') +optdepends=('tk: for xorriso-tcltk frontend' + 'bwidget: for xorriso-tcltk frontend') +provides=('xorriso' 'xorriso-tcltk') install=${pkgname}.install source=(http://files.libburnia-project.org/releases/${pkgname}-${pkgver}.tar.gz{,.sig}) md5sums=('7ebee7c1d4e09565daddca15467035af' diff --git a/extra/libmatroska/PKGBUILD b/extra/libmatroska/PKGBUILD index 88a3c5b8c..331e7f088 100644 --- a/extra/libmatroska/PKGBUILD +++ b/extra/libmatroska/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 180602 2013-03-24 12:53:07Z giovanni $ +# $Id: PKGBUILD 197329 2013-10-25 02:33:41Z bisson $ # Maintainer: Giovanni Scafora # Contributor 03/08/04 pkgname=libmatroska pkgver=1.4.0 -pkgrel=1 +pkgrel=2 pkgdesc="Matroska library" arch=('i686' 'x86_64') url="http://dl.matroska.org/downloads/libmatroska/" diff --git a/extra/libmtp/PKGBUILD b/extra/libmtp/PKGBUILD index 7e1d664aa..c4aa6dab9 100644 --- a/extra/libmtp/PKGBUILD +++ b/extra/libmtp/PKGBUILD @@ -1,17 +1,16 @@ -# $Id: PKGBUILD 180848 2013-03-26 23:07:40Z tomegun $ +# $Id: PKGBUILD 197376 2013-10-25 03:06:01Z allan $ # Maintainer: Tom Gundersen # Contributor: damir # Contributor: Kevin Edmonds pkgname=libmtp pkgver=1.1.6 -pkgrel=1 +pkgrel=2 pkgdesc="Library implementation of the Media Transfer Protocol" arch=("i686" "x86_64") url="http://libmtp.sourceforge.net" license=('LGPL') depends=('libusb' 'libgcrypt') -options=('!libtool') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz") build() { diff --git a/extra/libogg/PKGBUILD b/extra/libogg/PKGBUILD index f9c7b1611..e32bf6c93 100644 --- a/extra/libogg/PKGBUILD +++ b/extra/libogg/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 186983 2013-06-02 16:07:31Z tomegun $ +# $Id: PKGBUILD 197322 2013-10-25 02:26:33Z bisson $ # Maintainer: Tom Gundersen # Contributor: John Proctor pkgname=libogg pkgver=1.3.1 -pkgrel=1 +pkgrel=2 pkgdesc="Ogg bitstream and framing library" arch=('i686' 'x86_64') url="http://www.xiph.org/ogg/" diff --git a/extra/libshout/PKGBUILD b/extra/libshout/PKGBUILD index d2f0f675d..22eb626be 100644 --- a/extra/libshout/PKGBUILD +++ b/extra/libshout/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 168008 2012-10-05 06:33:28Z eric $ +# $Id: PKGBUILD 197378 2013-10-25 03:06:40Z bisson $ # Maintainer: Giovanni Scafora # Contributor: arjan # Contributor: Jason Chu pkgname=libshout pkgver=2.3.1 -pkgrel=1 +pkgrel=2 epoch=1 pkgdesc="Library for accessing a shoutcast/icecast server" arch=('i686' 'x86_64') diff --git a/extra/libunistring/PKGBUILD b/extra/libunistring/PKGBUILD index 5cbc2003a..099684d24 100644 --- a/extra/libunistring/PKGBUILD +++ b/extra/libunistring/PKGBUILD @@ -6,7 +6,7 @@ pkgname=libunistring pkgver=0.9.3 -pkgrel=5 +pkgrel=6 pkgdesc="Library for manipulating Unicode strings and C strings." url="http://www.gnu.org/software/libunistring/" arch=('i686' 'x86_64') diff --git a/extra/libutempter/PKGBUILD b/extra/libutempter/PKGBUILD index 8d5145a0a..bbc27d9b1 100644 --- a/extra/libutempter/PKGBUILD +++ b/extra/libutempter/PKGBUILD @@ -3,7 +3,7 @@ pkgname=libutempter pkgver=1.1.6 -pkgrel=1 +pkgrel=2 pkgdesc="Interface for terminal emulators such as screen and xterm to record user sessions to utmp and wtmp files" arch=('i686' 'x86_64') url="ftp://ftp.altlinux.org/pub/people/ldv/utempter" diff --git a/extra/libvpx/PKGBUILD b/extra/libvpx/PKGBUILD index 9caafb1af..98dfbece2 100644 --- a/extra/libvpx/PKGBUILD +++ b/extra/libvpx/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 185107 2013-05-11 07:24:48Z bpiotrowski $ +# $Id: PKGBUILD 197350 2013-10-25 02:49:53Z bisson $ # Maintainer: Ionut Biru pkgname=libvpx pkgver=1.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="The VP8 Codec SDK" arch=('i686' 'x86_64') url="http://www.webmproject.org/" diff --git a/extra/libwmf/PKGBUILD b/extra/libwmf/PKGBUILD index 879d27a35..da462db95 100644 --- a/extra/libwmf/PKGBUILD +++ b/extra/libwmf/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 184410 2013-05-06 19:38:42Z foutrelis $ +# $Id: PKGBUILD 197279 2013-10-25 00:22:10Z eric $ # Maintainer: Eric Bélanger pkgname=libwmf pkgver=0.2.8.4 -pkgrel=10 +pkgrel=12 pkgdesc="A library for reading vector images in Microsoft's native Windows Metafile Format (WMF)" arch=('i686' 'x86_64') url="http://wvware.sourceforge.net/libwmf.html" license=('LGPL') -depends=('libpng' 'libx11' 'libjpeg' 'gsfonts') +depends=('libx11' 'libjpeg' 'gsfonts') makedepends=('gtk2' 'libxt') optdepends=('gdk-pixbuf2: for pixbuf loader') -options=('!libtool' '!docs' '!emptydirs') +options=('!docs' '!emptydirs') install=libwmf.install source=(http://downloads.sourceforge.net/sourceforge/wvware/${pkgname}-${pkgver}.tar.gz libwmf-0.2.8.4-libpng-1.5.patch libwmf-0.2.8.4-useafterfree.patch) @@ -30,7 +30,7 @@ build() { ./configure --prefix=/usr \ --with-gsfontdir=/usr/share/fonts/Type1 \ --with-fontdir=/usr/share/fonts/Type1 \ - --with-gsfontmap=/usr/share/ghostscript/9.07/Resource/Init/Fontmap.GS + --with-gsfontmap=/usr/share/ghostscript/9.10/Resource/Init/Fontmap.GS make } @@ -39,6 +39,4 @@ package() { make DESTDIR="${pkgdir}" install #Remove fonts, these are in gsfonts rm -rf "${pkgdir}/usr/share/fonts" - #Remove static GTK loader, can't use it anyways - rm -f "${pkgdir}"/usr/lib/gtk-2.0/*/loaders/io-wmf.a } diff --git a/extra/libxml2/PKGBUILD b/extra/libxml2/PKGBUILD index f325ea772..ba4bf184b 100644 --- a/extra/libxml2/PKGBUILD +++ b/extra/libxml2/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 187170 2013-06-04 17:39:43Z bpiotrowski $ +# $Id: PKGBUILD 197380 2013-10-25 03:14:08Z bisson $ # Maintainer: Jan de Groot # Maintainer: Tom Gundersen # Contributor: John Proctor pkgname=libxml2 pkgver=2.9.1 -pkgrel=2 +pkgrel=3 pkgdesc="XML parsing library, version 2" arch=(i686 x86_64) license=('MIT') diff --git a/extra/libxslt/PKGBUILD b/extra/libxslt/PKGBUILD index 10007a312..4b5ddac26 100644 --- a/extra/libxslt/PKGBUILD +++ b/extra/libxslt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 184790 2013-05-08 14:12:44Z bpiotrowski $ +# $Id: PKGBUILD 197357 2013-10-25 02:53:25Z bisson $ # Maintainer: Eric Belanger # Contributor: John Proctor pkgname=libxslt pkgver=1.1.28 -pkgrel=1 +pkgrel=2 pkgdesc="XML stylesheet transformation library" arch=('i686' 'x86_64') url="http://xmlsoft.org/XSLT/" diff --git a/extra/physfs/PKGBUILD b/extra/physfs/PKGBUILD index 85cbf0fcf..c51501e6b 100644 --- a/extra/physfs/PKGBUILD +++ b/extra/physfs/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 1214 2009-08-14 01:36:33Z dgriffiths $ +# $Id: PKGBUILD 197284 2013-10-25 00:41:39Z eric $ # Maintainer: Eric Bélanger pkgname=physfs pkgver=2.0.3 -pkgrel=1 +pkgrel=2 pkgdesc="A library to provide abstract access to various archives" arch=('i686' 'x86_64') url="http://icculus.org/physfs/" @@ -14,15 +14,16 @@ source=(http://icculus.org/physfs/downloads/${pkgname}-${pkgver}.tar.bz2) sha1sums=('327308c777009a41bbabb9159b18c4c0ac069537') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - cmake . -DCMAKE_BUILD_TYPE=Release \ + mkdir build + cd build + cmake ../${pkgname}-${pkgver} -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DPHYSFS_BUILD_TEST=OFF -DPHYSFS_BUILD_WX_TEST=OFF make all docs } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd build make DESTDIR="${pkgdir}" install install -d "${pkgdir}"/usr/share/{doc/physfs,man/man3} install -m644 docs/html/* "${pkgdir}/usr/share/doc/physfs" @@ -32,5 +33,5 @@ package() { mv "${pkgdir}/usr/share/man/man3/$i.3" "${pkgdir}/usr/share/man/man3/PHYSFS_$i.3" done - install -D -m644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -D -m644 ../${pkgname}-${pkgver}/LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/portmidi/PKGBUILD b/extra/portmidi/PKGBUILD index ac16436ff..bf08d19b5 100644 --- a/extra/portmidi/PKGBUILD +++ b/extra/portmidi/PKGBUILD @@ -1,46 +1,38 @@ -# $Id: PKGBUILD 170712 2012-11-10 01:03:47Z eric $ -# Maintainer: Lukas Fleischer -# Contributor: SpepS -# Contributor: Denis Martinez +# $Id: PKGBUILD 197308 2013-10-25 02:13:59Z eric $ +# Maintainer: Eric Bélanger pkgname=portmidi pkgver=217 -pkgrel=3 -pkgdesc="Platform independent library for real-time MIDI input/output." +pkgrel=4 +pkgdesc="Platform independent library for real-time MIDI input/output" arch=('i686' 'x86_64') -url='http://portmedia.sourceforge.net/' +url="http://portmedia.sourceforge.net/" license=('GPL') depends=('alsa-lib') makedepends=('cmake' 'java-environment') -source=("http://downloads.sourceforge.net/project/portmedia/${pkgname}/${pkgver}/${pkgname}-src-${pkgver}.zip" - 'portmidi-217-build-fix.patch') -md5sums=('03f46fd3947e2ef4c8c465baaf832241' - '59cb428b29a33bab3bb5811cda479a9b') - -build() { - cd "${srcdir}/${pkgname}" - - sed -i "s#/usr/local#/usr#" */CMakeLists.txt pm_python/setup.py - mkdir -p pm_java/Release - +optdepends=('java-runtime: for using pmdefaults') +source=(http://downloads.sourceforge.net/project/portmedia/${pkgname}/${pkgver}/${pkgname}-src-${pkgver}.zip + portmidi-217-build-fix.patch) +sha1sums=('f45bf4e247c0d7617deacd6a65d23d9fddae6117' + '7fe10874ea8689e1ba51e8f50da38e79d10b76e1') + +prepare() { + cd ${pkgname} # build fix for "pm_java/CMakeLists.txt" (fixes FS#27118) - patch -p1 -i ../portmidi-217-build-fix.patch - - cmake . -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY=Release \ - -DCMAKE_LIBRARY_OUTPUT_DIRECTORY=Release \ - -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=Release + patch -p1 -i "${srcdir}/portmidi-217-build-fix.patch" +} +build() { + cd ${pkgname} + cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release \ + -DPORTMIDI_ENABLE_TEST=OFF -DPORTMIDI_ENABLE_JAVA=ON make } package() { - cd "${srcdir}/${pkgname}" - + cd ${pkgname} make DESTDIR="${pkgdir}" install # Fix missing symlink for libporttime.so (FS#21528). - mv "${pkgdir}/usr/lib/libportmidi_s.a" "${pkgdir}/usr/lib/libportmidi.a" - ln -s "/usr/lib/libportmidi.so" "${pkgdir}/usr/lib/libporttime.so" - ln -s "/usr/lib/libportmidi.a" "${pkgdir}/usr/lib/libporttime.a" + ln -s libportmidi.so "${pkgdir}/usr/lib/libporttime.so" } diff --git a/extra/portmidi/portmidi-217-build-fix.patch b/extra/portmidi/portmidi-217-build-fix.patch index 3e2dfef29..e741e6576 100644 --- a/extra/portmidi/portmidi-217-build-fix.patch +++ b/extra/portmidi/portmidi-217-build-fix.patch @@ -1,29 +1,318 @@ -diff -rup portmidi.orig/pm_java/CMakeLists.txt portmidi/pm_java/CMakeLists.txt ---- portmidi.orig/pm_java/CMakeLists.txt 2009-11-04 16:20:44.000000000 +0100 -+++ portmidi/pm_java/CMakeLists.txt 2012-01-24 21:13:08.513182169 +0100 -@@ -15,13 +15,11 @@ if(UNIX) - add_custom_command(OUTPUT pmdefaults/PmDefaultsFrame.class - COMMAND javac -classpath . pmdefaults/PmDefaultsFrame.java - MAIN_DEPENDENCY pmdefaults/PmDefaultsFrame.java +--- portmidi/CMakeLists.txt ++++ portmidi/CMakeLists.txt +@@ -9,12 +9,11 @@ + set(CMAKE_BUILD_TYPE Release CACHE STRING + "Semicolon-separate list of supported configuration types") + # set default directories but don't override cached values... +- set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CACHEFILE_DIR}/${CMAKE_BUILD_TYPE} ++ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + CACHE STRING "libraries go here") +- set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CACHEFILE_DIR}/${CMAKE_BUILD_TYPE} ++ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + CACHE STRING "libraries go here") +- set(CMAKE_RUNTIME_OUTPUT_DIRECTORY +- ${CMAKE_CACHEFILE_DIR}/${CMAKE_BUILD_TYPE} ++ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + CACHE STRING "executables go here") + + else(UNIX) +@@ -68,10 +67,20 @@ + include_directories(pm_common porttime) + add_subdirectory(pm_common) + +-add_subdirectory(pm_test) ++option(PORTMIDI_ENABLE_JAVA "Enable Java bindings support" ON) ++option(PORTMIDI_ENABLE_STATIC "Build and install static libraries" OFF) ++option(PORTMIDI_ENABLE_TEST "Build test programs" ON) ++ ++if(PORTMIDI_ENABLE_TEST) ++ add_subdirectory(pm_test) ++endif(PORTMIDI_ENABLE_TEST) + + add_subdirectory(pm_dylib) + + # Cannot figure out how to make an xcode Java application with CMake +-add_subdirectory(pm_java) ++if(PORTMIDI_ENABLE_JAVA) ++ set(JAR_INSTALL_DIR share/java ++ CACHE STRING "Define directory name for jar installation") ++ add_subdirectory(pm_java) ++endif(PORTMIDI_ENABLE_JAVA) + +--- portmidi/pm_common/CMakeLists.txt ++++ portmidi/pm_common/CMakeLists.txt +@@ -44,9 +44,6 @@ + + # first include the appropriate system-dependent file: + if(UNIX) +- # add the -g switch for Linux and Mac OS X (not used in Win32) +- set (CMAKE_C_FLAGS_DEBUG "-g ${CMAKE_C_FLAGS_DEBUG}" +- CACHE STRING "enable extra checks for debugging" FORCE) + if(APPLE) + set(MACSRC pmmacosxcm pmmac readbinaryplist finddefault) + prepend_path(LIBSRC ../pm_mac/ ${MACSRC}) +@@ -62,19 +59,23 @@ + ${COREMIDI_LIB} ${CORESERVICES_LIB} + CACHE INTERNAL "") + +- set(JAVAVM_LIB "${FRAMEWORK_PATH}/JavaVM.framework") +- set(JAVA_INCLUDE_PATHS ${JAVAVM_LIB}/Headers) ++ if(PORTMIDI_ENABLE_JAVA) ++ set(JAVAVM_LIB "${FRAMEWORK_PATH}/JavaVM.framework") ++ set(JAVA_INCLUDE_PATHS ${JAVAVM_LIB}/Headers) ++ endif(PORTMIDI_ENABLE_JAVA) + message(STATUS "SYSROOT: " ${CMAKE_OSX_SYSROOT}) + else(APPLE) + # LINUX settings... +- include(FindJNI) +- message(STATUS "JAVA_JVM_LIB_PATH is " ${JAVA_JVM_LIB_PATH}) +- message(STATUS "JAVA_INCLUDE_PATH is " ${JAVA_INCLUDE_PATH}) +- message(STATUS "JAVA_INCLUDE_PATH2 is " ${JAVA_INCLUDE_PATH2}) +- message(STATUS "JAVA_JVM_LIBRARY is " ${JAVA_JVM_LIBRARY}) +- set(JAVA_INCLUDE_PATHS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2}) +- # libjvm.so is found relative to JAVA_INCLUDE_PATH: +- set(JAVAVM_LIB ${JAVA_JVM_LIBRARY}/libjvm.so) ++ if(PORTMIDI_ENABLE_JAVA) ++ include(FindJNI) ++ message(STATUS "JAVA_JVM_LIB_PATH is " ${JAVA_JVM_LIB_PATH}) ++ message(STATUS "JAVA_INCLUDE_PATH is " ${JAVA_INCLUDE_PATH}) ++ message(STATUS "JAVA_INCLUDE_PATH2 is " ${JAVA_INCLUDE_PATH2}) ++ message(STATUS "JAVA_JVM_LIBRARY is " ${JAVA_JVM_LIBRARY}) ++ set(JAVA_INCLUDE_PATHS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2}) ++ # libjvm.so is found relative to JAVA_INCLUDE_PATH: ++ set(JAVAVM_LIB ${JAVA_JVM_LIBRARY}/libjvm.so) ++ endif(PORTMIDI_ENABLE_JAVA) + + set(LINUXSRC pmlinuxalsa pmlinux finddefault) + prepend_path(LIBSRC ../pm_linux/ ${LINUXSRC}) +@@ -88,10 +89,12 @@ + # /MD is multithread DLL, /MT is multithread. Change to static: + include(../pm_win/static.cmake) + +- include(FindJNI) ++ if(PORTMIDI_ENABLE_JAVA) ++ include(FindJNI) + +- set(JAVA_INCLUDE_PATHS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2}) +- # message(STATUS "JAVA_INCLUDE_PATHS: " ${JAVA_INCLUDE_PATHS}) ++ set(JAVA_INCLUDE_PATHS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2}) ++ # message(STATUS "JAVA_INCLUDE_PATHS: " ${JAVA_INCLUDE_PATHS}) ++ endif(PORTMIDI_ENABLE_JAVA) + + set(WINSRC pmwin pmwinmm) + prepend_path(LIBSRC ../pm_win/ ${WINSRC}) +@@ -99,29 +102,43 @@ + set(PM_NEEDED_LIBS winmm.lib) + endif(WIN32) + endif(UNIX) +-set(JNI_EXTRA_LIBS ${PM_NEEDED_LIBS} ${JAVA_JVM_LIBRARY}) ++ ++if(PORTMIDI_ENABLE_JAVA) ++ set(JNI_EXTRA_LIBS ${PM_NEEDED_LIBS} ${JAVA_JVM_LIBRARY}) ++endif(PORTMIDI_ENABLE_JAVA) + + # this completes the list of library sources by adding shared code + list(APPEND LIBSRC pmutil portmidi) + + # now add the shared files to make the complete list of library sources +-add_library(portmidi-static ${LIBSRC}) +-set_target_properties(portmidi-static PROPERTIES OUTPUT_NAME "portmidi_s") +-target_link_libraries(portmidi-static ${PM_NEEDED_LIBS}) +- +-# define the jni library +-include_directories(${JAVA_INCLUDE_PATHS}) +- +-set(JNISRC ${LIBSRC} ../pm_java/pmjni/pmjni.c) +-add_library(pmjni SHARED ${JNISRC}) +-target_link_libraries(pmjni ${JNI_EXTRA_LIBS}) +-set_target_properties(pmjni PROPERTIES EXECUTABLE_EXTENSION "jnilib") ++if(PORTMIDI_ENABLE_STATIC) ++ add_library(portmidi-static ${LIBSRC}) ++ set_target_properties(portmidi-static PROPERTIES OUTPUT_NAME "portmidi") ++ target_link_libraries(portmidi-static ${PM_NEEDED_LIBS}) ++endif(PORTMIDI_ENABLE_STATIC) ++ ++if(PORTMIDI_ENABLE_JAVA) ++ # define the jni library ++ include_directories(${JAVA_INCLUDE_PATHS}) ++ ++ set(JNISRC ${LIBSRC} ../pm_java/pmjni/pmjni.c) ++ add_library(pmjni SHARED ${JNISRC}) ++ target_link_libraries(pmjni ${JNI_EXTRA_LIBS}) ++ set_target_properties(pmjni PROPERTIES EXECUTABLE_EXTENSION "jnilib") ++endif(PORTMIDI_ENABLE_JAVA) + + # install the libraries (Linux and Mac OS X command line) + if(UNIX) +- INSTALL(TARGETS portmidi-static pmjni +- LIBRARY DESTINATION /usr/local/lib +- ARCHIVE DESTINATION /usr/local/lib) ++ if(PORTMIDI_ENABLE_STATIC) ++ INSTALL(TARGETS portmidi-static ++ LIBRARY DESTINATION lib${LIB_SUFFIX} ++ ARCHIVE DESTINATION lib${LIB_SUFFIX}) ++ endif(PORTMIDI_ENABLE_STATIC) ++ if(PORTMIDI_ENABLE_JAVA) ++ INSTALL(TARGETS pmjni ++ LIBRARY DESTINATION lib${LIB_SUFFIX} ++ ARCHIVE DESTINATION lib${LIB_SUFFIX}) ++ endif(PORTMIDI_ENABLE_JAVA) + # .h files installed by pm_dylib/CMakeLists.txt, so don't need them here + # INSTALL(FILES portmidi.h ../porttime/porttime.h + # DESTINATION /usr/local/include) +--- portmidi/pm_dylib/CMakeLists.txt ++++ portmidi/pm_dylib/CMakeLists.txt +@@ -39,9 +39,6 @@ + + # first include the appropriate system-dependent file: + if(UNIX) +- # add the -g switch for Linux and Mac OS X (not used in Win32) +- set (CMAKE_C_FLAGS_DEBUG "-g ${CMAKE_C_FLAGS_DEBUG}" +- CACHE STRING "enable extra checks for debugging" FORCE) + if(APPLE) + set(MACSRC pmmacosxcm pmmac readbinaryplist finddefault) + prepend_path(LIBSRC ../pm_mac/ ${MACSRC}) +@@ -63,7 +60,8 @@ + message(STATUS "SYSROOT: " ${CMAKE_OSX_SYSROOT}) + else(APPLE) + # LINUX settings... +- include(FindJNI) ++ if(PORTMIDI_ENABLE_JAVA) ++ include(FindJNI) + # message(STATUS "JAVA_JVM_LIB_PATH is " ${JAVA_JVM_LIB_PATH}) + # message(STATUS "JAVA_INCLUDE_PATH is " ${JAVA_INCLUDE_PATH}) + # note: should use JAVA_JVM_LIB_PATH, but it is not set properly +@@ -75,11 +73,8 @@ + # JAVA_INCLUDE_PATH2; if no, then we need to make both JAVA_INCLUDE_PATH + # and JAVA_INCLUDE_PATH2 set by user (will need clear documentation + # because JAVA_INCLUDE_PATH2 is pretty obscure) +- set(JAVA_INCLUDE_PATH ${JAVA_INCLUDE_PATH-UNKNOWN} +- CACHE STRING "where to find Java SDK include directory") +- set(JAVA_INCLUDE_PATHS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH}/linux) +- # libjvm.so is found relative to JAVA_INCLUDE_PATH: +- set(JAVAVM_LIB ${JAVA_INCLUDE_PATH}/../jre/lib/i386/client/libjvm.so) ++ set(JAVAVM_LIB ${JAVA_JVM_LIBRARY}) ++ endif(PORTMIDI_ENABLE_JAVA) + + set(LINUXSRC pmlinuxalsa pmlinux finddefault) + prepend_path(LIBSRC ../pm_linux/ ${LINUXSRC}) +@@ -91,13 +86,15 @@ + if(WIN32) + # /MDd is multithread debug DLL, /MTd is multithread debug + # /MD is multithread DLL, /MT is multithread +- +- include(FindJNI) +- # note: should use JAVA_JVM_LIB_PATH, but it is not set properly +- set(JAVAVM_LIB ${JAVA_INCLUDE_PATH}/../lib/jvm.lib) + +- set(JAVA_INCLUDE_PATHS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2}) +- # message(STATUS "JAVA_INCLUDE_PATHS: " ${JAVA_INCLUDE_PATHS}) ++ if(PORTMIDI_ENABLE_JAVA) ++ include(FindJNI) ++ # note: should use JAVA_JVM_LIB_PATH, but it is not set properly ++ set(JAVAVM_LIB ${JAVA_INCLUDE_PATH}/../lib/jvm.lib) ++ ++ set(JAVA_INCLUDE_PATHS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2}) ++ # message(STATUS "JAVA_INCLUDE_PATHS: " ${JAVA_INCLUDE_PATHS}) ++ endif(PORTMIDI_ENABLE_JAVA) + + set(WINSRC pmwin pmwinmm) + prepend_path(LIBSRC ../pm_win/ ${WINSRC}) +@@ -106,7 +103,10 @@ + # message(STATUS "JAVAVM_LIB: " ${JAVAVM_LIB}) + endif(WIN32) + endif(UNIX) ++ ++if(PORTMIDI_ENABLE_JAVA) + set(JNI_EXTRA_LIBS ${PM_NEEDED_LIBS} ${JAVAVM_LIB}) ++endif(PORTMIDI_ENABLE_JAVA) + + # this completes the list of library sources by adding shared code + set(SHARED_FILES pmutil portmidi) +@@ -120,8 +120,8 @@ + # install the libraries (Linux and Mac OS X command line) + if(UNIX) + INSTALL(TARGETS portmidi-dynamic +- LIBRARY DESTINATION /usr/local/lib +- ARCHIVE DESTINATION /usr/local/lib) ++ LIBRARY DESTINATION lib${LIB_SUFFIX} ++ ARCHIVE DESTINATION lib${LIB_SUFFIX}) + INSTALL(FILES ../pm_common/portmidi.h ../porttime/porttime.h +- DESTINATION /usr/local/include) ++ DESTINATION include) + endif(UNIX) +--- portmidi/pm_java/CMakeLists.txt ++++ portmidi/pm_java/CMakeLists.txt +@@ -5,43 +5,24 @@ + # java not dealt with in CMake -- see pm_mac/pm_mac.xcodeproj + else(APPLE) + # linux +- set(JPORTMIDICLASS JPortMidi.class JPortMidiException.class +- JPortMidiApi.class) +- set(PMDEFAULTSCLASS PmDefaultsFrame.class PmDefaults.class) +- prepend_path(JPORTMIDICLASS2 jportmidi/ ${JPORTMIDICLASS}) +- prepend_path(PMDEFAULTSCLASS2 pmdefaults/ ${PMDEFAULTSCLASS}) +- set(PMDEFAULTS_ALL_CLASSES ${JPORTMIDICLASS2} ${PMDEFAULTSCLASS2}) +- # message(STATUS "PMDEFAULTS_ALL_CLASSES is " ${PMDEFAULTS_ALL_CLASSES}) +- add_custom_command(OUTPUT pmdefaults/PmDefaultsFrame.class +- COMMAND javac -classpath . pmdefaults/PmDefaultsFrame.java +- MAIN_DEPENDENCY pmdefaults/PmDefaultsFrame.java - DEPENDS pmdefaults/PmDefaults.java - WORKING_DIRECTORY pm_java) -+ DEPENDS pmdefaults/PmDefaults.java) - add_custom_command(OUTPUT pmdefaults/PmDefaults.class - COMMAND javac -classpath . pmdefaults/PmDefaults.java - MAIN_DEPENDENCY pmdefaults/PmDefaults.java +- add_custom_command(OUTPUT pmdefaults/PmDefaults.class +- COMMAND javac -classpath . pmdefaults/PmDefaults.java +- MAIN_DEPENDENCY pmdefaults/PmDefaults.java - DEPENDS pmdefaults/PmDefaultsFrame.java - WORKING_DIRECTORY pm_java) -+ DEPENDS pmdefaults/PmDefaultsFrame.java) - add_custom_command(OUTPUT ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults.jar - COMMAND cp pmdefaults/portmusic_logo.png . - COMMAND jar cmf pmdefaults/manifest.txt pmdefaults.jar -@@ -31,8 +29,7 @@ if(UNIX) - COMMAND mv pmdefaults.jar ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} - COMMAND rm portmusic_logo.png - MAIN_DEPENDENCY pmdefaults/PmDefaults.class +- add_custom_command(OUTPUT ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults.jar +- COMMAND cp pmdefaults/portmusic_logo.png . +- COMMAND jar cmf pmdefaults/manifest.txt pmdefaults.jar +- pmdefaults/*.class portmusic_logo.png jportmidi/*.class +- COMMAND chmod +x pmdefaults/pmdefaults +- COMMAND cp pmdefaults/pmdefaults ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} +- COMMAND mv pmdefaults.jar ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} +- COMMAND rm portmusic_logo.png +- MAIN_DEPENDENCY pmdefaults/PmDefaults.class - DEPENDS ${PMDEFAULTS_ALL_CLASSES} - WORKING_DIRECTORY pm_java) -+ DEPENDS ${PMDEFAULTS_ALL_CLASSES}) - add_custom_target(pmdefaults_target ALL - DEPENDS ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults.jar) - # message(STATUS "add_custom_target: pmdefaults.jar") +- add_custom_target(pmdefaults_target ALL +- DEPENDS ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults.jar) +- # message(STATUS "add_custom_target: pmdefaults.jar") ++ set(JAVA_CLASSES jportmidi pmdefaults) ++ add_custom_command(OUTPUT ${JAVA_CLASSES} ++ COMMAND javac -d ${CMAKE_CURRENT_BINARY_DIR} jportmidi/*.java pmdefaults/*.java ++ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) ++ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/pmdefaults.jar ++ DEPENDS ${JAVA_CLASSES} ++ COMMAND jar cmf pmdefaults/manifest.txt ${CMAKE_CURRENT_BINARY_DIR}/pmdefaults.jar ++ -C pmdefaults portmusic_logo.png -C ${CMAKE_CURRENT_BINARY_DIR} jportmidi ++ -C ${CMAKE_CURRENT_BINARY_DIR} pmdefaults ++ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) ++ add_custom_target(pmdefaults.jar ALL ++ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/pmdefaults.jar) + + # install the libraries (Linux only) +- INSTALL(FILES ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults.jar +- DESTINATION /usr/share/java) +- INSTALL(PROGRAMS ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults +- DESTINATION /usr/local/bin) ++ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/pmdefaults.jar ++ DESTINATION ${JAR_INSTALL_DIR}) ++ INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/pmdefaults/pmdefaults ++ DESTINATION bin) + endif(APPLE) + endif(UNIX) + # In windows, use pm_java/make.bat +--- portmidi/pm_test/CMakeLists.txt ++++ portmidi/pm_test/CMakeLists.txt +@@ -12,8 +12,8 @@ + + macro(make_a_test name) + add_executable(${name} ${name}.c) +- target_link_libraries(${name} portmidi-static ${PM_NEEDED_LIBS}) +- add_dependencies(${name} portmidi-static) ++ target_link_libraries(${name} portmidi ${PM_NEEDED_LIBS}) ++ add_dependencies(${name} portmidi) + endmacro(make_a_test) + + make_a_test(test) diff --git a/extra/qt3/PKGBUILD b/extra/qt3/PKGBUILD index 942959ad4..dead707dd 100644 --- a/extra/qt3/PKGBUILD +++ b/extra/qt3/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 193687 2013-08-28 00:06:06Z eric $ +# $Id: PKGBUILD 197418 2013-10-25 18:37:20Z eric $ # Maintainer: Eric Bélanger pkgname=qt3 pkgver=3.3.8b -pkgrel=6 +pkgrel=7 epoch=1 pkgdesc="A cross-platform application and UI framework" arch=('i686' 'x86_64') @@ -16,17 +16,19 @@ optdepends=('qtchooser: set the default Qt toolkit' 'libmariadbclient: MariaDB driver' 'postgresql-libs: PostgreSQL driver' 'unixodbc: ODBC driver') -options=('!libtool' '!docs') +options=('!docs') source=(ftp://ftp.qt-project.org/qt/source/qt-x11-free-${pkgver}.tar.gz qt3-png15.patch qt-copy-kde-patches.tar.bz2 qt-patches.tar.bz2 - eastern_asian_languagues.diff qt-odbc.patch gcc-4.6.patch) + eastern_asian_languagues.diff qt-odbc.patch gcc-4.6.patch + qt-x11-free-3.3.5-makelibshared.patch) sha1sums=('745def6250dc7f337dbb265e20bf38dcb41fd854' '3d19510c46016a1a211d97bf8f82b01498b1b33c' '33418e5b117458af23c72cdbffc0c339bc34bdc4' '116afa0e737bdf27ea27f9b3653aeb56db9ec151' '40c7b8f06a21f809ddeb8b5560e9da63ccac6a17' '1346320614f6f86fbeb10b9fbad721dea29f5b61' - 'd9b83b8f6f9c8bd98d290dc1d0e9913a00b62c3f') + 'd9b83b8f6f9c8bd98d290dc1d0e9913a00b62c3f' + 'e89720eac87c3e925d0efae6a16f334c5159e4f6') # qt-copy-kde-patches come from http://websvn.kde.org/trunk/qt-copy/patches/ # other qt-patches come from fedora and gentoo @@ -49,6 +51,8 @@ prepare() { patch -p1 -i "${srcdir}"/gcc-4.6.patch patch -p0 -i "${srcdir}"/qt3-png15.patch + patch -p1 -i "${srcdir}"/qt-x11-free-3.3.5-makelibshared.patch + sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++{,-32,-64}/qmake.conf sed -i "s|-I. |$CXXFLAGS -I. |" qmake/Makefile.unix sed -i "s|read acceptance|acceptance=yes|" configure diff --git a/extra/qt3/qt-x11-free-3.3.5-makelibshared.patch b/extra/qt3/qt-x11-free-3.3.5-makelibshared.patch new file mode 100644 index 000000000..fd4adf7f0 --- /dev/null +++ b/extra/qt3/qt-x11-free-3.3.5-makelibshared.patch @@ -0,0 +1,48 @@ +--- qt-x11-free-3.3.5/tools/assistant/lib/lib.pro.orig 2005-10-21 10:09:12.000000000 -0200 ++++ qt-x11-free-3.3.5/tools/assistant/lib/lib.pro 2005-10-21 10:09:34.000000000 -0200 +@@ -3,8 +3,7 @@ + VERSION = 1.0 + + CONFIG += qt warn_on release +-CONFIG += staticlib +-CONFIG -= dll ++CONFIG += dll + + SOURCES = qassistantclient.cpp + HEADERS += $$QT_SOURCE_TREE/include/qassistantclient.h +*** qt-x11-free-qt-copy-3.3.5/tools/designer/editor/editor.pro 2003-12-20 22:48:51.000000000 -0200 +--- qt-x11-free-qt-copy-3.3.5/tools/designer/editor/editor.pro.new 2005-12-06 18:47:04.000000000 -0200 +*************** +*** 1,6 **** + TEMPLATE = lib +! CONFIG += qt warn_on staticlib +! CONFIG -= dll + HEADERS = editor.h \ + parenmatcher.h \ + completion.h \ +--- 1,6 ---- + TEMPLATE = lib +! CONFIG += qt warn_on +! CONFIG += dll + HEADERS = editor.h \ + parenmatcher.h \ + completion.h \ +*** qt-x11-free-qt-copy-3.3.5/tools/designer/designer/designer.pro 2004-04-29 19:31:32.000000000 -0300 +--- qt-x11-free-qt-copy-3.3.5/tools/designer/designer/designer.pro.new 2005-12-06 18:46:29.000000000 -0200 +*************** +*** 1,7 **** + TEMPLATE = lib + +! CONFIG += qt warn_on staticlib qmake_cache +! CONFIG -= dll + !force_static:!win32:contains(QT_PRODUCT,qt-internal) { + CONFIG -= staticlib + CONFIG += dll +--- 1,7 ---- + TEMPLATE = lib + +! CONFIG += qt warn_on qmake_cache +! CONFIG += dll + !force_static:!win32:contains(QT_PRODUCT,qt-internal) { + CONFIG -= staticlib + CONFIG += dll diff --git a/extra/rrdtool/PKGBUILD b/extra/rrdtool/PKGBUILD index 13b3c4a87..63c931ff8 100644 --- a/extra/rrdtool/PKGBUILD +++ b/extra/rrdtool/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 188995 2013-06-28 01:52:37Z eric $ +# $Id: PKGBUILD 197422 2013-10-25 19:15:13Z eric $ # Maintainer: Eric Bélanger pkgname=rrdtool pkgver=1.4.8 -pkgrel=1 +pkgrel=2 pkgdesc="Data logging and graphing application" arch=('i686' 'x86_64') url="http://www.rrdtool.org" @@ -14,22 +14,24 @@ optdepends=('tcl: to use corresponding binding' \ 'python2: to use corresponding binding' \ 'ruby: to use corresponding binding' \ 'lua51: to use corresponding binding') -options=('!libtool' '!emptydirs' '!makeflags') +options=('!emptydirs' '!makeflags') source=(http://oss.oetiker.ch/rrdtool/pub/rrdtool-${pkgver}.tar.gz - rrdtool-pangofont.patch) + rrdtool-pangofont.patch rrdtool-systemd.patch) sha1sums=('56d68857f39e70bfa32360947614d8220702ed02' - '8c600285bdab7776c1d5301df7cf486d69eae048') + '8c600285bdab7776c1d5301df7cf486d69eae048' + '963b600f8056d85305b6ff4554fa1e7b9b5a4ae1') prepare() { cd ${pkgname}-${pkgver} # fix FS#28521 make ruby install to vendor_ruby instead of site_ruby - sed -e 's/$(RUBY) extconf.rb/& --vendor/' -i bindings/Makefile.in - patch -p1 -i ../rrdtool-pangofont.patch + sed -e 's/$(RUBY) extconf.rb/& --vendor/' -i bindings/Makefile.am + patch -p1 -i "${srcdir}/rrdtool-pangofont.patch" + patch -p1 -i "${srcdir}/rrdtool-systemd.patch" } build() { cd ${pkgname}-${pkgver} - autoconf + autoreconf PYTHON=python2 LUA=/usr/bin/lua5.1 \ LUA_CFLAGS="-I/usr/include/lua5.1 -llua5.1" LUA_INSTALL_CMOD="/usr/lib/lua/5.1" \ ./configure --prefix=/usr --localstatedir=/var --disable-rpath \ diff --git a/extra/rrdtool/rrdtool-systemd.patch b/extra/rrdtool/rrdtool-systemd.patch new file mode 100644 index 000000000..856f9ef54 --- /dev/null +++ b/extra/rrdtool/rrdtool-systemd.patch @@ -0,0 +1,140 @@ +From 78b519eb2ffa786d6427bb13277e9151ef7b111e Mon Sep 17 00:00:00 2001 +From: Tobias Oetiker +Date: Mon, 2 Jul 2012 15:05:32 +0000 +Subject: [PATCH] serviced config etc files for rrdtool + +git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk/program@2292 a5681a0c-68f1-0310-ab6d-d61299d08faa +--- + etc/rrdcached.service.in | 19 +++++++++++++++++++ + etc/rrdcached.socket.in | 18 ++++++++++++++++++ + 2 files changed, 37 insertions(+) + create mode 100644 etc/rrdcached.service.in + create mode 100644 etc/rrdcached.socket.in + +diff --git a/etc/rrdcached.service.in b/etc/rrdcached.service.in +new file mode 100644 +index 0000000..3b6f309 +--- /dev/null ++++ b/etc/rrdcached.service.in +@@ -0,0 +1,19 @@ ++# ++# To customize, copy this file to /etc/systemd/system/ ++# and edit there ++# ++ ++[Unit] ++Description=Data caching daemon for rrdtool ++Documentation=man:rrdcached(1) ++ ++[Service] ++# If you enable socket-activable rrdcached.socket, ++# command line socket declarations will be ignored ++ExecStart=@prefix@/bin/rrdcached -g ++#WorkingDirectory= ++#User= ++#Group= ++ ++[Install] ++WantedBy=multi-user.target +diff --git a/etc/rrdcached.socket.in b/etc/rrdcached.socket.in +new file mode 100644 +index 0000000..7a2d63e +--- /dev/null ++++ b/etc/rrdcached.socket.in +@@ -0,0 +1,18 @@ ++# ++# To customize, copy this file to /etc/systemd/system/ ++# and edit there ++# ++ ++[Unit] ++Description=sockets activating rrdcached ++Documentation=man:rrdcached(1) ++ ++[Socket] ++ListenStream=/tmp/rrdcached.sock ++#ListenStream=[::1]:42217 ++#DirectoryMode=0755 ++#SocketMode=0666 ++#BindToDevice= ++ ++[Install] ++WantedBy=sockets.target +-- +1.8.4 + +From 134ed0d33953e7e71c55454591c1078f7ae1db8a Mon Sep 17 00:00:00 2001 +From: Tobias Oetiker +Date: Mon, 2 Jul 2012 14:01:06 +0000 +Subject: [PATCH] wire up systemd support in autoconf -- tomek@pipebreaker.pl + +git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk/program@2291 a5681a0c-68f1-0310-ab6d-d61299d08faa +--- + Makefile.am | 6 ++++++ + configure.ac | 12 ++++++++++++ + doc/rrdcached.pod | 2 ++ + 3 files changed, 20 insertions(+) + +diff --git a/Makefile.am b/Makefile.am +index 20b2e0a..11d16d3 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -29,6 +29,12 @@ ACLOCAL_M4= $(top_srcdir)/aclocal.m4 + + # $(RSYNC) CHANGES archive/$(PACKAGE)-$(VERSION).tar.gz tobi@ipn.caida.org:/ipn/web/Tools/RRDtool/pub/ + ++if HAVE_SYSTEMD ++systemdsystemunit_DATA = \ ++ etc/rrdcached.socket \ ++ etc/rrdcached.service ++endif ++ + site-perl-inst: site-perl-install + + site-perl-install: all bindings/perl-piped/Makefile bindings/perl-shared/Makefile +diff --git a/configure.ac b/configure.ac +index 51c3f81..ab210d1 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -918,6 +918,17 @@ AC_ARG_VAR(RRDDOCDIR, [[DATADIR/doc/PACKAGE-VERSION] Documentation directory]) + if test -z "$RRDDOCDIR"; then + RRDDOCDIR='${datadir}/doc/${PACKAGE}-${VERSION}'; fi + ++# systemd check ++PKG_PROG_PKG_CONFIG ++AC_ARG_WITH([systemdsystemunitdir], ++ AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]), ++ [], [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)]) ++if test "x$with_systemdsystemunitdir" != xno; then ++ AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir]) ++ AC_OUTPUT([etc/rrdcached.socket etc/rrdcached.service]) ++fi ++AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != xno ]) ++ + + CONFIGURE_PART(Apply Configuration Information) + +@@ -993,6 +1004,7 @@ echo " Build librrd MT: $enable_pthread" + echo " Use gettext: $USE_NLS" + echo " With libDBI: $have_libdbi" + echo " With libwrap: $have_libwrap" ++echo " With systemd dir: $with_systemdsystemunitdir" + echo + echo " Libraries: $ALL_LIBS" + echo +diff --git a/doc/rrdcached.pod b/doc/rrdcached.pod +index 18adcf1..7c0b30c 100644 +--- a/doc/rrdcached.pod ++++ b/doc/rrdcached.pod +@@ -448,6 +448,8 @@ accepted commands to those needed by external clients. If, for example, + external clients want to draw graphs of the cached data, they should only be + allowed to use the C command. + ++Authorization does not work when rrcached is socket-activated by systemd. ++ + =head2 Encryption + + There is no encryption. +-- +1.8.4 + diff --git a/extra/rtmpdump/PKGBUILD b/extra/rtmpdump/PKGBUILD index 09d5dbdad..d88e4fe08 100644 --- a/extra/rtmpdump/PKGBUILD +++ b/extra/rtmpdump/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 190126 2013-07-16 03:23:42Z eric $ +# $Id: PKGBUILD 197306 2013-10-25 02:06:12Z bisson $ # Maintainer: # Contributor: xduugu # Contributor: Elis Hughes pkgname=rtmpdump pkgver=20121230 -pkgrel=2 +pkgrel=3 pkgdesc="A tool to download rtmp streams" arch=('i686' 'x86_64') url="http://rtmpdump.mplayerhq.hu/" diff --git a/extra/schroedinger/PKGBUILD b/extra/schroedinger/PKGBUILD index 7a8e01134..a5d7d9d64 100644 --- a/extra/schroedinger/PKGBUILD +++ b/extra/schroedinger/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 149308 2012-02-06 18:45:09Z ibiru $ +# $Id: PKGBUILD 197333 2013-10-25 02:34:53Z bisson $ # Maintainer: Ionut Biru # Contributor: Timm Preetz # Contributor: rabyte pkgname=schroedinger pkgver=1.0.11 -pkgrel=1 +pkgrel=2 pkgdesc="An implemenation of the Dirac video codec in ANSI C code" arch=('i686' 'x86_64') url="http://www.diracvideo.org/" diff --git a/extra/sdl2/PKGBUILD b/extra/sdl2/PKGBUILD index c554f2083..0119dd5b9 100644 --- a/extra/sdl2/PKGBUILD +++ b/extra/sdl2/PKGBUILD @@ -1,8 +1,7 @@ # Maintainer: Sven-Hendrik Haase - pkgname=sdl2 -pkgver=2.0.0 -pkgrel=4 +pkgver=2.0.1 +pkgrel=1 pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard (Version 2)" arch=('i686' 'x86_64') url="http://www.libsdl.org" @@ -12,7 +11,7 @@ makedepends=('alsa-lib' 'mesa' 'libpulse' 'cmake' 'libxrandr' 'libxinerama') optdepends=('alsa-lib: ALSA audio driver' 'libpulse: PulseAudio audio driver') source=("http://www.libsdl.org/release/SDL2-${pkgver}.tar.gz") -md5sums=('beec89afb6edcc6f0abc4114f2e6bcf7') +md5sums=('0eb97039488bf463e775295f7b18b227') build() { cd "${srcdir}/SDL2-${pkgver}" diff --git a/extra/sg3_utils/PKGBUILD b/extra/sg3_utils/PKGBUILD index a7cb7ced6..35ac783df 100644 --- a/extra/sg3_utils/PKGBUILD +++ b/extra/sg3_utils/PKGBUILD @@ -1,15 +1,14 @@ -#$Id: PKGBUILD 188647 2013-06-17 10:00:27Z jgc $ +#$Id: PKGBUILD 197372 2013-10-25 03:01:52Z allan $ # Maintainer: Daniel Isenmann pkgname=sg3_utils pkgver=1.36 -pkgrel=1 +pkgrel=2 pkgdesc="Generic SCSI utilities" arch=(i686 x86_64) url="http://sg.danny.cz/sg/sg3_utils.html" license=('GPL' 'custom:BSD') depends=('glibc') -options=('!libtool') source=(http://sg.danny.cz/sg/p/${pkgname}-${pkgver}.tar.xz) md5sums=('5d1846c8aa03a2e39e1368cf05bf1cfd') diff --git a/extra/sox/PKGBUILD b/extra/sox/PKGBUILD index ae85cd877..8480e03fe 100644 --- a/extra/sox/PKGBUILD +++ b/extra/sox/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 191908 2013-08-01 06:53:41Z bpiotrowski $ +# $Id: PKGBUILD 197426 2013-10-25 19:25:05Z eric $ # Maintainer: Eric Bélanger pkgname=sox pkgver=14.4.1 -pkgrel=3 +pkgrel=4 pkgdesc="The Swiss Army knife of sound processing tools" arch=('i686' 'x86_64') url="http://sox.sourceforge.net/" @@ -16,7 +16,6 @@ optdepends=('libao: for ao plugin' 'libid3tag: for mp3 plugin' 'wavpack: for wavpack plugin' 'libpulse: for pulse plugin') -options=('!libtool') source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2) sha1sums=('4775f9e9eebb5a2fe79df548908a7a24088118d9') diff --git a/extra/startup-notification/PKGBUILD b/extra/startup-notification/PKGBUILD index be5991abc..84b17cd3d 100644 --- a/extra/startup-notification/PKGBUILD +++ b/extra/startup-notification/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 160613 2012-06-02 21:14:51Z andyrtr $ +# $Id: PKGBUILD 197310 2013-10-25 02:16:10Z bisson $ # Maintainer: Jan de Groot # Contributor: dorphell pkgname=startup-notification pkgver=0.12 -pkgrel=3 +pkgrel=4 pkgdesc="Monitor and display application startup" arch=(i686 x86_64) license=('LGPL') diff --git a/extra/t1lib/PKGBUILD b/extra/t1lib/PKGBUILD index 50d8a4c8e..0e40c7abc 100644 --- a/extra/t1lib/PKGBUILD +++ b/extra/t1lib/PKGBUILD @@ -1,16 +1,15 @@ -# $Id: PKGBUILD 137602 2011-09-10 01:36:02Z allan $ +# $Id: PKGBUILD 197366 2013-10-25 02:59:44Z allan $ # Maintainer: tobias # Contributor: Rainer Moll pkgname=t1lib pkgver=5.1.2 -pkgrel=3 +pkgrel=4 pkgdesc="Library for generating character- and string-glyphs from Adobe Type 1 fonts" arch=('i686' 'x86_64') url="http://www.ibiblio.org/pub/Linux/libs/graphics/!INDEX.html" license=('GPL') depends=('libxaw') -options=(!libtool) source=(http://www.ibiblio.org/pub/Linux/libs/graphics/${pkgname}-${pkgver}.tar.gz ) md5sums=('a5629b56b93134377718009df1435f3c') diff --git a/extra/taglib/PKGBUILD b/extra/taglib/PKGBUILD index 4a5debbc0..eed121180 100644 --- a/extra/taglib/PKGBUILD +++ b/extra/taglib/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 166944 2012-09-22 20:46:26Z tomegun $ +# $Id: PKGBUILD 197386 2013-10-25 08:45:00Z tomegun $ # Maintainer: Tom Gundersen # Contributor: Ike Devolder # Contributor: Andrea Scarpino # Contributor: Tobias Powalowski pkgname=taglib -pkgver=1.8 +pkgver=1.9.1 pkgrel=1 pkgdesc="A Library for reading and editing the meta-data of several popular audio formats" arch=('i686' 'x86_64') @@ -14,8 +14,8 @@ license=('LGPL' 'MPL') depends=('sh' 'zlib' 'gcc-libs') makedepends=('cmake' 'pkg-config') options=('!libtool') -source=("https://github.com/downloads/$pkgname/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('dcb8bd1b756f2843e18b1fdf3aaeee15') +source=("http://${pkgname}.github.io/releases/${pkgname}-${pkgver}.tar.gz") +md5sums=('0d35df96822bbd564c5504cb3c2e4d86') build() { cd "${srcdir}"/${pkgname}-${pkgver} diff --git a/extra/tcl/PKGBUILD b/extra/tcl/PKGBUILD index dae18ef83..0b73c22fe 100644 --- a/extra/tcl/PKGBUILD +++ b/extra/tcl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 194660 2013-09-20 16:55:21Z eric $ +# $Id: PKGBUILD 197360 2013-10-25 02:54:13Z allan $ # Maintainer: Eric Bélanger pkgname=tcl @@ -9,6 +9,7 @@ arch=('i686' 'x86_64') url="http://tcl.sourceforge.net/" license=('custom') depends=('zlib') +options=('staticlibs') source=(http://downloads.sourceforge.net/sourceforge/tcl/tcl${pkgver}-src.tar.gz) sha1sums=('5c83d44152cc0496cc0847a2495f659502a30e40') diff --git a/extra/tk/PKGBUILD b/extra/tk/PKGBUILD index 20e030652..c8dc7bf0c 100644 --- a/extra/tk/PKGBUILD +++ b/extra/tk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 194661 2013-09-20 16:55:22Z eric $ +# $Id: PKGBUILD 197364 2013-10-25 02:55:42Z allan $ # Maintainer: Eric Bélanger pkgname=tk @@ -9,6 +9,7 @@ arch=('i686' 'x86_64') url="http://tcl.sourceforge.net/" license=('custom') depends=("tcl=${pkgver}" 'libxss' 'libxft') +options=('staticlibs') source=(http://downloads.sourceforge.net/sourceforge/tcl/tk${pkgver}-src.tar.gz) sha1sums=('ecfcc20833c04d6890b14a7920a04d16f2123a51') diff --git a/extra/unixodbc/PKGBUILD b/extra/unixodbc/PKGBUILD index 36a06ccae..9f1ab59c8 100644 --- a/extra/unixodbc/PKGBUILD +++ b/extra/unixodbc/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 145345 2011-12-21 20:47:39Z andrea $ +# $Id: PKGBUILD 197416 2013-10-25 18:23:06Z andyrtr $ # Maintainer: AndyRTR # Contributor: Judd Vinet # Contributor: Tom Newsom pkgname=unixodbc -pkgver=2.3.1 +pkgver=2.3.2 pkgrel=1 pkgdesc="ODBC is an open specification for providing application developers with a predictable API with which to access Data Sources" arch=('i686' 'x86_64') @@ -12,17 +12,21 @@ license=('GPL2' 'LGPL2.1') url="http://www.unixodbc.org/" backup=('etc/odbc.ini' 'etc/odbcinst.ini') depends=('readline' 'libltdl') -options=('!libtool') source=("http://www.unixodbc.org/unixODBC-$pkgver.tar.gz") -md5sums=('86788d4006620fa1f171c13d07fdcaab') +md5sums=('5e4528851eda5d3d4aed249b669bd05b') build() { - cd ${srcdir}/unixODBC-${pkgver} + cd unixODBC-${pkgver} ./configure --prefix=/usr --sysconfdir=/etc make } +check() { + cd unixODBC-${pkgver} + make -k check +} + package() { - cd ${srcdir}/unixODBC-${pkgver} + cd unixODBC-${pkgver} make DESTDIR=${pkgdir} install } diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD index c9186597f..87f417a1e 100644 --- a/extra/vlc/PKGBUILD +++ b/extra/vlc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 195902 2013-10-04 17:29:00Z bpiotrowski $ +# $Id: PKGBUILD 197395 2013-10-25 12:07:13Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Sarah Hay # Contributor: Martin Sandsmark pkgname=vlc pkgver=2.1.0 -pkgrel=3 +pkgrel=4 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" arch=('i686' 'x86_64') url="http://www.videolan.org/vlc/" diff --git a/extra/xmms/PKGBUILD b/extra/xmms/PKGBUILD index 026657181..592ae820e 100644 --- a/extra/xmms/PKGBUILD +++ b/extra/xmms/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 171126 2012-11-16 19:24:09Z eric $ +# $Id: PKGBUILD 197428 2013-10-25 19:50:15Z eric $ # Maintainer: Eric Bélanger pkgname=xmms pkgver=1.2.11 -pkgrel=6 +pkgrel=7 pkgdesc="The X MultiMedia System - a multimedia player" arch=('i686' 'x86_64') url="http://legacy.xmms2.org/" @@ -14,7 +14,6 @@ optdepends=('libmikmod: for the MikMod input plugin' \ 'libvorbis: for the Ogg Vorbis input plugin' \ 'alsa-lib: for the alsa output plugin' \ 'libgl: for the OpenGL Spectrum analyser visualization plugin') -options=('!libtool') install=xmms.install source=(http://legacy.xmms2.org/${pkgname}-${pkgver}.tar.bz2 \ xmms-menu.patch xmms-1.2.10-crossfade-0.3.9.patch xmms-fix.diff \ @@ -35,9 +34,8 @@ sha1sums=('9d1eae4baab25fd35c9ddfb49321ca60222f672d' 'f24071ae484d9b55e61dba076801fa8e7976ff2f' '485c67cb8c8d4678bb3b0b280d2e233b14153b22') -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - +prepare() { + cd ${pkgname}-${pkgver} # Fix xmms.desktop patch -p0 < ../xmms-menu.patch # Patch for hang with xmms-crossfade @@ -51,7 +49,10 @@ build() { patch -p1 < ../xmms-1.2.10-fonts.patch patch -p1 < ../xmms-1.2.11-CVE-2007-0653.0654.patch patch -p1 < ../xmms-1.2.11-fix-mikmod-driver.patch +} +build() { + cd ${pkgname}-${pkgver} if [ "$CARCH" == "i686" ]; then SIMDOPT="--enable-simd" else @@ -62,7 +63,7 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install install -D -m644 xmms/xmms.desktop "${pkgdir}/usr/share/applications/xmms.desktop" diff --git a/extra/xvidcore/PKGBUILD b/extra/xvidcore/PKGBUILD index 2ad0797a5..5ef4629a6 100644 --- a/extra/xvidcore/PKGBUILD +++ b/extra/xvidcore/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 194593 2013-09-19 00:27:32Z dan $ +# $Id: PKGBUILD 197326 2013-10-25 02:31:05Z bisson $ # Maintainer: tobias # Contributor: Sarah Hay pkgname=xvidcore pkgver=1.3.2 -pkgrel=2 +pkgrel=3 pkgdesc="XviD is an open source MPEG-4 video codec" arch=('i686' 'x86_64') url="http://www.xvid.org/" diff --git a/extra/zenity/PKGBUILD b/extra/zenity/PKGBUILD index 520ab11ea..d3ba402b8 100644 --- a/extra/zenity/PKGBUILD +++ b/extra/zenity/PKGBUILD @@ -1,26 +1,31 @@ -# $Id: PKGBUILD 183472 2013-04-21 22:12:29Z heftig $ +# $Id: PKGBUILD 197413 2013-10-25 15:49:33Z heftig $ # Maintainer: Jan de Groot pkgname=zenity -pkgver=3.8.0 +pkgver=3.10.0 pkgrel=1 pkgdesc="Display graphical dialog boxes from shell scripts" arch=(i686 x86_64) -license=('LGPL') -depends=('gtk3' 'libnotify') -makedepends=('intltool' 'gtk-doc' 'itstool' 'docbook-xsl') +license=(LGPL) +depends=(gtk3 libnotify) +makedepends=(intltool gtk-doc itstool docbook-xsl git gnome-common yelp-tools) url="http://www.gnome.org" -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('94fbf0b71592f26dce0e2c49b82b4401139c8434084ad24c2c6a61ace1e6563f') +source=(git://git.gnome.org/zenity#tag=ZENITY_3_10_0) +sha256sums=('SKIP') + +prepare() { + cd $pkgname + git cherry-pick -n 80bc8ce643979fec201c4ebd5cd6405b6310357f +} build() { - cd $pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc \ + cd $pkgname + ./autogen.sh --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var make } package() { - cd $pkgname-$pkgver + cd $pkgname make DESTDIR="${pkgdir}" install } diff --git a/libre/crosstool-ng/PKGBUILD b/libre/crosstool-ng/PKGBUILD index 0f4741470..aba7152a0 100644 --- a/libre/crosstool-ng/PKGBUILD +++ b/libre/crosstool-ng/PKGBUILD @@ -3,7 +3,7 @@ # Contributor (Parabola): Márcio Silva pkgname=crosstool-ng -pkgver=1.18.0 +pkgver=1.19.0 pkgrel=1 pkgdesc="A versatile cross toolchain generator (eglibc addons patch)" arch=('i686' 'x86_64') @@ -14,7 +14,6 @@ makedepends=('libtool') optdepends=('subversion: for retrieving eglibc sources') source=(http://crosstool-ng.org/download/${pkgname}/${pkgname}-${pkgver}.tar.bz2) #libc_ports_short_name.patch) -md5sums=('3376d389c632baa77f0bce1db1a196a9') build() { cd $srcdir/$pkgname-$pkgver @@ -30,3 +29,5 @@ package() { install -Dm644 ct-ng.comp ${pkgdir}/usr/share/bash-completion/completions/ct-ng } +sha1sums=('b7ae3e90756b499ff5362064b7d80f8a45d09bfb') +sha256sums=('cd54f20bb8190533b21c9cf7f93c9073c22d59541f52774c3f3053264ba53a93') diff --git a/libre/gst-plugins-bad-libre/PKGBUILD b/libre/gst-plugins-bad-libre/PKGBUILD index 17d1105e3..465072d3a 100644 --- a/libre/gst-plugins-bad-libre/PKGBUILD +++ b/libre/gst-plugins-bad-libre/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 195012 2013-09-24 14:12:15Z heftig $ +# $Id: PKGBUILD 197399 2013-10-25 12:22:28Z heftig $ # Maintainer: Jan de Groot # Maintainer (Parabola): Márcio Silva _pkgname=gst-plugins-bad pkgname=$_pkgname-libre pkgver=1.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="GStreamer Multimedia Framework Bad Plugins, without nonfree faac support" arch=('i686' 'x86_64' 'mips64el') license=('LGPL') url="http://gstreamer.freedesktop.org/" depends=('mjpegtools' 'gst-plugins-base-libs' 'curl' 'chromaprint' 'libmms' 'faad2' 'mpg123' 'celt' 'libdca' 'soundtouch' 'spandsp' 'libdvdnav' 'libmodplug' 'libgme' 'opus' 'wayland' 'neon' 'libofa' 'fluidsynth' 'openjpeg' 'libwebp' 'libsrtp' 'gnutls') -makedepends=('schroedinger' 'libexif' 'libdvdread' 'libvdpau' 'libmpeg2' 'python' 'valgrind' 'wildmidi') +makedepends=('schroedinger' 'libexif' 'libdvdread' 'libvdpau' 'libmpeg2' 'python' 'valgrind' 'wildmidi' + 'gobject-introspection') provides=($_pkgname=$pkgver) conflicts=$_pkgname replaces=$_pkgname diff --git a/libre/gstreamer0.10-bad-libre/PKGBUILD b/libre/gstreamer0.10-bad-libre/PKGBUILD index 329c5186c..593042e3e 100644 --- a/libre/gstreamer0.10-bad-libre/PKGBUILD +++ b/libre/gstreamer0.10-bad-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 183943 2013-04-29 17:33:53Z bpiotrowski $ +# $Id: PKGBUILD 197398 2013-10-25 12:22:00Z heftig $ # Maintainer: Jan de Groot # Maintainer (Parabola): fauno # Maintainer (Parabola): André Silva @@ -6,7 +6,7 @@ pkgbase=gstreamer0.10-bad-libre pkgname=('gstreamer0.10-bad-libre' 'gstreamer0.10-bad-libre-plugins') pkgver=0.10.23 -pkgrel=4 +pkgrel=5 arch=('i686' 'x86_64' 'mips64el') license=('LGPL' 'GPL') makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.36' 'xvidcore' 'libdca' 'bzip2' 'libdc1394' 'neon' 'musicbrainz' 'faad2' 'libmms' 'libcdaudio' 'libmpcdec' 'mjpegtools' 'libdvdnav' 'libmodplug' 'jasper' 'liblrdf' 'libofa' 'soundtouch' 'libvdpau' 'schroedinger' 'libass' 'libvpx' 'gsm' 'libgme' 'rtmpdump' 'libsndfile' 'librsvg' 'wildmidi' 'opus') diff --git a/libre/mplayer-libre/PKGBUILD b/libre/mplayer-libre/PKGBUILD index faa53de37..717b56af5 100644 --- a/libre/mplayer-libre/PKGBUILD +++ b/libre/mplayer-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 193127 2013-08-17 00:43:52Z eric $ +# $Id: PKGBUILD 197402 2013-10-25 12:27:32Z giovanni $ # Maintainer : Ionut Biru # Contributor: Hugo Doria # Maintainer (Parabola): André Silva @@ -8,7 +8,7 @@ _pkgbase=mplayer pkgbase=mplayer-libre pkgname=('mplayer-libre' 'mencoder-libre') pkgver=36285 -pkgrel=4 +pkgrel=5 arch=('i686' 'x86_64') makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient' 'aalib' 'jack' 'libcaca' 'x264' 'faad2' 'lirc-utils' 'libxvmc' 'enca' 'libvdpau' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx' diff --git a/libre/mplayer-vaapi-libre/PKGBUILD b/libre/mplayer-vaapi-libre/PKGBUILD index fe188f50e..a298033c4 100644 --- a/libre/mplayer-vaapi-libre/PKGBUILD +++ b/libre/mplayer-vaapi-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 95856 2013-08-17 15:21:03Z foutrelis $ +# $Id: PKGBUILD 99192 2013-10-25 12:40:52Z giovanni $ # Maintainer: Evangelos Foutras # Contributor: Ionut Biru # Contributor: Hugo Doria @@ -9,7 +9,7 @@ _pkgname=mplayer-vaapi pkgname=mplayer-vaapi-libre pkgver=36265 -pkgrel=4 +pkgrel=5 pkgdesc="A movie player, compiled with vaapi support, without nonfree faac support" arch=('i686' 'x86_64') url="http://gitorious.org/vaapi/mplayer" diff --git a/pcr/fsniper/PKGBUILD b/pcr/fsniper/PKGBUILD new file mode 100644 index 000000000..bf7e3a6c3 --- /dev/null +++ b/pcr/fsniper/PKGBUILD @@ -0,0 +1,32 @@ +# Initial Contributor: andrewy +# Actual Contributor: Luca Cesari + +arch=(i686 x86_64) +pkgname=fsniper +pkgver=1.3.1 +pkgrel=2 +pkgdesc="Daemon to run scripts based on changes in files monitored by inotify" +url="http://projects.l3ib.org/fsniper/" +license="GPL3" +depends=('pcre' 'file') +source=(http://projects.l3ib.org/fsniper/files/$pkgname-$pkgver.tar.gz) +md5sums=('62f30bb4b00f9499499d83a30281f10f') + +build() { + cd ${srcdir}/$pkgname-$pkgver + + ./configure --prefix=/usr + make +} + +package() { + cd ${srcdir}/$pkgname-$pkgver + + make DESTDIR=${pkgdir} install + + install -m644 -D ${srcdir}/$pkgname-$pkgver/README \ + ${pkgdir}/usr/share/${pkgname}/README + install -m644 -D ${srcdir}/$pkgname-$pkgver/example.conf \ + ${pkgdir}/usr/share/${pkgname}/example.conf + +} -- cgit v1.2.3-54-g00ecf From 38b1ce25596ae456fefb3214a73c3d1005da568f Mon Sep 17 00:00:00 2001 From: root Date: Tue, 29 Oct 2013 01:05:02 -0700 Subject: Tue Oct 29 01:04:23 PDT 2013 --- community/argyllcms/PKGBUILD | 6 +- community/arpack/PKGBUILD | 8 +- community/cinnamon-settings-daemon/PKGBUILD | 8 +- .../automount-plugin.patch | 2 +- community/cinnamon/PKGBUILD | 16 +-- community/dispcalgui/PKGBUILD | 8 +- community/fish/PKGBUILD | 20 ++-- community/haddock/PKGBUILD | 11 +- community/haskell-regex-compat/PKGBUILD | 44 ++++---- community/haskell-regex-posix/PKGBUILD | 36 +++---- community/haskell-tar/PKGBUILD | 5 +- community/haskell-xhtml/PKGBUILD | 7 +- community/libclastfm/PKGBUILD | 4 +- community/libdbi/PKGBUILD | 4 +- community/lxappearance/PKGBUILD | 24 ++--- community/lxsplit/PKGBUILD | 25 +++++ community/miniupnpc/PKGBUILD | 4 +- community/mpv/PKGBUILD | 6 +- community/nmon/PKGBUILD | 10 +- community/openjpeg2/PKGBUILD | 26 +++++ community/osmo/PKGBUILD | 36 +++---- community/osmo/osmo-0.2.10-configure.patch | 24 +++++ community/osmo/osmo.install | 2 +- community/pam_mount/PKGBUILD | 13 +-- community/plan9port/PKGBUILD | 8 +- community/processing/PKGBUILD | 23 +++-- community/smalltalk/PKGBUILD | 16 +-- community/xcircuit/PKGBUILD | 6 +- community/xmobar/PKGBUILD | 8 +- community/zathura-pdf-mupdf/PKGBUILD | 9 +- core/db/PKGBUILD | 10 +- core/db/db.install | 5 - core/gawk/PKGBUILD | 4 +- core/gettext/PKGBUILD | 6 +- core/gpm/PKGBUILD | 4 +- core/pam/PKGBUILD | 12 ++- core/pam/pam.install | 12 --- core/pam/pam_namespace-build-1.1.6.patch | 11 -- extra/cups/PKGBUILD | 18 ++-- extra/cups/cups-1.6.2-statedir.patch | 16 +-- extra/cups/cups-systemd-socket.patch | 112 +++++++++++---------- extra/f2fs-tools/PKGBUILD | 13 ++- extra/gnome-python-extras/PKGBUILD | 60 +++++------ extra/libdiscid/PKGBUILD | 5 +- extra/libdvdcss/PKGBUILD | 7 +- extra/libglade/PKGBUILD | 16 +-- extra/libgnomekbd/PKGBUILD | 6 +- extra/libgtkhtml/PKGBUILD | 27 ----- extra/libieee1284/PKGBUILD | 11 +- extra/libmpd/PKGBUILD | 9 +- extra/libofa/PKGBUILD | 31 +++--- extra/libofa/libofa-0.9.3-gcc-4.7.patch | 22 ++++ extra/lxsplit/PKGBUILD | 24 ----- extra/nspr/PKGBUILD | 5 +- extra/orbit2/PKGBUILD | 4 +- extra/perl-compress-bzip2/PKGBUILD | 6 +- extra/pulseaudio/PKGBUILD | 38 +++---- extra/pulseaudio/pulseaudio.install | 12 +-- extra/python-numpy/PKGBUILD | 10 +- extra/sane/PKGBUILD | 14 ++- extra/sane/segfault-avahi-fix-kodakio.patch | 98 ++++++++++++++++++ extra/upower/PKGBUILD | 14 +-- extra/upower/git-fixes.patch | 112 --------------------- ...x-clamp-percentage-for-overfull-batteries.patch | 72 +++++++++++++ libre/bfgminer-libre/PKGBUILD | 15 ++- pcr/pandoc/PKGBUILD | 51 ++++++---- pcr/pandoc/SRCBUILD | 8 +- pcr/youtube-dl-current/PKGBUILD | 4 +- 68 files changed, 702 insertions(+), 621 deletions(-) create mode 100644 community/lxsplit/PKGBUILD create mode 100644 community/openjpeg2/PKGBUILD create mode 100644 community/osmo/osmo-0.2.10-configure.patch delete mode 100644 core/db/db.install delete mode 100644 core/pam/pam.install delete mode 100644 core/pam/pam_namespace-build-1.1.6.patch delete mode 100644 extra/libgtkhtml/PKGBUILD create mode 100644 extra/libofa/libofa-0.9.3-gcc-4.7.patch delete mode 100644 extra/lxsplit/PKGBUILD create mode 100644 extra/sane/segfault-avahi-fix-kodakio.patch delete mode 100644 extra/upower/git-fixes.patch create mode 100644 extra/upower/linux-clamp-percentage-for-overfull-batteries.patch (limited to 'community/mpv') diff --git a/community/argyllcms/PKGBUILD b/community/argyllcms/PKGBUILD index 29aa2e938..ef7dd7bb4 100644 --- a/community/argyllcms/PKGBUILD +++ b/community/argyllcms/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 96037 2013-08-19 11:21:51Z tredaelli $ +# $Id: PKGBUILD 99402 2013-10-28 11:10:04Z tredaelli $ # Maintainer: Timothy Redaelli # Contributor: Frank Ickstadt (frank dot ickstadt at gmail dot com) pkgname=argyllcms _pkgname=Argyll -pkgver=1.6.0 +pkgver=1.6.1 _pkgver="V${pkgver}" pkgrel=1 pkgdesc="An ICC compatible color management system with support for different colorimeter hardware" @@ -15,7 +15,7 @@ source=(http://www.argyllcms.com/${_pkgname}_${_pkgver}_src.zip) url="http://www.argyllcms.com/" license=("GPL" "AGPL") install=${pkgname}.install -md5sums=('0e89e62fd4bb49dcc6ce57d54592216e') +md5sums=('aed439b76054ef8e8b065106d314681c') build() { cd "${srcdir}"/${_pkgname}_${_pkgver} diff --git a/community/arpack/PKGBUILD b/community/arpack/PKGBUILD index e74300516..7f284495f 100644 --- a/community/arpack/PKGBUILD +++ b/community/arpack/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 85849 2013-03-07 18:31:38Z arodseth $ +# $Id: PKGBUILD 99415 2013-10-28 12:15:04Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: William Rea # Contributor: Stefan Husmann pkgname=arpack pkgver=3.1.2 -pkgrel=1 +pkgrel=2 arch=('x86_64' 'i686') pkgdesc='Fortran77 subroutines designed to solve large scale eigenvalue problems' url='http://forge.scilab.org/index.php/p/arpack-ng/' @@ -17,7 +17,7 @@ source=("http://forge.scilab.org/upload/$pkgname-ng/files/$pkgname-ng_$pkgver.ta sha256sums=('9338bda5bef5a4bafd99c18f327acb54f8be4ffc5c53d0a186e4aa27db3260f2') build() { - cd "$srcdir/$pkgname-ng_$pkgver" + cd "$pkgname-ng_$pkgver" ./configure --prefix=/usr --enable-mpi make \ @@ -27,7 +27,7 @@ build() { } package() { - cd "$srcdir/$pkgname-ng_$pkgver" + cd "$pkgname-ng_$pkgver" make DESTDIR="$pkgdir/" install install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" diff --git a/community/cinnamon-settings-daemon/PKGBUILD b/community/cinnamon-settings-daemon/PKGBUILD index 0d3417363..03b4bef47 100644 --- a/community/cinnamon-settings-daemon/PKGBUILD +++ b/community/cinnamon-settings-daemon/PKGBUILD @@ -3,8 +3,8 @@ # Contributor: Jan Alexander Steffens (heftig) pkgname=cinnamon-settings-daemon -pkgver=2.0.1 -pkgrel=2 +pkgver=2.0.5 +pkgrel=1 pkgdesc="The Cinnamon Settings daemon" arch=('i686' 'x86_64') license=('GPL') @@ -16,9 +16,9 @@ url="https://github.com/linuxmint/cinnamon-settings-daemon" source=("${pkgname}-${pkgver}.tar.gz::https://github.com/linuxmint/cinnamon-settings-daemon/archive/${pkgver}.tar.gz" keyboard.patch automount-plugin.patch) -sha256sums=('f03f5ea46bec11a6a0ed02b232dab8cb99a84fd8a9b52a76a454a7ba74dc1168' +sha256sums=('12dc50677fb90be00ed7e947f40eee4aa9d5126d7ad026d2a8d87588ef312018' '3c05b978cb414c8fc1530f211bab58627a64ac9c156630c9d486f5926a85109c' - '0a6dfbea6f28e5107212a8e8091ded6a3b5b34b1710c11c2f04c4d02846f9398') + 'ff30a46acc968b2cfab7f6040aa2ee400049f784b466901c347c513da2a538a9') prepare() { cd $pkgname-$pkgver diff --git a/community/cinnamon-settings-daemon/automount-plugin.patch b/community/cinnamon-settings-daemon/automount-plugin.patch index f6ca1181f..17eebca7f 100644 --- a/community/cinnamon-settings-daemon/automount-plugin.patch +++ b/community/cinnamon-settings-daemon/automount-plugin.patch @@ -382,7 +382,7 @@ diff -Naur cinnamon-settings-daemon-2.0.1.orig/plugins/automount/Makefile.am cin - $(top_builddir)/cinnamon-settings-daemon/libcsd.la + $(NULL) --autostartdir = $(sysconfdir)/xdg/autostart +-autostartdir = $(datadir)/applications -autostart_in_files = cinnamon-fallback-mount-helper.desktop.in -autostart_in_in_files = cinnamon-fallback-mount-helper.desktop.in.in -autostart_DATA = $(autostart_in_files:.desktop.in=.desktop) diff --git a/community/cinnamon/PKGBUILD b/community/cinnamon/PKGBUILD index 7e7c9b1fe..716c5b779 100644 --- a/community/cinnamon/PKGBUILD +++ b/community/cinnamon/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 99288 2013-10-26 17:30:16Z faidoc $ +# $Id: PKGBUILD 99378 2013-10-28 04:36:13Z bgyorgy $ # Maintainer: Alexandre Filgueira # Contributor: M0Rf30 # Contributor: unifiedlinux @@ -6,7 +6,7 @@ pkgname=cinnamon pkgver=2.0.6 -pkgrel=1 +pkgrel=2 pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience" arch=('i686' 'x86_64') url="http://cinnamon.linuxmint.com/" @@ -15,13 +15,10 @@ depends=('accountsservice' 'caribou' 'cinnamon-settings-daemon' 'cinnamon-sessio 'cinnamon-translations' 'cjs' 'clutter-gtk' 'gconf' 'gnome-icon-theme' 'gnome-menus' 'gnome-themes-standard' 'gstreamer' 'libgnome-keyring' 'librsvg' 'networkmanager' 'muffin' 'pygtk' 'python2-dbus' 'python2-pillow' - 'python2-pam' 'python2-pexpect' 'python2-pyinotify' 'python2-lxml' 'webkitgtk') + 'python2-pam' 'python2-pexpect' 'python2-pyinotify' 'python2-lxml' 'webkitgtk' + 'cinnamon-control-center' 'cinnamon-screensaver' 'libgnomekbd' + 'network-manager-applet' 'nemo') makedepends=('gnome-common' 'intltool') -optdepends=('cinnamon-control-center: extended configurations for Cinnamon' - 'cinnamon-screensaver: lock screen' - 'gucharmap: show character table from Keyboard applet' - 'libgnomekbd: show keyboard layout from Keyboard applet' - 'nemo: the official Cinnamon file manager (forked from Nautilus)') options=('!libtool' '!emptydirs') install=${pkgname}.install source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/archive/$pkgver.tar.gz" @@ -69,6 +66,9 @@ prepare() { # Port to GStreamer 1.0. Also backports some recorder bugfixes patch -Np1 -i ../cinnamon-gstreamer1.patch + + # Remove cinnamon-fallback-mount-helper from required components + sed -i 's/cinnamon-fallback-mount-helper;//' files/usr/share/cinnamon-session/sessions/cinnamon*.session } build() { diff --git a/community/dispcalgui/PKGBUILD b/community/dispcalgui/PKGBUILD index b8b5b2596..9d745438d 100644 --- a/community/dispcalgui/PKGBUILD +++ b/community/dispcalgui/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 96076 2013-08-20 06:32:16Z lcarlier $ +# $Id: PKGBUILD 99412 2013-10-28 11:55:41Z tredaelli $ # Maintainer: Timothy Redaelli # Contributor: Cedric Girard # Contributor: foxbunny pkgname=dispcalgui -pkgver=1.2.7.0 -pkgrel=2 +pkgver=1.5.3.1 +pkgrel=1 pkgdesc="A GUI frontend for several utilities from the open source color management system Argyll CMS" arch=('i686' 'x86_64') url="http://hoech.net/dispcalGUI/" @@ -15,7 +15,7 @@ depends=('argyllcms' 'wxpython' 'hicolor-icon-theme' 'desktop-file-utils' 'pytho optdepends=('gksu: For running as root') install=${pkgname}.install source=("http://downloads.sourceforge.net/project/dispcalgui/release/${pkgver}/dispcalGUI-${pkgver}.tar.gz") -md5sums=('a0ff80ee5e560fbe208c12189e00c470') +md5sums=('1b7542ecee8f39a49b90197613a46a73') prepare() { cd "${srcdir}"/dispcalGUI-${pkgver} diff --git a/community/fish/PKGBUILD b/community/fish/PKGBUILD index dbd808f40..570885d15 100644 --- a/community/fish/PKGBUILD +++ b/community/fish/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 92181 2013-06-02 13:25:12Z bpiotrowski $ +# $Id: PKGBUILD 99431 2013-10-28 19:00:44Z bpiotrowski $ # Maintainer: Kaiting Chen # Maintainer: BartÅ‚omiej Piotrowski # Contributor: Abhishek Dasgupta @@ -6,8 +6,8 @@ # Contributor: Jan Fader pkgname=fish -pkgver=2.0.0 -pkgrel=2 +pkgver=2.1.0 +pkgrel=1 pkgdesc='Smart and user friendly shell intended mostly for interactive use' arch=('i686' 'x86_64') url='http://fishshell.com/' @@ -15,21 +15,19 @@ license=('GPL2') depends=('python2' 'inetutils') makedepends=('doxygen' 'python') install=fish.install -source=(fish-$pkgver.tar.gz::http://fishshell.com/files/$pkgver/fish.tar.gz) -md5sums=('fe5907e6af61607d4128ce891a1f6501') +source=(http://fishshell.com/files/$pkgver/fish-$pkgver.tar.gz) +md5sums=('3a29aebde522b8f52d9975d7423db99e') build() { - set -x - cd fish - autoconf + cd fish-$pkgver ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --without-xsel + --sysconfdir=/etc \ + --without-xsel make } package() { - cd fish + cd fish-$pkgver make DESTDIR="$pkgdir" install # use python2 diff --git a/community/haddock/PKGBUILD b/community/haddock/PKGBUILD index 698be2810..c04af17c1 100644 --- a/community/haddock/PKGBUILD +++ b/community/haddock/PKGBUILD @@ -1,23 +1,24 @@ -# $Id: PKGBUILD 90316 2013-05-11 13:01:51Z arodseth $ +# $Id: PKGBUILD 99417 2013-10-28 12:23:37Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: Vesa Kaihlavirta # Contributor: Arch Haskell Team pkgname=haddock pkgver=2.13.2 -pkgrel=1 +pkgrel=2 pkgdesc='Tool for generating documentation for Haskell libraries' url='http://hackage.haskell.org/package/haddock/' license=('custom:BSD3') arch=('x86_64' 'i686') makedepends=('alex' 'happy') -depends=('ghc=7.6.3-1' 'haskell-xhtml=3000.2.1' 'haskell-ghc-paths') +depends=('ghc' 'haskell-xhtml' 'haskell-ghc-paths') install="$pkgname.install" source=("http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz") sha256sums=('25e7d5819d38cbb1c9b1ff967e2a4093c776c3defaa0a249c8eabba1e70892e3') +options=('staticlibs') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ --prefix=/usr --docdir=/usr/share/doc/"$pkgname" \ @@ -30,7 +31,7 @@ build() { } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" install -Dm744 register.sh "$pkgdir/usr/share/haskell/$pkgname/register.sh" install -m744 unregister.sh \ diff --git a/community/haskell-regex-compat/PKGBUILD b/community/haskell-regex-compat/PKGBUILD index 81cb30885..4a85ba633 100644 --- a/community/haskell-regex-compat/PKGBUILD +++ b/community/haskell-regex-compat/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 99322 2013-10-26 21:11:19Z jelle $ +# $Id: PKGBUILD 99394 2013-10-28 10:42:23Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: Vesa Kaihlavirta # Contributor: Arch Haskell Team @@ -6,37 +6,39 @@ _hkgname=regex-compat pkgname=haskell-regex-compat pkgver=0.95.1 -pkgrel=6 +pkgrel=7 pkgdesc='Replaces and enhances Text.Regex' url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('x86_64' 'i686') -depends=('ghc=7.6.3-1' 'sh' 'haskell-regex-base=0.93.2' 'haskell-regex-posix=0.95.2') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install +depends=('ghc' 'haskell-regex-base' 'haskell-regex-posix') +source=("http://hackage.haskell.org/packages/archive/$_hkgname/$pkgver/$_hkgname-$pkgver.tar.gz") +install="$pkgname.install" options=('staticlibs') sha256sums=('d57cb1a5a4d66753b18eaa37a1621246f660472243b001894f970037548d953b') build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \ - --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh + cd "$_hkgname-$pkgver" + + runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \ + --docdir="/usr/share/doc/$pkgname" --libsubdir=\$compiler/site-local/\$pkgid + runhaskell Setup build + runhaskell Setup haddock + runhaskell Setup register --gen-script + runhaskell Setup unregister --gen-script + sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh } package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE + cd "$_hkgname-$pkgver" + + install -Dm744 register.sh "$pkgdir/usr/share/haskell/$pkgname/register.sh" + install -m744 unregister.sh "$pkgdir/usr/share/haskell/$pkgname/unregister.sh" + install -d -m755 "$pkgdir/usr/share/doc/ghc/html/libraries" + ln -s "/usr/share/doc/$pkgname/html" "$pkgdir/usr/share/doc/ghc/html/libraries/$_hkgname" + runhaskell Setup copy --destdir="$pkgdir" + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE" } # vim:set ts=2 sw=2 et: diff --git a/community/haskell-regex-posix/PKGBUILD b/community/haskell-regex-posix/PKGBUILD index 18a6d6cf3..2ee285bcb 100644 --- a/community/haskell-regex-posix/PKGBUILD +++ b/community/haskell-regex-posix/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 99320 2013-10-26 21:07:39Z jelle $ +# $Id: PKGBUILD 99396 2013-10-28 10:47:29Z arodseth $ # Maintainer: Alexander Rødseth # Maintainer: Vesa Kaihlavirta # Contributor: Arch Haskell Team @@ -6,21 +6,22 @@ _hkgname=regex-posix pkgname=haskell-regex-posix pkgver=0.95.2 -pkgrel=5 +pkgrel=6 pkgdesc='The posix regex backend for regex-base' -url="http://hackage.haskell.org/package/${_hkgname}" +url="http://hackage.haskell.org/package/$_hkgname" license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.6.3-1' 'sh' 'haskell-regex-base=0.93.2') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install +arch=('x86_64' 'i686') +depends=('ghc' 'haskell-regex-base') +source=("http://hackage.haskell.org/packages/archive/$_hkgname/$pkgver/$_hkgname-$pkgver.tar.gz") +install="$pkgname.install" options=('staticlibs') sha256sums=('56019921cd4a4c9682b81ec614236fea816ba8ed8785a1640cd66d8b24fc703e') build() { - cd ${srcdir}/${_hkgname}-${pkgver} + cd "$_hkgname-$pkgver" + runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \ - --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid + --docdir="/usr/share/doc/$pkgname" --libsubdir=\$compiler/site-local/\$pkgid runhaskell Setup build runhaskell Setup haddock runhaskell Setup register --gen-script @@ -29,14 +30,15 @@ build() { } package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE + cd "$_hkgname-$pkgver" + + install -Dm744 register.sh "$pkgdir/usr/share/haskell/$pkgname/register.sh" + install -m744 unregister.sh "$pkgdir/usr/share/haskell/$pkgname/unregister.sh" + install -d -m755 "$pkgdir/usr/share/doc/ghc/html/libraries" + ln -s "/usr/share/doc/$pkgname/html" "$pkgdir/usr/share/doc/ghc/html/libraries/$_hkgname" + runhaskell Setup copy --destdir="$pkgdir" + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE" } # vim:set ts=2 sw=2 et: diff --git a/community/haskell-tar/PKGBUILD b/community/haskell-tar/PKGBUILD index 968bcb1cd..6f62a0f20 100644 --- a/community/haskell-tar/PKGBUILD +++ b/community/haskell-tar/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 89321 2013-04-28 16:52:43Z td123 $ +# $Id: PKGBUILD 99400 2013-10-28 10:58:26Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: Arch Haskell Team pkgname=haskell-tar pkgver=0.4.0.1 -pkgrel=5 +pkgrel=6 pkgdesc='Reading, writing and manipulating tar archive files' url='http://hackage.haskell.org/package/tar' license=('custom:BSD3') @@ -13,6 +13,7 @@ depends=('ghc=7.6.3-1') source=("http://hackage.haskell.org/packages/archive/tar/$pkgver/tar-$pkgver.tar.gz") install=haskell-tar.install sha256sums=('a408274d8325f4e3144c5aa154d72f1ee7b0a7342570fd6805e3be3fe0d97a6d') +options=('staticlibs') build() { cd "$srcdir/tar-$pkgver" diff --git a/community/haskell-xhtml/PKGBUILD b/community/haskell-xhtml/PKGBUILD index 67ee0ad24..8f85d691d 100644 --- a/community/haskell-xhtml/PKGBUILD +++ b/community/haskell-xhtml/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 68685 2012-03-31 16:54:07Z arodseth $ +# $Id: PKGBUILD 99398 2013-10-28 10:55:23Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: Vesa Kaihlavirta # Contributor: Arch Haskell Team @@ -6,14 +6,15 @@ _hkgname=xhtml pkgname=haskell-xhtml pkgver=3000.2.1 -pkgrel=4 +pkgrel=5 pkgdesc='Combinators for producing XHTML 1.0' url='http://hackage.haskell.org/package/xhtml' license=('custom:BSD3') arch=('x86_64' 'i686') depends=('ghc=7.6.3-1' 'sh') source=("http://hackage.haskell.org/packages/archive/$_hkgname/$pkgver/$_hkgname-$pkgver.tar.gz") -install=$pkgname.install +install="$pkgname.install" +options=('staticlibs') sha256sums=('33020782170c1c083bc59fc3bfcb72cec2db223e02d1181c07ae23b9fa7fdcd8') build() { diff --git a/community/libclastfm/PKGBUILD b/community/libclastfm/PKGBUILD index b566ae17a..cc0af7731 100644 --- a/community/libclastfm/PKGBUILD +++ b/community/libclastfm/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 72448 2012-06-14 16:10:56Z ttopper $ +# $Id: PKGBUILD 99439 2013-10-28 21:06:50Z ttoepper $ # Maintainer: Thorsten Töpper pkgname=libclastfm pkgver=0.5 -pkgrel=1 +pkgrel=2 pkgdesc="An unofficial C-API for the Last.fm web service" arch=("i686" "x86_64") url="http://liblastfm.sourceforge.net/" diff --git a/community/libdbi/PKGBUILD b/community/libdbi/PKGBUILD index e0c031534..b820b6c11 100644 --- a/community/libdbi/PKGBUILD +++ b/community/libdbi/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 87114 2013-03-27 13:46:18Z ttoepper $ +# $Id: PKGBUILD 99441 2013-10-28 21:28:36Z ttoepper $ # Maintainer: Thorsten Töpper # Contributor: Carl Flippin pkgname=libdbi pkgver=0.9.0 -pkgrel=1 +pkgrel=2 pkgdesc="A database independant abstraction layer for C" url="http://libdbi.sourceforge.net" license=('LGPL') diff --git a/community/lxappearance/PKGBUILD b/community/lxappearance/PKGBUILD index 98b7c0477..8febf7adf 100644 --- a/community/lxappearance/PKGBUILD +++ b/community/lxappearance/PKGBUILD @@ -1,30 +1,28 @@ -#$Id: PKGBUILD 96680 2013-09-03 01:45:50Z bgyorgy $ +#$Id: PKGBUILD 99433 2013-10-28 19:01:06Z bpiotrowski $ # Maintainer: BartÅ‚omiej Piotrowski # Contributor: Angel Velasquez # Contributor: Geoffroy Carrier pkgname=lxappearance -pkgver=0.5.2 -pkgrel=2 -pkgdesc="Feature-rich GTK+ theme switcher of the LXDE Desktop" +pkgver=0.5.3 +pkgrel=1 +pkgdesc='Feature-rich GTK+ theme switcher of the LXDE Desktop' arch=('i686' 'x86_64') license=('GPL2') -url="http://lxde.org/" +url='http://lxde.org/' groups=('lxde') depends=('gtk2') makedepends=('intltool') source=(http://downloads.sourceforge.net/sourceforge/lxde/${pkgname}-${pkgver}.tar.gz) -md5sums=('a088c6ef08fd25df7dc3be5b07168bbe') +md5sums=('9dfdc9bd45519d51b9df2ad6650c36f5') build() { - cd "$srcdir/$pkgname-$pkgver" - - ./configure --sysconfdir=/etc --prefix=/usr - make + cd $pkgname-$pkgver + ./configure --sysconfdir=/etc --prefix=/usr + make } package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir" install + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install } diff --git a/community/lxsplit/PKGBUILD b/community/lxsplit/PKGBUILD new file mode 100644 index 000000000..28326d8cc --- /dev/null +++ b/community/lxsplit/PKGBUILD @@ -0,0 +1,25 @@ +# $Id: PKGBUILD 99429 2013-10-28 18:50:40Z xyne $ +# Contributor: Damir Perisa +# Maintainer: Xyne + +pkgname=lxsplit +pkgver=0.2.4 +pkgrel=3 +pkgdesc="Command-line file splitter/joiner compatible with any HJSplit version" +arch=('i686' 'x86_64') +url="http://lxsplit.sourceforge.net/" +license=('GPL') +depends=('glibc') +source=("http://downloads.sourceforge.net/sourceforge/lxsplit/lxsplit-${pkgver}.tar.gz") +sha256sums=('858fa939803b2eba97ccc5ec57011c4f4b613ff299abbdc51e2f921016845056') + +build() { + cd "$srcdir/$pkgname-$pkgver" + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + install -d "$pkgdir/usr/bin" + make INSTALL_PATH="$pkgdir/usr/bin" install +} diff --git a/community/miniupnpc/PKGBUILD b/community/miniupnpc/PKGBUILD index 6b163f4c4..7f4858d6a 100644 --- a/community/miniupnpc/PKGBUILD +++ b/community/miniupnpc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 92933 2013-06-19 14:29:17Z tredaelli $ +# $Id: PKGBUILD 99404 2013-10-28 11:22:46Z tredaelli $ # Maintainer: Timothy Redaelli # Contributor: Florian Loitsch pkgname=miniupnpc pkgver=1.8 -pkgrel=1 +pkgrel=2 pkgdesc="A small UPnP client library/tool to access Internet Gateway Devices" arch=('i686' 'x86_64') url="http://miniupnp.free.fr" diff --git a/community/mpv/PKGBUILD b/community/mpv/PKGBUILD index 75e4bdfa8..66cf7c9a1 100644 --- a/community/mpv/PKGBUILD +++ b/community/mpv/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 99197 2013-10-25 12:45:06Z giovanni $ +# $Id: PKGBUILD 99435 2013-10-28 20:04:56Z bpiotrowski $ # Maintainer: BartÅ‚omiej Piotrowski # Contributor: Eivind Uggedal pkgname=mpv pkgver=0.2.1 -pkgrel=2 +pkgrel=3 pkgdesc='Video player based on MPlayer/mplayer2' arch=('i686' 'x86_64') license=('GPL') @@ -14,7 +14,7 @@ depends=( 'libquvi' 'mpg123' 'libxv' 'libxkbcommon' 'libva' 'lirc-utils' 'desktop-file-utils' 'hicolor-icon-theme' 'xdg-utils' ) -makedepends=('mesa' 'python-docutils') +makedepends=('mesa' 'python-docutils' 'lua') options=(!emptydirs) install=mpv.install source=("https://github.com/mpv-player/$pkgname/archive/v$pkgver.tar.gz") diff --git a/community/nmon/PKGBUILD b/community/nmon/PKGBUILD index 6420dedb8..8c938cf04 100644 --- a/community/nmon/PKGBUILD +++ b/community/nmon/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 67998 2012-03-16 23:55:43Z giovanni $ +# $Id: PKGBUILD 99425 2013-10-28 14:29:30Z mtorromeo $ # Maintainer: Massimiliano Torromeo pkgname=nmon -pkgver=14g -pkgrel=3 +pkgver=14i +pkgrel=1 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") -md5sums=('e537f51446fb375140368b115dc8278b') +sha256sums=('d401cb5048e3e8e8f1ad63e68a0499c73ec64d5d2b7c41a1aeb2b596374eaa86') build() { cd ${srcdir} - cc -o nmon lmon$pkgver.c -g -O2 -D JFS -D GETUSER -Wall -D LARGEMEM -lncurses -g + cc -o nmon lmon$pkgver.c -g -O2 -D JFS -D GETUSER -Wall -D LARGEMEM -lncurses -g -D X86 } package() { diff --git a/community/openjpeg2/PKGBUILD b/community/openjpeg2/PKGBUILD new file mode 100644 index 000000000..177a798b1 --- /dev/null +++ b/community/openjpeg2/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 99383 2013-10-28 09:50:41Z spupykin $ +# Maintainer: Sergej Pupykin + +pkgname=openjpeg2 +pkgver=2.0.0 +pkgrel=1 +pkgdesc="An open source JPEG 2000 codec, version ${pkgver}" +arch=(i686 x86_64) +license=('BSD') +url="http://www.openjpeg.org" +makedepends=('cmake') +depends=('zlib') +options=('!libtool') +source=(http://openjpeg.googlecode.com/files/openjpeg-${pkgver}.tar.gz) +sha1sums=('0af78ab2283b43421458f80373422d8029a9f7a7') + +build() { + cd "${srcdir}/openjpeg-${pkgver}" + cmake -DCMAKE_INSTALL_PREFIX=/usr . + make +} + +package() { + cd "${srcdir}/openjpeg-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/community/osmo/PKGBUILD b/community/osmo/PKGBUILD index d63f21c05..0efb606e2 100644 --- a/community/osmo/PKGBUILD +++ b/community/osmo/PKGBUILD @@ -1,36 +1,38 @@ -# $Id: PKGBUILD 90853 2013-05-14 21:40:39Z andrea $ +# $Id: PKGBUILD 99427 2013-10-28 16:13:05Z jgc $ # Maintainer: Jaroslav Lichtblau # Contributor: Geoffroy Carrier # Contributor: Benzo pkgname=osmo -pkgver=0.2.10 -pkgrel=8 +pkgver=0.2.12 +pkgrel=1 pkgdesc="A handy personal organizer" +_svnver=937 arch=('i686' 'x86_64') url="http://clayo.org/osmo/" license=('GPL') -depends=('gtk2>=2.12' 'gtkspell' 'hicolor-icon-theme' 'libical' 'libnotify' 'libgtkhtml' 'libgringotts>=1.2.1' 'libxml2') +depends=('gtkspell' 'hicolor-icon-theme' 'libical' 'libnotify' 'webkitgtk2' 'libgringotts>=1.2.1' 'libxml2') makedepends=('pkgconfig' 'libtar') optdepends=('sox: to play sounds') -install=$pkgname.install -source=("http://downloads.sourceforge.net/osmo-pim/$pkgname-$pkgver.tar.gz" - 'osmo-0.2.10-libnotify-0.7.patch') -md5sums=('a774db748228efee96186158d553ade9' - '0b146a548f2d3208dc88e6501a8f3448') +install=osmo.install +source=(ftp://ftp.archlinux.org/other/community/osmo-${_svnver}.tar.xz + osmo-0.2.10-configure.patch) +md5sums=('ddcd0b23a24d8f1ec5abc904742233bf' + '122fc15441b6215081772a00aa532394') -build() { - cd "$srcdir/$pkgname-$pkgver" - - patch -Np0 -i "$srcdir/osmo-0.2.10-libnotify-0.7.patch" - - #libical 0.4.4 workaround - LIBICAL_CFLAGS='-I/usr/include/libical' ./configure --prefix=/usr +prepare() { + cd osmo-pim + patch -Np1 -i ../osmo-0.2.10-configure.patch + autoreconf -fi +} +build() { + cd osmo-pim + ./configure --prefix=/usr make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd osmo-pim make DESTDIR="$pkgdir" install } diff --git a/community/osmo/osmo-0.2.10-configure.patch b/community/osmo/osmo-0.2.10-configure.patch new file mode 100644 index 000000000..c5e7895b2 --- /dev/null +++ b/community/osmo/osmo-0.2.10-configure.patch @@ -0,0 +1,24 @@ +--- osmo-pim/configure.ac 2011-08-15 19:06:25.184165142 -0700 ++++ osmo-pim/configure.ac.new 2011-08-15 19:35:19.285312355 -0700 +@@ -4,7 +4,7 @@ + AC_PREREQ(2.61) + AC_INIT([Osmo], [0.2.12], [pasp@users.sf.net]) + AC_CONFIG_MACRO_DIR([m4]) +-AM_INIT_AUTOMAKE([-Wall -Werror foreign]) ++AM_INIT_AUTOMAKE([-Werror foreign]) + AC_CONFIG_SRCDIR([src/contacts.c]) + AC_CONFIG_HEADER([config.h]) + AC_MSG_CHECKING(for type of build) +@@ -245,9 +245,9 @@ + [configdir=$withval AC_SUBST([configdir])]) + AM_CONDITIONAL([CONFIGDIR], [test x$configdir != x]) + +-CFLAGS=${CFLAGS:="$BUILD_CFLAGS -Wall $PLATFORM_CFLAGS -D_GNU_SOURCE"} +-CXXFLAGS=${CXXFLAGS:="$CFLAGS"} +-CPPFLAGS="" ++CFLAGS="$BUILD_CFLAGS -Wall $PLATFORM_CFLAGS $CFLAGS" ++CXXFLAGS="$CFLAGS $CXXFLAGS" ++CPPFLAGS="-D_GNU_SOURCE" + LIBS="$gringotts_LIBS" + + AC_CONFIG_FILES([ diff --git a/community/osmo/osmo.install b/community/osmo/osmo.install index 66b9463d4..7b592b432 100644 --- a/community/osmo/osmo.install +++ b/community/osmo/osmo.install @@ -1,5 +1,5 @@ post_install() { - which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor } post_upgrade() { diff --git a/community/pam_mount/PKGBUILD b/community/pam_mount/PKGBUILD index fb054c78f..f32be3a77 100644 --- a/community/pam_mount/PKGBUILD +++ b/community/pam_mount/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 91874 2013-05-28 17:46:11Z spupykin $ +# $Id: PKGBUILD 99385 2013-10-28 09:51:00Z spupykin $ # Maintainer: Sergej Pupykin # Contributors: Sirius Bakke pkgname=pam_mount -pkgver=2.13 -pkgrel=5 +pkgver=2.14 +pkgrel=1 pkgdesc="A PAM module that can mount volumes for a user session" arch=('i686' 'x86_64') url="http://pam-mount.sourceforge.net/" @@ -13,14 +13,11 @@ depends=('util-linux' 'libhx>=3.12.1' 'libxml2>=2.6' 'openssl>0.9.7' 'cryptsetup optdepends=('hxtools: If you have something like in your config') backup=('etc/security/pam_mount.conf.xml') options=(!emptydirs !libtool) -source=("http://downloads.sourceforge.net/project/pam-mount/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz" - "$pkgname-git.patch") -md5sums=('9f75fc8e84ea9cde619cdd6a62c7de33' - 'f018cb901eb6a18447a3a1b0a50c14dd') +source=("http://downloads.sourceforge.net/project/pam-mount/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz") +md5sums=('5a130e59395cb88071b22cf5519bc681') build() { cd -- "$srcdir/$pkgname-$pkgver" - patch -p1 <$srcdir/$pkgname-git.patch aclocal libtoolize automake --add-missing diff --git a/community/plan9port/PKGBUILD b/community/plan9port/PKGBUILD index 24d9dc11c..909641caa 100644 --- a/community/plan9port/PKGBUILD +++ b/community/plan9port/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 98017 2013-10-03 19:11:32Z arodseth $ +# $Id: PKGBUILD 99408 2013-10-28 11:45:43Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: phrakture # Contributor: Fazlul Shahriar @@ -6,16 +6,16 @@ pkgname=plan9port pkgver=20130927 -pkgrel=2 +pkgrel=3 pkgdesc='Port of many programs from Plan 9 to Unix-like operating systems' arch=('x86_64' 'i686') url='http://swtch.com/plan9port/' license=('custom') -depends=('xorg-server' 'libxt' 'libxext' 'sh' 'fuse') +depends=('xorg-server' 'libxt' 'libxext' 'fuse') optdepends=('python2: for the codereview script') provides=('plan9') install='plan9.install' -options=('!zipman') +options=('!zipman' 'staticlibs') source=("http://swtch.com/$pkgname/$pkgname-$pkgver.tgz" 'plan9.sh') sha256sums=('580927688ae2df295bf7f78d0ba19588104c6b0403558ffa3cd9ed0b7b110542' diff --git a/community/processing/PKGBUILD b/community/processing/PKGBUILD index aac018b62..c2557b7d1 100644 --- a/community/processing/PKGBUILD +++ b/community/processing/PKGBUILD @@ -1,37 +1,38 @@ -# $Id: PKGBUILD 96894 2013-09-07 11:57:50Z arodseth $ +# $Id: PKGBUILD 99410 2013-10-28 11:54:28Z arodseth $ # Maintainer: Alexander Rødseth pkgname=processing -pkgver=2.0.3 +pkgver=2.1 pkgrel=1 arch=('x86_64' 'i686') pkgdesc='Programming environment for creating images, animations and interactions' url='http://www.processing.org/' license=('GPL' 'LGPL') -depends=('libgl' 'sh' 'libxxf86vm') +depends=('libgl' 'libxxf86vm') makedepends=('gendesk') -options=(!strip) +options=('!strip') # 'staticlibs') -if [ "$CARCH" == "x86_64" ]; then +if [[ $CARCH == "x86_64" ]]; then source=("http://download.$pkgname.org/$pkgname-$pkgver-linux64.tgz" "$pkgname.png::http://wiki.$pkgname.org/skins/${pkgname}skin/${pkgname}_wiki_logo.png") - sha256sums=('8d36995fb1ea0390fe6c3110372316c4b3f86e81af6a34d4e0227f4bb109f707' - '019ae700333409acbc628779747ab8f153f6647de25e4de3a9bd4a42d0d8056a') + sha256sums=('68a5fd3befeb951c57f3cfcf55e755fc2b8fbd22ad23deae01bd10d8460ce84a' + '019ae700333409acbc628779747ab8f153f6647de25e4de3a9bd4a42d0d8056a') else source=("http://download.$pkgname.org/$pkgname-$pkgver-linux32.tgz" "$pkgname.png::http://wiki.$pkgname.org/skins/${pkgname}skin/${pkgname}_wiki_logo.png") - sha256sums=('4dc0700fabce04465f1183c87939076655b9b055263cd0c5900d41bb4fa284e3' - '019ae700333409acbc628779747ab8f153f6647de25e4de3a9bd4a42d0d8056a') + sha256sums=('ccb026d685ddb7f28c3292c27ccffa6033a459d0d2dcaa703781736a26dde62f' + '019ae700333409acbc628779747ab8f153f6647de25e4de3a9bd4a42d0d8056a') fi prepare() { - gendesk --pkgname="$pkgname" --pkgdesc="$pkgdesc" + gendesk -f -n --pkgname="$pkgname" --pkgdesc="$pkgdesc" } package() { cd "$pkgname-$pkgver" - install -d "$pkgdir/usr/share/$pkgname/" "$pkgdir/usr/bin/" + install -d "$pkgdir/usr/share/$pkgname/" + install -d "$pkgdir/usr/bin/" cp -r * "$pkgdir/usr/share/$pkgname/" ln -s "/usr/share/$pkgname/$pkgname" "$pkgdir/usr/bin/$pkgname" ln -s "/usr/share/$pkgname/$pkgname-java" "$pkgdir/usr/bin/$pkgname-java" diff --git a/community/smalltalk/PKGBUILD b/community/smalltalk/PKGBUILD index edc92f438..2874782e0 100644 --- a/community/smalltalk/PKGBUILD +++ b/community/smalltalk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 88644 2013-04-20 23:03:17Z arodseth $ +# $Id: PKGBUILD 99419 2013-10-28 12:43:23Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: Kaiting Chen # Contributor: mrshpot @@ -6,14 +6,14 @@ pkgname=smalltalk pkgver=3.2.5 -pkgrel=1 +pkgrel=2 pkgdesc='Implementation of Smalltalk-80' url='http://smalltalk.gnu.org/' license=('GPL' 'LGPL') arch=('x86_64' 'i686') -options=('!libtool' '!emptydirs') +options=('!libtool' '!emptydirs' 'staticlibs') depends=('gmp' 'libffi' 'libsigsegv' 'readline' 'libltdl') -makedepends=('gdbm' 'gtk2' 'sqlite' 'tk>=8.6' 'zip') +makedepends=('gdbm' 'gtk2' 'sqlite' 'tk' 'zip') install="$pkgname.install" source=("ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz") sha256sums=('06e574e818ec49f0555d948ae53b1453d8c1df59ef597dad911a4fd1ffba1cce') @@ -23,7 +23,7 @@ optdepends=('tk: for gst-blox' 'gtk2: GUI toolkit') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" ./configure \ --prefix=/usr \ @@ -42,13 +42,13 @@ build() { } check() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" - #make check + make check || return 1 } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" make DESTDIR="$pkgdir" install diff --git a/community/xcircuit/PKGBUILD b/community/xcircuit/PKGBUILD index 2e69542a3..dc65c3841 100644 --- a/community/xcircuit/PKGBUILD +++ b/community/xcircuit/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 97641 2013-09-26 10:52:31Z spupykin $ +# $Id: PKGBUILD 99387 2013-10-28 09:51:20Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Giovanni Scafora # Contributor: simo pkgname=xcircuit -pkgver=3.7.52 +pkgver=3.7.54 pkgrel=1 pkgdesc="A program for drawing publishable-quality electrical circuit schematic diagrams" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ license=('GPL2') depends=('tk' 'libxpm' 'zlib') makedepends=('chrpath') source=(http://opencircuitdesign.com/xcircuit/archive/$pkgname-$pkgver.tgz) -md5sums=('b39a2dcce9c3844ee2e6f9b477c501f5') +md5sums=('25e60837e5db6b4ff71615505493a481') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/xmobar/PKGBUILD b/community/xmobar/PKGBUILD index 1f62f28c3..e202076b4 100644 --- a/community/xmobar/PKGBUILD +++ b/community/xmobar/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 92482 2013-06-06 20:06:10Z jelle $ +# $Id: PKGBUILD 99437 2013-10-28 20:54:44Z jelle $ # Maintainer: Sergej Pupykin # Contributor: Arch Haskell Team pkgname=xmobar -pkgver=0.18 +pkgver=0.19 pkgrel=1 pkgdesc="A Minimalistic Text Based Status Bar" url="http://hackage.haskell.org/package/xmobar" @@ -11,7 +11,7 @@ license=('custom:BSD3') arch=('i686' 'x86_64') depends=('gmp' 'libxft' 'libxinerama' 'wireless_tools' 'libxrandr') makedepends=('ghc=7.6.3-1' 'haskell-x11=1.6.1.1-3' 'haskell-x11-xft=0.3.1-9' 'haskell-utf8-string=0.3.7-5' - 'haskell-stm=2.4.2-2' 'haskell-parsec=3.1.3-3' 'haskell-mtl=2.1.2-3' 'haskell-regex-compat') + 'haskell-stm=2.4.2-2' 'haskell-parsec=3.1.3-3' 'haskell-mtl=2.1.2-3' 'haskell-regex-base' 'haskell-regex-compat') options=('strip') source=(http://hackage.haskell.org/packages/archive/xmobar/$pkgver/xmobar-$pkgver.tar.gz) @@ -28,4 +28,4 @@ package() { install -D -m644 license ${pkgdir}/usr/share/licenses/$pkgname/LICENSE } -md5sums=('4d0502fa75cd51ff23e41e1711f25adb') +md5sums=('1c5b6ac7e7afe837b79c10ae4e8b8e4d') diff --git a/community/zathura-pdf-mupdf/PKGBUILD b/community/zathura-pdf-mupdf/PKGBUILD index a32bbf391..059d7076a 100644 --- a/community/zathura-pdf-mupdf/PKGBUILD +++ b/community/zathura-pdf-mupdf/PKGBUILD @@ -5,22 +5,17 @@ pkgname=zathura-pdf-mupdf pkgver=0.2.5 -pkgrel=1 +pkgrel=2 pkgdesc="Adds pdf support to zathura by using the mupdf library" arch=('i686' 'x86_64') url="https://pwmt.org/projects/zathura/plugins/zathura-pdf-mupdf/" license=('custom') depends=('mupdf>=1.3' 'zathura' - 'jbig2dec' 'openjpeg') + 'jbig2dec' 'openjpeg2') conflicts=('zathura-pdf-poppler') source=("https://pwmt.org/projects/zathura/plugins/download/$pkgname-$pkgver.tar.gz") md5sums=('42dcdf2511ffc8f87ca6baba6c566f91') -prepare() { - cd $srcdir/$pkgname-$pkgver - sed -i 's|openjp2|openjpeg|g' config.mk -} - build() { make -C "${srcdir}/$pkgname-$pkgver" } diff --git a/core/db/PKGBUILD b/core/db/PKGBUILD index e55adeaf5..706eb4f5c 100644 --- a/core/db/PKGBUILD +++ b/core/db/PKGBUILD @@ -1,20 +1,18 @@ -# $Id: PKGBUILD 195826 2013-10-01 16:41:14Z bpiotrowski $ +# $Id: PKGBUILD 197695 2013-10-28 15:56:31Z andyrtr $ # Maintainer: Stéphane Gaudreault # Contributor: Allan McRae # Contributor: Andreas Radke pkgname=db -pkgver=5.3.21 -pkgrel=2 +pkgver=5.3.28 +pkgrel=1 pkgdesc="The Berkeley DB embedded database system" arch=('i686' 'x86_64') url="http://www.oracle.com/technology/software/products/berkeley-db/index.html" license=('custom') depends=('gcc-libs' 'sh') -options=('!libtool') -install=db.install source=(http://download.oracle.com/berkeley-db/db-${pkgver}.tar.gz) -sha1sums=('32e43c4898c8996750c958a90c174bd116fcba83') +sha1sums=('fa3f8a41ad5101f43d08bc0efb6241c9b6fc1ae9') build() { cd "${srcdir}"/$pkgname-${pkgver}/build_unix diff --git a/core/db/db.install b/core/db/db.install deleted file mode 100644 index 03b64042d..000000000 --- a/core/db/db.install +++ /dev/null @@ -1,5 +0,0 @@ -post_upgrade() { - if [ "$(vercmp $2 5.1)" -lt 0 ]; then - echo " >> Major version update. Consider running db_upgrade on Berkeley DB databases." - fi -} diff --git a/core/gawk/PKGBUILD b/core/gawk/PKGBUILD index b8ff224f6..d8ae62387 100644 --- a/core/gawk/PKGBUILD +++ b/core/gawk/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 186293 2013-05-24 07:53:32Z tpowa $ +# $Id: PKGBUILD 197682 2013-10-28 10:54:43Z tpowa $ # Maintainer: # Contributor: Tom Newsom pkgname=gawk pkgver=4.1.0 -pkgrel=1 +pkgrel=2 pkgdesc="GNU version of awk" arch=('i686' 'x86_64') url="http://www.gnu.org/software/gawk/" diff --git a/core/gettext/PKGBUILD b/core/gettext/PKGBUILD index ce5e3e8b8..c68038d1f 100644 --- a/core/gettext/PKGBUILD +++ b/core/gettext/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 193578 2013-08-24 12:17:50Z tpowa $ +# $Id: PKGBUILD 197681 2013-10-28 10:54:42Z tpowa $ # Maintainer: pkgname=gettext pkgver=0.18.3.1 -pkgrel=1 +pkgrel=2 pkgdesc="GNU internationalization library" arch=('i686' 'x86_64') url="http://www.gnu.org/software/gettext/" license=('GPL') groups=('base' 'base-devel') -depends=('gcc-libs' 'acl' 'sh' 'glib2') +depends=('gcc-libs' 'acl' 'sh' 'glib2' 'libunistring') optdepends=('cvs: for autopoint tool') options=(!libtool !docs) install=gettext.install diff --git a/core/gpm/PKGBUILD b/core/gpm/PKGBUILD index 6a6040f5b..cb2cd9bc6 100644 --- a/core/gpm/PKGBUILD +++ b/core/gpm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 186057 2013-05-20 18:53:27Z eric $ +# $Id: PKGBUILD 197717 2013-10-28 22:26:50Z eric $ # Maintainer: Eric Bélanger pkgname=gpm pkgver=1.20.7 -pkgrel=3 +pkgrel=4 pkgdesc="A mouse server for the console and xterm" arch=('i686' 'x86_64') url="http://www.nico.schottelius.org/software/gpm/" diff --git a/core/pam/PKGBUILD b/core/pam/PKGBUILD index a3c10cdca..7cbc47890 100644 --- a/core/pam/PKGBUILD +++ b/core/pam/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 196782 2013-10-19 06:36:42Z tpowa $ +# $Id: PKGBUILD 197680 2013-10-28 10:54:41Z tpowa $ # Maintainer: Tobias Powalowski # Contributor: judd pkgname=pam pkgver=1.1.8 -pkgrel=1 +pkgrel=2 pkgdesc="PAM (Pluggable Authentication Modules) library" arch=('i686' 'x86_64') license=('GPL2') @@ -28,7 +28,13 @@ build() { cd $srcdir/pam_unix2-2.9.1 patch -Np1 -i ../pam_unix2-glibc216.patch - ./configure --libdir=/usr/lib --sbindir=/usr/bin + + # modify flags to build against the pam compiled here, not a system lib. + ./configure \ + CFLAGS="$CFLAGS -I$srcdir/Linux-PAM-$pkgver/libpam/include/" \ + LDFLAGS="$LDFLAGS -L$srcdir/Linux-PAM-$pkgver/libpam/.libs/" \ + --libdir=/usr/lib \ + --sbindir=/usr/bin make } diff --git a/core/pam/pam.install b/core/pam/pam.install deleted file mode 100644 index 55ea99700..000000000 --- a/core/pam/pam.install +++ /dev/null @@ -1,12 +0,0 @@ -# arg 1: the new package version -post_install() { - # need to run this immediately -- pacman only runs it at the end of - # all package installs - usr/bin/ldconfig -r . -} - -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - post_install $1 -} diff --git a/core/pam/pam_namespace-build-1.1.6.patch b/core/pam/pam_namespace-build-1.1.6.patch deleted file mode 100644 index aeabc234c..000000000 --- a/core/pam/pam_namespace-build-1.1.6.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- modules/pam_namespace/Makefile~ 2012-10-12 10:59:13.557550706 +0200 -+++ modules/pam_namespace/Makefile 2012-10-12 10:59:13.564217270 +0200 -@@ -869,7 +869,7 @@ - - - install-data-local: -- mkdir -p $(namespaceddir) -+ mkdir -p $(DESTDIR)$(namespaceddir) - README: pam_namespace.8.xml namespace.conf.5.xml - -include $(top_srcdir)/Make.xml.rules - diff --git a/extra/cups/PKGBUILD b/extra/cups/PKGBUILD index 11c38fa4f..65873259e 100644 --- a/extra/cups/PKGBUILD +++ b/extra/cups/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 196352 2013-10-12 07:52:54Z andyrtr $ +# $Id: PKGBUILD 197696 2013-10-28 15:56:36Z andyrtr $ # Maintainer: Andreas Radke pkgbase="cups" pkgname=('libcups' 'cups') -pkgver=1.6.4 +pkgver=1.7.0 pkgrel=1 arch=('i686' 'x86_64') license=('GPL') @@ -11,7 +11,7 @@ url="http://www.cups.org/" makedepends=('libtiff>=4.0.0' 'libpng>=1.5.7' 'acl' 'pam' 'xdg-utils' 'krb5' 'gnutls>=2.8.3' 'cups-filters' 'bc' 'colord' 'xinetd' 'gzip' 'autoconf' 'libusb' 'dbus-core' 'avahi' 'hicolor-icon-theme' 'systemd') source=(#http://mirror.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2 - http://www.cups.org/software/${pkgver}/cups-${pkgver}-source.tar.gz + http://www.cups.org/software/${pkgver}/cups-${pkgver}-source.tar.bz2 cups.logrotate cups.pam # improve build and linking cups-no-export-ssllibs.patch @@ -30,19 +30,19 @@ source=(#http://mirror.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.b cupsd-no-crash-on-avahi-threaded-poll-shutdown.patch get-ppd-file-for-statically-configured-ipp-shared-queues.patch ppd-poll-with-client-conf.patch) -md5sums=('17c948b442dfdb3c53f5c8b7eaa1442f' +md5sums=('5ab496a2ce27017fcdb3d7ec4818a75a' 'f861b18f4446c43918c8643dcbbd7f6d' '96f82c38f3f540b53f3e5144900acf17' '3ba9e3410df1dc3015463d615ef91b3b' 'cc4101beccb5ed6deb1c92707a575925' '90c30380d4c8cd48a908cfdadae1ea24' - 'b4868b83f7f2d6ec24a1be76509379f0' + '555a1c71151ce990e176315b46e3de2f' 'a2a88b3a3257c3b5fd3edcc169e6aca4' '8fe27d4248cacbc02824e7937cab4088' 'df0c367c0022e3c7d8e01827e8a6c5e7' 'f30c2a161caaf27854581507cde8cac6' '5117f65342fcc69c6a506529e4daca9e' - '9247e218eea94ebda0aebc8ee0e77db8' + '451609db34f95209d64c38474de27ce1' 'cb58bf4e0b80eaee383712e5c84a1ab4' 'b578bcd17949a7203237ba1e31f78ef9' '0becd6ab8782b97f19a02c1dc174c75e') @@ -71,12 +71,12 @@ prepare() { patch -Np1 -i ${srcdir}/cups-dbus-utf8.patch # Fixed crash which sometimes happens on shutdown of the CUPS daemon, caused by a wrong shutdown sequence for shutting down the Avahi threaded poll. - patch -Np1 -i ${srcdir}/cupsd-no-crash-on-avahi-threaded-poll-shutdown.patch +# patch -Np1 -i ${srcdir}/cupsd-no-crash-on-avahi-threaded-poll-shutdown.patch # Applications could not get the PPD file for statically-configured IPP-shared print queues patch -Np1 -i ${srcdir}/get-ppd-file-for-statically-configured-ipp-shared-queues.patch # If an external server is used via client.conf and the DNS is inconsistent (ex: DNS gives "noname" for many IPs, reverse DNS gives one of these IPs # for "noname") local PPDs can get polled for print queues instead of the PPDs of the external server Bug: http://www.cups.org/str.php?L2763 - patch -Np1 -i ${srcdir}/ppd-poll-with-client-conf.patch +# patch -Np1 -i ${srcdir}/ppd-poll-with-client-conf.patch # fix permissions on some files - alternative: cups-0755.patch by FC patch -Np0 -i ${srcdir}/cups-1.6.0-fix-install-perms.patch # move /var/run -> /run for pid file @@ -200,7 +200,7 @@ optdepends=('xdg-utils: xdg .desktop file support') rm -v ${pkgdir}/usr/share/cups/banners/* rm -v ${pkgdir}/usr/share/cups/data/testprint # comment out all conversion rules which use any of the removed filters - perl -p -i -e 's:^(.*\s+bannertops\s*)$:#\1:' /usr/share/cups/mime/mime.convs + perl -p -i -e 's:^(.*\s+bannertops\s*)$:#\1:' $pkgdir/usr/share/cups/mime/mime.convs # Provide native service for arch-daemons generator ln -s cups.service "$pkgdir/usr/lib/systemd/system/cupsd.service" diff --git a/extra/cups/cups-1.6.2-statedir.patch b/extra/cups/cups-1.6.2-statedir.patch index 3e836657d..c44ebed07 100644 --- a/extra/cups/cups-1.6.2-statedir.patch +++ b/extra/cups/cups-1.6.2-statedir.patch @@ -1,12 +1,12 @@ diff -ruN cups-1.6.2.orig/config-scripts/cups-directories.m4 cups-1.6.2/config-scripts/cups-directories.m4 --- cups-1.6.2.orig/config-scripts/cups-directories.m4 2012-10-01 03:55:23.000000000 +0200 +++ cups-1.6.2/config-scripts/cups-directories.m4 2013-04-02 00:11:41.000000000 +0200 -@@ -429,7 +429,7 @@ - ;; - *) - # All others -- CUPS_STATEDIR="$localstatedir/run/cups" -+ CUPS_STATEDIR="/run/cups" - ;; - esac +@@ -420,7 +420,7 @@ + ;; + *) + # All others +- CUPS_STATEDIR="$localstatedir/run/cups" ++ CUPS_STATEDIR="/run/cups" + ;; + esac]) AC_DEFINE_UNQUOTED(CUPS_STATEDIR, "$CUPS_STATEDIR") diff --git a/extra/cups/cups-systemd-socket.patch b/extra/cups/cups-systemd-socket.patch index 83fabdb4f..cfbe93354 100644 --- a/extra/cups/cups-systemd-socket.patch +++ b/extra/cups/cups-systemd-socket.patch @@ -1,7 +1,7 @@ -diff -up cups-1.6b1/config.h.in.systemd-socket cups-1.6b1/config.h.in ---- cups-1.6b1/config.h.in.systemd-socket 2012-05-17 00:57:03.000000000 +0200 -+++ cups-1.6b1/config.h.in 2012-05-28 11:16:35.657250584 +0200 -@@ -506,6 +506,13 @@ +diff -up cups-1.7rc1/config.h.in.systemd-socket cups-1.7rc1/config.h.in +--- cups-1.7rc1/config.h.in.systemd-socket 2013-05-29 13:51:34.000000000 +0200 ++++ cups-1.7rc1/config.h.in 2013-07-12 11:16:53.257546263 +0200 +@@ -451,6 +451,13 @@ /* @@ -15,9 +15,9 @@ diff -up cups-1.6b1/config.h.in.systemd-socket cups-1.6b1/config.h.in * Various scripting languages... */ -diff -up cups-1.6b1/config-scripts/cups-systemd.m4.systemd-socket cups-1.6b1/config-scripts/cups-systemd.m4 ---- cups-1.6b1/config-scripts/cups-systemd.m4.systemd-socket 2012-05-28 11:16:35.658250577 +0200 -+++ cups-1.6b1/config-scripts/cups-systemd.m4 2012-05-28 11:16:35.658250577 +0200 +diff -up cups-1.7rc1/config-scripts/cups-systemd.m4.systemd-socket cups-1.7rc1/config-scripts/cups-systemd.m4 +--- cups-1.7rc1/config-scripts/cups-systemd.m4.systemd-socket 2013-07-12 11:16:53.257546263 +0200 ++++ cups-1.7rc1/config-scripts/cups-systemd.m4 2013-07-12 11:16:53.257546263 +0200 @@ -0,0 +1,36 @@ +dnl +dnl "$Id$" @@ -55,9 +55,9 @@ diff -up cups-1.6b1/config-scripts/cups-systemd.m4.systemd-socket cups-1.6b1/con +dnl +dnl "$Id$" +dnl -diff -up cups-1.6b1/configure.in.systemd-socket cups-1.6b1/configure.in ---- cups-1.6b1/configure.in.systemd-socket 2012-04-23 19:26:57.000000000 +0200 -+++ cups-1.6b1/configure.in 2012-05-28 11:16:35.658250577 +0200 +diff -up cups-1.7rc1/configure.in.systemd-socket cups-1.7rc1/configure.in +--- cups-1.7rc1/configure.in.systemd-socket 2013-07-08 23:15:13.000000000 +0200 ++++ cups-1.7rc1/configure.in 2013-07-12 11:16:53.257546263 +0200 @@ -33,6 +33,7 @@ sinclude(config-scripts/cups-pam.m4) sinclude(config-scripts/cups-largefile.m4) sinclude(config-scripts/cups-dnssd.m4) @@ -66,20 +66,20 @@ diff -up cups-1.6b1/configure.in.systemd-socket cups-1.6b1/configure.in sinclude(config-scripts/cups-defaults.m4) sinclude(config-scripts/cups-scripting.m4) -@@ -66,6 +67,9 @@ AC_OUTPUT(Makedefs +@@ -67,6 +68,9 @@ AC_OUTPUT(Makedefs conf/snmp.conf cups-config data/testprint -+ data/cups.service -+ data/cups.socket -+ data/cups.path ++ data/cups.service ++ data/cups.socket ++ data/cups.path desktop/cups.desktop + doc/help/ref-cups-files-conf.html doc/help/ref-cupsd-conf.html - doc/help/standard.html -diff -up cups-1.6b1/cups/usersys.c.systemd-socket cups-1.6b1/cups/usersys.c ---- cups-1.6b1/cups/usersys.c.systemd-socket 2012-04-23 19:26:57.000000000 +0200 -+++ cups-1.6b1/cups/usersys.c 2012-05-28 11:16:35.659250570 +0200 -@@ -975,7 +975,7 @@ cups_read_client_conf( +diff -up cups-1.7rc1/cups/usersys.c.systemd-socket cups-1.7rc1/cups/usersys.c +--- cups-1.7rc1/cups/usersys.c.systemd-socket 2013-07-10 16:08:39.000000000 +0200 ++++ cups-1.7rc1/cups/usersys.c 2013-07-12 11:16:53.258546249 +0200 +@@ -1046,7 +1046,7 @@ cups_read_client_conf( struct stat sockinfo; /* Domain socket information */ if (!stat(CUPS_DEFAULT_DOMAINSOCKET, &sockinfo) && @@ -88,9 +88,9 @@ diff -up cups-1.6b1/cups/usersys.c.systemd-socket cups-1.6b1/cups/usersys.c cups_server = CUPS_DEFAULT_DOMAINSOCKET; else #endif /* CUPS_DEFAULT_DOMAINSOCKET */ -diff -up cups-1.6b1/data/cups.path.in.systemd-socket cups-1.6b1/data/cups.path.in ---- cups-1.6b1/data/cups.path.in.systemd-socket 2012-05-28 11:16:35.659250570 +0200 -+++ cups-1.6b1/data/cups.path.in 2012-05-28 11:16:35.659250570 +0200 +diff -up cups-1.7rc1/data/cups.path.in.systemd-socket cups-1.7rc1/data/cups.path.in +--- cups-1.7rc1/data/cups.path.in.systemd-socket 2013-07-12 11:16:53.258546249 +0200 ++++ cups-1.7rc1/data/cups.path.in 2013-07-12 11:16:53.258546249 +0200 @@ -0,0 +1,8 @@ +[Unit] +Description=CUPS Printer Service Spool @@ -100,9 +100,9 @@ diff -up cups-1.6b1/data/cups.path.in.systemd-socket cups-1.6b1/data/cups.path.i + +[Install] +WantedBy=multi-user.target -diff -up cups-1.6b1/data/cups.service.in.systemd-socket cups-1.6b1/data/cups.service.in ---- cups-1.6b1/data/cups.service.in.systemd-socket 2012-05-28 11:16:35.659250570 +0200 -+++ cups-1.6b1/data/cups.service.in 2012-05-28 11:16:35.659250570 +0200 +diff -up cups-1.7rc1/data/cups.service.in.systemd-socket cups-1.7rc1/data/cups.service.in +--- cups-1.7rc1/data/cups.service.in.systemd-socket 2013-07-12 11:16:53.258546249 +0200 ++++ cups-1.7rc1/data/cups.service.in 2013-07-12 11:16:53.258546249 +0200 @@ -0,0 +1,10 @@ +[Unit] +Description=CUPS Printing Service @@ -114,9 +114,9 @@ diff -up cups-1.6b1/data/cups.service.in.systemd-socket cups-1.6b1/data/cups.ser +[Install] +Also=cups.socket cups.path +WantedBy=printer.target -diff -up cups-1.6b1/data/cups.socket.in.systemd-socket cups-1.6b1/data/cups.socket.in ---- cups-1.6b1/data/cups.socket.in.systemd-socket 2012-05-28 11:16:35.660250563 +0200 -+++ cups-1.6b1/data/cups.socket.in 2012-05-28 11:16:35.660250563 +0200 +diff -up cups-1.7rc1/data/cups.socket.in.systemd-socket cups-1.7rc1/data/cups.socket.in +--- cups-1.7rc1/data/cups.socket.in.systemd-socket 2013-07-12 11:16:53.259546235 +0200 ++++ cups-1.7rc1/data/cups.socket.in 2013-07-12 11:16:53.259546235 +0200 @@ -0,0 +1,8 @@ +[Unit] +Description=CUPS Printing Service Sockets @@ -126,9 +126,9 @@ diff -up cups-1.6b1/data/cups.socket.in.systemd-socket cups-1.6b1/data/cups.sock + +[Install] +WantedBy=sockets.target -diff -up cups-1.6b1/data/Makefile.systemd-socket cups-1.6b1/data/Makefile ---- cups-1.6b1/data/Makefile.systemd-socket 2011-08-27 11:23:01.000000000 +0200 -+++ cups-1.6b1/data/Makefile 2012-05-28 11:16:35.660250563 +0200 +diff -up cups-1.7rc1/data/Makefile.systemd-socket cups-1.7rc1/data/Makefile +--- cups-1.7rc1/data/Makefile.systemd-socket 2013-05-29 13:51:34.000000000 +0200 ++++ cups-1.7rc1/data/Makefile 2013-07-12 11:16:53.259546235 +0200 @@ -100,6 +100,12 @@ install-data: $(INSTALL_DATA) $$file $(DATADIR)/ppdc; \ done @@ -152,10 +152,10 @@ diff -up cups-1.6b1/data/Makefile.systemd-socket cups-1.6b1/data/Makefile # -diff -up cups-1.6b1/Makedefs.in.systemd-socket cups-1.6b1/Makedefs.in ---- cups-1.6b1/Makedefs.in.systemd-socket 2012-05-28 11:16:35.648250647 +0200 -+++ cups-1.6b1/Makedefs.in 2012-05-28 11:16:35.660250563 +0200 -@@ -134,11 +134,13 @@ CXXFLAGS = @CPPFLAGS@ @CXXFLAGS@ +diff -up cups-1.7rc1/Makedefs.in.systemd-socket cups-1.7rc1/Makedefs.in +--- cups-1.7rc1/Makedefs.in.systemd-socket 2013-07-12 11:16:53.246546416 +0200 ++++ cups-1.7rc1/Makedefs.in 2013-07-12 11:17:49.327768742 +0200 +@@ -134,6 +134,7 @@ CXXFLAGS = @CPPFLAGS@ @CXXFLAGS@ CXXLIBS = @CXXLIBS@ DBUS_NOTIFIER = @DBUS_NOTIFIER@ DBUS_NOTIFIERLIBS = @DBUS_NOTIFIERLIBS@ @@ -163,13 +163,15 @@ diff -up cups-1.6b1/Makedefs.in.systemd-socket cups-1.6b1/Makedefs.in DNSSD_BACKEND = @DNSSD_BACKEND@ DSOFLAGS = -L../cups @DSOFLAGS@ DSOLIBS = @DSOLIBS@ $(COMMONLIBS) - DNSSDLIBS = @DNSSDLIBS@ +@@ -141,6 +142,7 @@ DNSSDLIBS = @DNSSDLIBS@ + IPPFIND_BIN = @IPPFIND_BIN@ + IPPFIND_MAN = @IPPFIND_MAN@ LAUNCHDLIBS = @LAUNCHDLIBS@ +SDLIBS = @SDLIBS@ LDFLAGS = -L../cgi-bin -L../cups -L../filter -L../ppdc \ -L../scheduler @LDARCHFLAGS@ \ @LDFLAGS@ @RELROFLAGS@ @PIEFLAGS@ $(OPTIM) -@@ -229,6 +231,7 @@ PAMFILE = @PAMFILE@ +@@ -231,6 +233,7 @@ PAMFILE = @PAMFILE@ DEFAULT_LAUNCHD_CONF = @DEFAULT_LAUNCHD_CONF@ DBUSDIR = @DBUSDIR@ @@ -177,9 +179,9 @@ diff -up cups-1.6b1/Makedefs.in.systemd-socket cups-1.6b1/Makedefs.in # -diff -up cups-1.6b1/scheduler/client.h.systemd-socket cups-1.6b1/scheduler/client.h ---- cups-1.6b1/scheduler/client.h.systemd-socket 2012-03-22 21:30:20.000000000 +0100 -+++ cups-1.6b1/scheduler/client.h 2012-05-28 11:16:35.661250556 +0200 +diff -up cups-1.7rc1/scheduler/client.h.systemd-socket cups-1.7rc1/scheduler/client.h +--- cups-1.7rc1/scheduler/client.h.systemd-socket 2013-05-29 13:51:34.000000000 +0200 ++++ cups-1.7rc1/scheduler/client.h 2013-07-12 11:16:53.260546222 +0200 @@ -77,6 +77,9 @@ typedef struct int fd; /* File descriptor for this server */ http_addr_t address; /* Bind address of socket */ @@ -190,9 +192,9 @@ diff -up cups-1.6b1/scheduler/client.h.systemd-socket cups-1.6b1/scheduler/clien } cupsd_listener_t; -diff -up cups-1.6b1/scheduler/listen.c.systemd-socket cups-1.6b1/scheduler/listen.c ---- cups-1.6b1/scheduler/listen.c.systemd-socket 2011-04-16 01:38:13.000000000 +0200 -+++ cups-1.6b1/scheduler/listen.c 2012-05-28 11:16:35.661250556 +0200 +diff -up cups-1.7rc1/scheduler/listen.c.systemd-socket cups-1.7rc1/scheduler/listen.c +--- cups-1.7rc1/scheduler/listen.c.systemd-socket 2013-05-29 13:51:34.000000000 +0200 ++++ cups-1.7rc1/scheduler/listen.c 2013-07-12 11:16:53.260546222 +0200 @@ -401,7 +401,11 @@ cupsdStopListening(void) lis; lis = (cupsd_listener_t *)cupsArrayNext(Listeners)) @@ -206,9 +208,9 @@ diff -up cups-1.6b1/scheduler/listen.c.systemd-socket cups-1.6b1/scheduler/liste { #ifdef WIN32 closesocket(lis->fd); -diff -up cups-1.6b1/scheduler/main.c.systemd-socket cups-1.6b1/scheduler/main.c ---- cups-1.6b1/scheduler/main.c.systemd-socket 2012-05-28 11:16:35.612250897 +0200 -+++ cups-1.6b1/scheduler/main.c 2012-05-28 12:49:32.698375139 +0200 +diff -up cups-1.7rc1/scheduler/main.c.systemd-socket cups-1.7rc1/scheduler/main.c +--- cups-1.7rc1/scheduler/main.c.systemd-socket 2013-07-12 11:16:53.212546887 +0200 ++++ cups-1.7rc1/scheduler/main.c 2013-07-12 11:16:53.261546208 +0200 @@ -26,6 +26,8 @@ * launchd_checkin() - Check-in with launchd and collect the listening * fds. @@ -229,7 +231,7 @@ diff -up cups-1.6b1/scheduler/main.c.systemd-socket cups-1.6b1/scheduler/main.c #if defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO) # include #endif /* HAVE_MALLOC_H && HAVE_MALLINFO */ -@@ -78,6 +84,9 @@ +@@ -83,6 +89,9 @@ static void launchd_checkin(void); static void launchd_checkout(void); #endif /* HAVE_LAUNCHD */ @@ -239,7 +241,7 @@ diff -up cups-1.6b1/scheduler/main.c.systemd-socket cups-1.6b1/scheduler/main.c static void parent_handler(int sig); static void process_children(void); static void sigchld_handler(int sig); -@@ -528,6 +537,13 @@ main(int argc, /* I - Number of comm +@@ -574,6 +583,13 @@ main(int argc, /* I - Number of comm } #endif /* HAVE_LAUNCHD */ @@ -253,7 +255,7 @@ diff -up cups-1.6b1/scheduler/main.c.systemd-socket cups-1.6b1/scheduler/main.c /* * Startup the server... */ -@@ -738,6 +754,15 @@ main(int argc, /* I - Number of comm +@@ -762,6 +778,15 @@ main(int argc, /* I - Number of comm } #endif /* HAVE_LAUNCHD */ @@ -269,7 +271,7 @@ diff -up cups-1.6b1/scheduler/main.c.systemd-socket cups-1.6b1/scheduler/main.c /* * Startup the server... */ -@@ -1516,6 +1541,102 @@ launchd_checkout(void) +@@ -1511,6 +1536,102 @@ launchd_checkout(void) } #endif /* HAVE_LAUNCHD */ @@ -372,10 +374,10 @@ diff -up cups-1.6b1/scheduler/main.c.systemd-socket cups-1.6b1/scheduler/main.c /* * 'parent_handler()' - Catch USR1/CHLD signals... -diff -up cups-1.6b1/scheduler/Makefile.systemd-socket cups-1.6b1/scheduler/Makefile ---- cups-1.6b1/scheduler/Makefile.systemd-socket 2012-05-21 19:40:22.000000000 +0200 -+++ cups-1.6b1/scheduler/Makefile 2012-05-28 11:16:35.663250542 +0200 -@@ -371,7 +371,7 @@ cupsd: $(CUPSDOBJS) $(LIBCUPSMIME) ../cu +diff -up cups-1.7rc1/scheduler/Makefile.systemd-socket cups-1.7rc1/scheduler/Makefile +--- cups-1.7rc1/scheduler/Makefile.systemd-socket 2013-05-29 13:51:34.000000000 +0200 ++++ cups-1.7rc1/scheduler/Makefile 2013-07-12 11:16:53.261546208 +0200 +@@ -381,7 +381,7 @@ cupsd: $(CUPSDOBJS) $(LIBCUPSMIME) ../cu $(CC) $(LDFLAGS) -o cupsd $(CUPSDOBJS) -L. -lcupsmime \ $(LIBZ) $(SSLLIBS) $(LIBSLP) $(LIBLDAP) $(PAMLIBS) \ $(LIBPAPER) $(LIBMALLOC) $(SERVERLIBS) $(DNSSDLIBS) $(LIBS) \ @@ -384,7 +386,7 @@ diff -up cups-1.6b1/scheduler/Makefile.systemd-socket cups-1.6b1/scheduler/Makef cupsd-static: $(CUPSDOBJS) libcupsmime.a ../cups/$(LIBCUPSSTATIC) echo Linking $@... -@@ -379,7 +379,7 @@ cupsd-static: $(CUPSDOBJS) libcupsmime.a +@@ -389,7 +389,7 @@ cupsd-static: $(CUPSDOBJS) libcupsmime.a $(LIBZ) $(SSLLIBS) $(LIBSLP) $(LIBLDAP) $(PAMLIBS) \ ../cups/$(LIBCUPSSTATIC) $(COMMONLIBS) $(LIBZ) $(LIBPAPER) \ $(LIBMALLOC) $(SERVERLIBS) $(DNSSDLIBS) $(LIBGSSAPI) \ diff --git a/extra/f2fs-tools/PKGBUILD b/extra/f2fs-tools/PKGBUILD index f77be22ec..d0ffb79d0 100644 --- a/extra/f2fs-tools/PKGBUILD +++ b/extra/f2fs-tools/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 197003 2013-10-21 12:37:50Z tpowa $ +# $Id: PKGBUILD 197684 2013-10-28 11:07:43Z tpowa $ # Maintainer: Tobias Powalowski # Contributor: Christian Hesse pkgname=f2fs-tools -pkgver=1.1.0_130404 -pkgrel=2 +pkgver=1.2.0 +pkgrel=1 pkgdesc="Tools for Flash-Friendly File System (F2FS)" arch=('i686' 'x86_64') url="http://sourceforge.net/projects/f2fs-tools/" depends=('util-linux') license=('GPL') -#source=('http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot/f2fs-tools-1.1.0.tar.gz') -source=("ftp://ftp.archlinux.org/other/packages/$pkgname/$pkgname-$pkgver.tar.bz2") -md5sums=('0bb44c174a2da2a7dd1216cc46b4612c') +source=('http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot/f2fs-tools-1.2.0.tar.gz') +#source=("ftp://ftp.archlinux.org/other/packages/$pkgname/$pkgname-$pkgver.tar.bz2") options=(!libtool) +md5sums=('d27ad7cd56f6001f7e1d508d85eef195') build() { cd "${pkgname}-${pkgver}" @@ -28,4 +28,3 @@ package() { make DESTDIR="${pkgdir}/" sbindir=/usr/bin install } - diff --git a/extra/gnome-python-extras/PKGBUILD b/extra/gnome-python-extras/PKGBUILD index 6c6fc9594..ef582b32c 100644 --- a/extra/gnome-python-extras/PKGBUILD +++ b/extra/gnome-python-extras/PKGBUILD @@ -1,63 +1,51 @@ -# $Id: PKGBUILD 150866 2012-02-23 13:12:25Z ibiru $ +# $Id: PKGBUILD 197692 2013-10-28 14:46:28Z jgc $ # Maintainer: Jan de Groot pkgbase=gnome-python-extras -pkgname=('gnome-python-extras' 'python2-egg' 'python2-gksu2' 'python2-gtkhtml2' 'python2-gtkspell') +pkgname=('gnome-python-extras' 'python2-egg' 'python2-gtkspell') pkgver=2.25.3 -pkgrel=12 +pkgrel=13 arch=('i686' 'x86_64') url="http://www.daa.com.au/~james/pygtk/" license=('GPL' 'LGPL') -makedepends=('libgtkhtml' 'gtkspell' 'libgksu' 'libgnomeui' 'python2' 'pygtk' 'gnome-python') +makedepends=('gtkspell' 'libgnomeui' 'python2' 'pygtk' 'gnome-python') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/gnome-python-extras/2.25/gnome-python-extras-${pkgver}.tar.bz2 gnome-python-extras-2.25.3-update-for-2.27.2.patch) md5sums=('9f3b7ec5c57130b96061cb486b79c076' '0b0a4d93016d14f2306682301de3bda3') sha1sums=('e69e5288466c960ed6f985bb10c9969b21ed85a4' 'b065efb7f7f5baa7b95b63bcadb6a4623d1bc9e5') +prepare() { + cd $pkgbase-$pkgver + patch -Np1 -i ../gnome-python-extras-2.25.3-update-for-2.27.2.patch +} + build() { - cd "${srcdir}/gnome-python-extras-${pkgver}" - patch -Np1 -i "${srcdir}"/gnome-python-extras-2.25.3-update-for-2.27.2.patch - PYTHON=/usr/bin/python2 ./configure --prefix=/usr - make + cd $pkgbase-$pkgver + PYTHON=/usr/bin/python2 ./configure --prefix=/usr --disable-gksu --disable-gtkhtml2 --disable-gksu2 --disable-gksuui + make } package_gnome-python-extras() { - pkgdesc="Gnome Python interfaces for libraries not part of the core platform" - depends=('python2-egg' 'python2-gksu2' 'python2-gtkhtml2' 'python2-gtkspell') + pkgdesc="Gnome Python interfaces for libraries not part of the core platform" + depends=('python2-egg' 'python2-gtkspell') - cd "${srcdir}/gnome-python-extras-${pkgver}" - make install-pkgconfigDATA DESTDIR="${pkgdir}" + cd $pkgbase-$pkgver + make install-pkgconfigDATA DESTDIR="${pkgdir}" } package_python2-egg(){ - pkgdesc="Python bindings for interacting with egg" - depends=('libgnomeui' 'pygtk') - - cd "${srcdir}/gnome-python-extras-${pkgver}" - make -C egg install DESTDIR="${pkgdir}" -} - -package_python2-gksu2() { - pkgdesc="Python bindings for the gksu2" - depends=('libgksu' 'pygtk') - - cd "${srcdir}/gnome-python-extras-${pkgver}" - make -C gksu2 install DESTDIR="${pkgdir}" -} - -package_python2-gtkhtml2() { - pkgdesc="Python bindings for the gtkhtml2" - depends=('libgtkhtml' 'pygtk') + pkgdesc="Python bindings for interacting with egg" + depends=('libgnomeui' 'pygtk') - cd "${srcdir}/gnome-python-extras-${pkgver}" - make -C gtkhtml2 install DESTDIR="${pkgdir}" + cd $pkgbase-$pkgver + make -C egg install DESTDIR="${pkgdir}" } package_python2-gtkspell() { - pkgdesc="Python bindings for the gtkspell" - depends=('gtkspell' 'pygtk') + pkgdesc="Python bindings for the gtkspell" + depends=('gtkspell' 'pygtk') - cd "${srcdir}/gnome-python-extras-${pkgver}" - make -C gtkspell install DESTDIR="${pkgdir}" + cd $pkgbase-$pkgver + make -C gtkspell install DESTDIR="${pkgdir}" } diff --git a/extra/libdiscid/PKGBUILD b/extra/libdiscid/PKGBUILD index 86ad80d34..fe380c773 100644 --- a/extra/libdiscid/PKGBUILD +++ b/extra/libdiscid/PKGBUILD @@ -1,16 +1,15 @@ -# $Id: PKGBUILD 195896 2013-10-03 23:11:52Z eric $ +# $Id: PKGBUILD 197662 2013-10-28 01:29:10Z eric $ # Maintainer: Andrea Scarpino # Contributor: Eric Gillingham pkgname=libdiscid pkgver=0.6.1 -pkgrel=1 +pkgrel=2 pkgdesc="A Library for creating MusicBrainz DiscIDs" arch=('i686' 'x86_64') url="http://musicbrainz.org/doc/libdiscid" license=('LGPL') depends=('glibc') -options=('!libtool') source=("http://ftp.musicbrainz.org/pub/musicbrainz/libdiscid/${pkgname}-${pkgver}.tar.gz") md5sums=('98c4b281780707e6b446cc526a825e7a') diff --git a/extra/libdvdcss/PKGBUILD b/extra/libdvdcss/PKGBUILD index ac4a04c7c..d14311bd5 100644 --- a/extra/libdvdcss/PKGBUILD +++ b/extra/libdvdcss/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 195484 2013-10-01 06:01:26Z bpiotrowski $ +# $Id: PKGBUILD 197664 2013-10-28 02:02:53Z eric $ +# Maintainer: # Contributor: Stéphane Gaudreault # Contributor: arjan # Contributor Sarah Hay pkgname=libdvdcss pkgver=1.2.13 -pkgrel=2 +pkgrel=3 pkgdesc="Portable abstraction library for DVD decryption" url="http://www.videolan.org/libdvdcss" arch=('i686' 'x86_64') license=('GPL') depends=('glibc') -options=('!libtool' '!docs' '!emptydirs') +options=('!docs' '!emptydirs') source=(http://download.videolan.org/pub/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2) sha1sums=('1a4a5e55c7529da46386c1c333340eee2c325a77') diff --git a/extra/libglade/PKGBUILD b/extra/libglade/PKGBUILD index c72cc5b5c..aaf925e09 100644 --- a/extra/libglade/PKGBUILD +++ b/extra/libglade/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 197348 2013-10-25 02:47:37Z allan $ +# $Id: PKGBUILD 197694 2013-10-28 14:56:48Z jgc $ # Maintainer: Jan de Groot pkgname=libglade pkgver=2.6.4 -pkgrel=4 +pkgrel=5 pkgdesc="Allows you to load glade interface files in a program at runtime" arch=(i686 x86_64) license=('LGPL') @@ -17,15 +17,19 @@ url="http://www.gnome.org" md5sums=('d1776b40f4e166b5e9c107f1c8fe4139' '4f879c0ce550004905aa0fb24f25c353') +prepare() { + cd $pkgname-$pkgver + patch -Np1 -i ../libglade-2.0.1-nowarning.patch +} + build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/libglade-2.0.1-nowarning.patch" - PYTHON=python2 ./configure --sysconfdir=/etc --prefix=/usr --localstatedir=/var + cd $pkgname-$pkgver + PYTHON=/usr/bin/python2 ./configure --sysconfdir=/etc --prefix=/usr --localstatedir=/var make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd $pkgname-$pkgver make DESTDIR="${pkgdir}" install install -m755 libglade-convert "${pkgdir}/usr/bin/" } diff --git a/extra/libgnomekbd/PKGBUILD b/extra/libgnomekbd/PKGBUILD index dddbeb21e..c04b9767d 100644 --- a/extra/libgnomekbd/PKGBUILD +++ b/extra/libgnomekbd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 169950 2012-10-30 22:46:37Z heftig $ +# $Id: PKGBUILD 197690 2013-10-28 14:25:11Z jgc $ # Maintainer: Jan de Groot pkgname=libgnomekbd pkgver=3.6.0 -pkgrel=1 +pkgrel=2 pkgdesc="Gnome keyboard library" url="http://gswitchit.sourceforge.net" arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ sha256sums=('c41ea5b0f64da470925ba09f9f1b46b26b82d4e433e594b2c71eab3da8856a09') build() { cd "$pkgname-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc \ - --disable-schemas-compile + --disable-schemas-compile --disable-static make } diff --git a/extra/libgtkhtml/PKGBUILD b/extra/libgtkhtml/PKGBUILD deleted file mode 100644 index 354ced8c4..000000000 --- a/extra/libgtkhtml/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 148828 2012-02-05 11:51:59Z ibiru $ -# Maintainer: Jan de Groot - -pkgname=libgtkhtml -pkgver=2.11.1 -pkgrel=4 -pkgdesc="An HTML library for GTK" -arch=(i686 x86_64) -license=('LGPL') -depends=('gtk2>=2.22.1' 'libxml2>=2.7.8') -makedepends=('perlxml') -options=('!libtool') -url="http://www.gnome.org" -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.11/${pkgname}-${pkgver}.tar.bz2) -md5sums=('a1d1a197dcff8c4571659deef5495e24') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/extra/libieee1284/PKGBUILD b/extra/libieee1284/PKGBUILD index 9b0537d36..d098af445 100644 --- a/extra/libieee1284/PKGBUILD +++ b/extra/libieee1284/PKGBUILD @@ -1,26 +1,25 @@ -# $Id: PKGBUILD 150619 2012-02-18 23:03:40Z pierre $ +# $Id: PKGBUILD 197666 2013-10-28 02:14:49Z eric $ # Maintainer: Tobias Powalowski # Contributor: Manolis Tzanidakis pkgname=libieee1284 pkgver=0.2.11 -pkgrel=4 -pkgdesc="A library to query devices connected in parallel port." +pkgrel=5 +pkgdesc="A library to query devices connected in parallel port" arch=('i686' 'x86_64') license=('GPL2') url="http://cyberelk.net/tim/libieee1284" depends=('python2') -options=('!libtool') source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2") md5sums=('b8fff9f3d121531bc17430e3f4ea6ed0') build() { - cd $srcdir/$pkgname-$pkgver + cd $pkgname-$pkgver ./configure --prefix=/usr --mandir=/usr/share/man make } package() { - cd $srcdir/$pkgname-$pkgver + cd $pkgname-$pkgver make DESTDIR="$pkgdir"/ install } diff --git a/extra/libmpd/PKGBUILD b/extra/libmpd/PKGBUILD index a268177c5..cfa4b4e4e 100644 --- a/extra/libmpd/PKGBUILD +++ b/extra/libmpd/PKGBUILD @@ -1,26 +1,25 @@ -# $Id: PKGBUILD 136733 2011-08-31 19:31:16Z eric $ +# $Id: PKGBUILD 197668 2013-10-28 02:28:33Z eric $ # Maintainer: Andrea Scarpino # Contributor: tobias pkgname=libmpd pkgver=11.8.17 -pkgrel=1 +pkgrel=2 pkgdesc="Signal based wrapper around libmpdclient" arch=('i686' 'x86_64') url="http://gmpc.wikia.com/wiki/Gnome_Music_Player_Client" license=('GPL') depends=('glib2') -options=('!libtool') source=(http://download.sarine.nl/Programs/gmpc/${pkgver%.*}/${pkgname}-${pkgver}.tar.gz) md5sums=('5ae3d87467d52aef3345407adb0a2488') 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/libofa/PKGBUILD b/extra/libofa/PKGBUILD index 4604e91a0..76f3bd7aa 100644 --- a/extra/libofa/PKGBUILD +++ b/extra/libofa/PKGBUILD @@ -1,41 +1,46 @@ -# $Id: PKGBUILD 150605 2012-02-18 22:48:27Z pierre $ +# $Id: PKGBUILD 197670 2013-10-28 02:51:05Z eric $ # Maintainer: Andrea Scarpino # Contributor: Tobias Powalowski pkgname=libofa pkgver=0.9.3 -pkgrel=4 +pkgrel=5 pkgdesc="An open-source audio fingerprint by MusicIP" arch=('i686' 'x86_64') url="http://code.google.com/p/musicip-libofa/" license=('GPL2' 'custom') depends=('expat' 'curl' 'fftw') -makedepends=('pkgconfig') -options=('!libtool') source=("http://musicip-libofa.googlecode.com/files/$pkgname-$pkgver.tar.gz" 'gcc-4.patch' 'gcc4.3.patch' 'gcc4.5.patch' - 'libofa-0.9.3-curl-7.21.patch') + 'libofa-0.9.3-curl-7.21.patch' + 'libofa-0.9.3-gcc-4.7.patch') md5sums=('51507d2c4b432bd2755f48d58471696e' 'a6f78b90bd0f4354d022a71c3e58ef6c' 'dd57db13770b8f8d196e8a3d3a50e713' 'c245363368d0e6fa2b4676364b81b74f' - '2e1579d74613cfbb1799d0ab5f1a4cba') + '2e1579d74613cfbb1799d0ab5f1a4cba' + 'a53a0104f9b5bba220322c6d0b68bf96') + +prepare() { + cd ${pkgname}-${pkgver} + patch -p0 -i "${srcdir}/gcc-4.patch" + patch -p1 -i "${srcdir}/gcc4.3.patch" + patch -p1 -i "${srcdir}/gcc4.5.patch" + patch -p1 -i "${srcdir}/libofa-0.9.3-gcc-4.7.patch" + patch -p1 -i "${srcdir}/libofa-0.9.3-curl-7.21.patch" +} build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p0 -i ${srcdir}/gcc-4.patch - patch -p1 -i ${srcdir}/gcc4.3.patch - patch -p1 -i ${srcdir}/gcc4.5.patch - patch -p1 -i ${srcdir}/libofa-0.9.3-curl-7.21.patch + cd ${pkgname}-${pkgver} ./configure --prefix=/usr make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR=${pkgdir} install + cd ${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/libofa/libofa-0.9.3-gcc-4.7.patch b/extra/libofa/libofa-0.9.3-gcc-4.7.patch new file mode 100644 index 000000000..c5ab09876 --- /dev/null +++ b/extra/libofa/libofa-0.9.3-gcc-4.7.patch @@ -0,0 +1,22 @@ +diff -up libofa-0.9.3/examples/uselame.cpp.gcc47 libofa-0.9.3/examples/uselame.cpp +--- libofa-0.9.3/examples/uselame.cpp.gcc47 2012-01-14 09:35:24.343146853 -0600 ++++ libofa-0.9.3/examples/uselame.cpp 2012-01-14 09:35:49.956826634 -0600 +@@ -12,6 +12,7 @@ + #else + #include + #endif ++#include + + AudioData *loadWaveFile(char *file); + +diff -up libofa-0.9.3/examples/wavefile.cpp.gcc47 libofa-0.9.3/examples/wavefile.cpp +--- libofa-0.9.3/examples/wavefile.cpp.gcc47 2012-01-14 09:35:24.344146841 -0600 ++++ libofa-0.9.3/examples/wavefile.cpp 2012-01-14 16:00:54.414981160 -0600 +@@ -11,6 +11,7 @@ + #include "io.h" + #endif + #include ++#include + + static bool readBytes(int fd, unsigned char *buf, int size) { + int ct = 0; diff --git a/extra/lxsplit/PKGBUILD b/extra/lxsplit/PKGBUILD deleted file mode 100644 index 86d8a1a11..000000000 --- a/extra/lxsplit/PKGBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# $Id: PKGBUILD 137625 2011-09-10 08:31:27Z pierre $ -# Contributor: Damir Perisa - -pkgname=lxsplit -pkgver=0.2.4 -pkgrel=2 -pkgdesc="Command-line file splitter/joiner compatible with any HJSplit version" -arch=('i686' 'x86_64') -url="http://lxsplit.sourceforge.net/" -license=('GPL') -depends=('glibc') -source=("http://downloads.sourceforge.net/sourceforge/lxsplit/lxsplit-${pkgver}.tar.gz") -md5sums=('ed21a08c167c08d4d81c820782947cb1') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - install -d ${pkgdir}/usr/bin - make INSTALL_PATH=${pkgdir}/usr/bin install -} diff --git a/extra/nspr/PKGBUILD b/extra/nspr/PKGBUILD index e7dc2ef53..b62904898 100644 --- a/extra/nspr/PKGBUILD +++ b/extra/nspr/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 196165 2013-10-07 12:54:42Z jgc $ +# $Id: PKGBUILD 197714 2013-10-28 19:33:38Z jgc $ # Maintainer: Jan de Groot # Contributor: Alexander Baldeck pkgname=nspr pkgver=4.10.1 -pkgrel=1 +pkgrel=2 pkgdesc="Netscape Portable Runtime" arch=(i686 x86_64) url="http://www.mozilla.org/projects/nspr/" @@ -38,7 +38,6 @@ package() { cd $pkgname-$pkgver make DESTDIR="$pkgdir" install - chmod 644 "$pkgdir"/usr/lib/*.a ln -s nspr.pc "$pkgdir/usr/lib/pkgconfig/mozilla-nspr.pc" rm -r "$pkgdir"/usr/bin/{compile-et.pl,prerr.properties} \ "$pkgdir/usr/include/nspr/md" diff --git a/extra/orbit2/PKGBUILD b/extra/orbit2/PKGBUILD index 1e47872f1..eedfaa0cc 100644 --- a/extra/orbit2/PKGBUILD +++ b/extra/orbit2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 151081 2012-02-24 18:27:05Z ibiru $ +# $Id: PKGBUILD 197706 2013-10-28 17:41:15Z jgc $ # Maintainer: Jan de Groot pkgname=orbit2 @@ -8,7 +8,7 @@ pkgdesc="Thin/fast CORBA ORB" arch=('i686' 'x86_64') license=('LGPL' 'GPL') depends=('libidl2') -options=('!libtool' '!makeflags') +options=('!libtool' '!makeflags' 'staticlibs') url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/ORBit2/2.14/ORBit2-${pkgver}.tar.bz2) sha256sums=('55c900a905482992730f575f3eef34d50bda717c197c97c08fa5a6eafd857550') diff --git a/extra/perl-compress-bzip2/PKGBUILD b/extra/perl-compress-bzip2/PKGBUILD index 857fa291d..d55131804 100644 --- a/extra/perl-compress-bzip2/PKGBUILD +++ b/extra/perl-compress-bzip2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 190813 2013-07-17 15:53:04Z heftig $ +# $Id: PKGBUILD 197716 2013-10-28 19:43:49Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) pkgname=perl-compress-bzip2 _realname=Compress-Bzip2 -pkgver=2.16 +pkgver=2.17 pkgrel=1 pkgdesc="Interface to Bzip2 compression library" arch=(i686 x86_64) @@ -12,7 +12,7 @@ depends=(perl bzip2) url="http://search.cpan.org/dist/Compress-Bzip2" options=('!emptydirs') source=("http://search.cpan.org/CPAN/authors/id/R/RU/RURBAN/$_realname-$pkgver.tar.gz") -md5sums=('bd7afcd949023ed2f3e9d9294848ad19') +md5sums=('d8b809f6efe3edb33f81d608c932b2ef') build() { cd "$srcdir/$_realname-$pkgver" diff --git a/extra/pulseaudio/PKGBUILD b/extra/pulseaudio/PKGBUILD index 3d58eeb0d..0466641d2 100644 --- a/extra/pulseaudio/PKGBUILD +++ b/extra/pulseaudio/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 188177 2013-06-11 17:10:36Z heftig $ +# $Id: PKGBUILD 197671 2013-10-28 05:19:14Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) # Contributor: Daniel J Griffiths # Contributor: Corrado Primier @@ -8,24 +8,26 @@ pkgbase=pulseaudio pkgname=(pulseaudio libpulse) pkgdesc="A featureful, general-purpose sound server" pkgver=4.0 -pkgrel=2 +pkgrel=5 arch=(i686 x86_64) url="http://www.freedesktop.org/wiki/Software/PulseAudio" -license=(GPL LGPL) +license=(LGPL AGPL3) makedepends=(libasyncns libcap attr libxtst libsm libsamplerate libtool rtkit - speex tdb systemd dbus avahi bluez4 bluez-libs gconf intltool jack sbc + speex tdb systemd dbus avahi bluez bluez-libs gconf intltool jack sbc lirc-utils openssl fftw orc json-c gtk3 webrtc-audio-processing - check) + check git) options=(!emptydirs !libtool) -source=(http://freedesktop.org/software/$pkgbase/releases/$pkgbase-$pkgver.tar.xz +#source=(http://freedesktop.org/software/$pkgbase/releases/$pkgbase-$pkgver.tar.xz +source=($pkgbase-$pkgver::git://anongit.freedesktop.org/pulseaudio/pulseaudio#commit=09e88de pulseaudio.xinit) -sha256sums=('35ceb36bb1822fe54f0b5e4863b4f486769fdfb8ff2111f01fd8778928f9cdae' +sha256sums=('SKIP' 'a0db6cdc74fbf0ca10e2343c08e1e228f109221c6c0ff91b0bfade5c4bdf03cf') + build() { cd $pkgbase-$pkgver - ./configure --prefix=/usr \ + ./autogen.sh --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib \ --localstatedir=/var \ @@ -45,13 +47,13 @@ package_pulseaudio() { depends=("libpulse=$pkgver-$pkgrel" rtkit libltdl speex tdb systemd fftw orc libsamplerate webrtc-audio-processing sbc) optdepends=('avahi: zeroconf support' - 'bluez4: bluetooth support' + 'bluez: bluetooth support' 'bluez-libs: bluetooth support' 'gconf: configuration through gconf (paprefs)' 'jack: jack support' 'lirc-utils: infra-red support' 'openssl: RAOP support' - 'python2-pyqt: Equalizer GUI (qpaeq)') + 'python-pyqt: Equalizer GUI (qpaeq)') backup=(etc/pulse/{daemon.conf,default.pa,system.pa}) install=pulseaudio.install @@ -63,10 +65,9 @@ package_pulseaudio() { sed -e '/autospawn/iautospawn=no' \ -i "$pkgdir/etc/pulse/client.conf" - # Speed up pulseaudio shutdown - # Lower resample quality, saves CPU + # Speed up pulseaudio shutdown so that it exits immediately with + # the last user session (module-systemd-login keeps it alive) sed -e '/exit-idle-time/iexit-idle-time=0' \ - -e '/resample-method/iresample-method=speex-float-0' \ -i "$pkgdir/etc/pulse/daemon.conf" # Disable cork-request module, can result in e.g. media players unpausing @@ -74,20 +75,10 @@ package_pulseaudio() { sed -e 's|/usr/bin/pactl load-module module-x11-cork-request|#&|' \ -i "$pkgdir/usr/bin/start-pulseaudio-x11" - # Make ConsoleKit optional - sed -e $'/load-module module-console-kit/{i.nofail\n;a.fail\n;}' \ - -i "$pkgdir/etc/pulse/default.pa" - - # Python fix - sed -i '1s:python$:&2:' "$pkgdir/usr/bin/qpaeq" - install -Dm755 "$srcdir/pulseaudio.xinit" "$pkgdir/etc/X11/xinit/xinitrc.d/pulseaudio" rm "$pkgdir/etc/dbus-1/system.d/pulseaudio-system.conf" - # cap is handled in .install - chmod 755 "$pkgdir/usr/lib/pulse/proximity-helper" - install -Dm644 shell-completion/pulseaudio-zsh-completion.zsh \ "$pkgdir/usr/share/zsh/site-functions/_pulseaudio" @@ -125,6 +116,7 @@ package_libpulse() { optdepends=('alsa-plugins: ALSA support' 'avahi: zeroconf support') backup=(etc/pulse/client.conf) + license=(LGPL) mv "$srcdir"/libpulse/* "$pkgdir" } diff --git a/extra/pulseaudio/pulseaudio.install b/extra/pulseaudio/pulseaudio.install index 9de8b0e8f..bed542ca8 100755 --- a/extra/pulseaudio/pulseaudio.install +++ b/extra/pulseaudio/pulseaudio.install @@ -1,9 +1,4 @@ -_common() { - setcap cap_net_raw=ep usr/lib/pulse/proximity-helper 2>/dev/null || chmod +s usr/lib/pulse/proximity-helper -} - post_install() { - _common cat << MES >>> See the wiki at http://wiki.archlinux.org/index.php/PulseAudio for details on configuring your system for PulseAudio. @@ -13,12 +8,11 @@ MES } post_upgrade() { - _common cat << MES >>> If you have per-user copies of configuration files (such as client.conf, - daemon.conf or default.pa) in ~/.pulse/, make sure you keep them in sync - with changes to the packaged files in /etc/pulse/. Otherwise, PulseAudio - may refuse to start due to configuration errors. + daemon.conf or default.pa) in ~/.config/pulse or ~/.pulse/, make sure you + keep them in sync with changes to the packaged files in /etc/pulse/. + Otherwise, PulseAudio may refuse to start due to configuration errors. MES if (( $(vercmp $2 3.0-3) < 0 )); then cat << MES diff --git a/extra/python-numpy/PKGBUILD b/extra/python-numpy/PKGBUILD index c3d783bf9..76274656d 100755 --- a/extra/python-numpy/PKGBUILD +++ b/extra/python-numpy/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 193422 2013-08-20 06:10:08Z angvp $ +# $Id: PKGBUILD 197708 2013-10-28 18:10:31Z jgc $ # Maintainer: Jan de Groot # Contributor: Douglas Soares de Andrade # Contributor: Angel 'angvp' Velasquez @@ -6,12 +6,13 @@ pkgbase=python-numpy pkgname=('python2-numpy' 'python-numpy') pkgver=1.7.1 -pkgrel=2 +pkgrel=3 pkgdesc="Scientific tools for Python" arch=('i686' 'x86_64') license=('custom') url="http://www.numpy.org/" -makedepends=('lapack' 'python' 'python2' 'python-setuptools' 'python2-setuptools' 'gcc-fortran' 'python-nose') +makedepends=('lapack' 'python' 'python2' 'python-setuptools' 'python2-setuptools' 'gcc-fortran' 'python-nose' 'python2-nose') +options=('staticlibs') source=(http://downloads.sourceforge.net/numpy/numpy-${pkgver}.tar.gz) md5sums=('0ab72b3b83528a7ae79c6df9042d61c6') @@ -33,7 +34,7 @@ build() { package_python2-numpy() { depends=('lapack' 'python2') - optdepends=('python-nose: testsuite') + optdepends=('python2-nose: testsuite') _pyver=2.7 @@ -57,6 +58,7 @@ package_python2-numpy() { package_python-numpy() { depends=('lapack' 'python') + optdepends=('python-nose: testsuite') provides=("python3-numpy=${pkgver}") replaces=('python3-numpy') conflicts=('python3-numpy') diff --git a/extra/sane/PKGBUILD b/extra/sane/PKGBUILD index b872b91ac..24db28655 100644 --- a/extra/sane/PKGBUILD +++ b/extra/sane/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 195946 2013-10-06 06:58:15Z tpowa $ +# $Id: PKGBUILD 197703 2013-10-28 17:39:46Z tpowa $ # Maintainer: Tobias Powalowski # Contributor: Sarah Hay # Contributor: Simo L. @@ -6,7 +6,7 @@ pkgname=sane pkgver=1.0.24 -pkgrel=2 +pkgrel=3 pkgdesc="Scanner Access Now Easy" url="http://www.sane-project.org/" arch=('i686' 'x86_64') @@ -18,13 +18,18 @@ source=(ftp://ftp.archlinux.org/other/sane/$pkgname-backends-$pkgver.tar.gz 'sane.xinetd' 'saned.socket' 'saned.service' - 'network.patch') + 'network.patch' + 'segfault-avahi-fix-kodakio.patch') options=(!libtool) prepare() { cd "${srcdir}/${pkgname}-backends-${pkgver}" # fix http://vasks.debian.org/tracker/?func=detail&atid=410366&aid=313760&group_id=30186 patch -Np1 -i ${srcdir}/network.patch + # fix http://anonscm.debian.org/gitweb/?p=sane/sane-backends.git;a=commit;h=37523b867d411c2f82d08128246be7e38bc9812c + # #37525 + # https://alioth.debian.org/tracker/?group_id=30186&atid=410366&func=detail&aid=314301 + patch -Np1 -i ${srcdir}/segfault-avahi-fix-kodakio.patch } build() { @@ -69,4 +74,5 @@ md5sums=('1ca68e536cd7c1852322822f5f6ac3a4' 'bc2c8b4f7b3012c8936c7da21f60e2ac' 'e57e9e15528f47f5f1b3f1411135ed5d' '3f9fe36b0c4ff0b01b53b1cffa5d9700' - '44e77692c52db15b0f530a1d9a8e1296') + '44e77692c52db15b0f530a1d9a8e1296' + '039524a38af8721f2e97d45e889295ca') diff --git a/extra/sane/segfault-avahi-fix-kodakio.patch b/extra/sane/segfault-avahi-fix-kodakio.patch new file mode 100644 index 000000000..23f9d1ca9 --- /dev/null +++ b/extra/sane/segfault-avahi-fix-kodakio.patch @@ -0,0 +1,98 @@ +From 37523b867d411c2f82d08128246be7e38bc9812c Mon Sep 17 00:00:00 2001 +From: Paul Newall +Date: Mon, 14 Oct 2013 22:22:53 +0100 +Subject: [PATCH] Bugfix in kodakaio.c to fix segfault when non kodak scanners + return unexpected data via avahi auto discovery + +--- + backend/kodakaio.c | 43 ++++++++++++++++++++++++++++++---------- + doc/descriptions/kodakaio.desc | 2 +- + 3 files changed, 37 insertions(+), 12 deletions(-) + +diff --git a/backend/kodakaio.c b/backend/kodakaio.c +index 8c4583a..b442e50 100644 +--- a/backend/kodakaio.c ++++ b/backend/kodakaio.c +@@ -127,7 +127,7 @@ for ubuntu 12.10 + + #define KODAKAIO_VERSION 02 + #define KODAKAIO_REVISION 4 +-#define KODAKAIO_BUILD 6 ++#define KODAKAIO_BUILD 7 + + /* for usb (but also used for net though it's not required). */ + #define MAX_BLOCK_SIZE 32768 +@@ -2184,6 +2184,7 @@ static void resolve_callback( + AvahiLookupResultFlags flags, + AVAHI_GCC_UNUSED void* userdata) { + ++ AvahiStringList *vid_pair_list = NULL, *pid_pair_list = NULL; + char *pidkey, *pidvalue; + char *vidkey, *vidvalue; + size_t valuesize; +@@ -2204,20 +2205,40 @@ static void resolve_callback( + avahi_address_snprint(a, sizeof(a), address); + + /* Output short for Kodak ESP */ +- DBG(min(10,DBG_AUTO), "%s:%u %s ", a,port,host_name); +- avahi_string_list_get_pair(avahi_string_list_find(txt, "vid"), +- &vidkey, &vidvalue, &valuesize); +- DBG(min(10,DBG_AUTO), "%s=%s ", vidkey, vidvalue); +- avahi_string_list_get_pair(avahi_string_list_find(txt, "pid"), +- &pidkey, &pidvalue, &valuesize); +- DBG(min(10,DBG_AUTO), "%s=%s\n", pidkey, pidvalue); ++ DBG(min(10,DBG_AUTO), "%s:%u %s\n", a,port,host_name); + ++ vid_pair_list = avahi_string_list_find(txt, "vid"); ++ if(vid_pair_list != NULL) { ++ avahi_string_list_get_pair(vid_pair_list, &vidkey, &vidvalue, &valuesize); ++ DBG(min(10,DBG_AUTO), "%s=%s ", vidkey, vidvalue); ++ } ++ else DBG(min(10,DBG_AUTO), "failed to find key vid\n"); ++ ++ pid_pair_list = avahi_string_list_find(txt, "pid"); ++ if(pid_pair_list != NULL) { ++ avahi_string_list_get_pair(pid_pair_list, &pidkey, &pidvalue, &valuesize); ++ DBG(min(10,DBG_AUTO), "%s=%s\n", pidkey, pidvalue); ++ } ++ else DBG(min(10,DBG_AUTO), "failed to find key pid\n"); ++ ++ if(pid_pair_list != NULL && vid_pair_list != NULL) { + ProcessAvahiDevice(name, vidvalue, pidvalue, a); +- avahi_free(vidkey); avahi_free(vidvalue); +- avahi_free(pidkey); avahi_free(pidvalue); ++ } ++ else DBG(min(10,DBG_AUTO), "didn't call ProcessAvahiDevice\n"); ++ ++ if(vid_pair_list != NULL) { ++ avahi_free(vidkey); ++ avahi_free(vidvalue); ++ DBG(min(15,DBG_AUTO), "vidkey and vidvalue freed\n"); ++ } ++ if(pid_pair_list != NULL) { ++ avahi_free(pidkey); ++ avahi_free(pidvalue); ++ DBG(min(15,DBG_AUTO), "pidkey and pidvalue freed\n"); ++ } + } + } +- ++ DBG(min(10,DBG_AUTO), "ending resolve_callback\n"); + avahi_service_resolver_free(r); + } + +diff --git a/doc/descriptions/kodakaio.desc b/doc/descriptions/kodakaio.desc +index 7882513..5fb18ed 100644 +--- a/doc/descriptions/kodakaio.desc ++++ b/doc/descriptions/kodakaio.desc +@@ -1,6 +1,6 @@ + :backend "kodakaio" + :url "http://sourceforge.net/projects/cupsdriverkodak/" +-:version "2.4.6" ++:version "2.4.7" + :manpage "sane-kodakaio" + :comment "Backend for Kodak AiO ESP and Hero printers. Also possibly Advent AWL10" + :devicetype :scanner +-- +1.7.10.4 + diff --git a/extra/upower/PKGBUILD b/extra/upower/PKGBUILD index a3b18fe7f..1cfb22527 100644 --- a/extra/upower/PKGBUILD +++ b/extra/upower/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 196663 2013-10-16 09:25:32Z jgc $ +# $Id: PKGBUILD 197688 2013-10-28 13:45:39Z jgc $ # Maintainer: Jan de Groot pkgname=upower -pkgver=0.9.22 -pkgrel=1 +pkgver=0.9.23 +pkgrel=2 pkgdesc="Abstraction for enumerating power devices, listening to device events and querying history and statistics" arch=('i686' 'x86_64') url="http://upower.freedesktop.org" @@ -13,13 +13,13 @@ makedepends=('intltool' 'docbook-xsl' 'gobject-introspection' 'systemd') backup=('etc/UPower/UPower.conf') options=('!libtool') source=($url/releases/$pkgname-$pkgver.tar.xz - git-fixes.patch) -md5sums=('22b0b13c16ceb1516b5edf5cf0e99d6d' - 'd47377f5f8a02e38f81b6a63d8a19ef3') + linux-clamp-percentage-for-overfull-batteries.patch) +md5sums=('39cfd97bfaf7d30908f20cf937a57634' + 'cd8eeb40c2338d28df46e22529bece62') prepare() { cd $pkgname-$pkgver - patch -Np1 -i ../git-fixes.patch + patch -Np1 -i ../linux-clamp-percentage-for-overfull-batteries.patch } build() { diff --git a/extra/upower/git-fixes.patch b/extra/upower/git-fixes.patch deleted file mode 100644 index 83c407454..000000000 --- a/extra/upower/git-fixes.patch +++ /dev/null @@ -1,112 +0,0 @@ -From e4858d94343bba2afbebcd1a4925c981a38a9579 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Thu, 10 Oct 2013 16:32:41 +0000 -Subject: up-client: Really don't overwrite retval with prop values - -db89e5a32bf2c16c0d3d00f6c8f0ef7e5e7efa8f was incomplete and -"ret" was being used instead of prop_val to set some of those -properties. It's likely your laptop would have been seen as -docked for example. ---- -diff --git a/libupower-glib/up-client.c b/libupower-glib/up-client.c -index 757e4a1..2334a68 100644 ---- a/libupower-glib/up-client.c -+++ b/libupower-glib/up-client.c -@@ -360,7 +360,7 @@ up_client_get_properties_sync (UpClient *client, GCancellable *cancellable, GErr - - prop_val = g_value_get_boolean (value) && allowed; - if (prop_val != client->priv->can_suspend) { -- client->priv->can_suspend = ret; -+ client->priv->can_suspend = prop_val; - g_object_notify (G_OBJECT(client), "can-suspend"); - } - -@@ -376,7 +376,7 @@ up_client_get_properties_sync (UpClient *client, GCancellable *cancellable, GErr - - prop_val = g_value_get_boolean (value) && allowed; - if (prop_val != client->priv->can_hibernate) { -- client->priv->can_hibernate = ret; -+ client->priv->can_hibernate = prop_val; - g_object_notify (G_OBJECT(client), "can-hibernate"); - } - #endif /* ENABLE_DEPRECATED */ -@@ -388,7 +388,7 @@ up_client_get_properties_sync (UpClient *client, GCancellable *cancellable, GErr - } - prop_val = g_value_get_boolean (value); - if (prop_val != client->priv->lid_is_closed) { -- client->priv->lid_is_closed = ret; -+ client->priv->lid_is_closed = prop_val; - g_object_notify (G_OBJECT(client), "lid-is-closed"); - } - -@@ -399,7 +399,7 @@ up_client_get_properties_sync (UpClient *client, GCancellable *cancellable, GErr - } - prop_val = g_value_get_boolean (value); - if (prop_val != client->priv->on_battery) { -- client->priv->on_battery = ret; -+ client->priv->on_battery = prop_val; - g_object_notify (G_OBJECT(client), "on-battery"); - } - -@@ -410,7 +410,7 @@ up_client_get_properties_sync (UpClient *client, GCancellable *cancellable, GErr - } - prop_val = g_value_get_boolean (value); - if (prop_val != client->priv->on_low_battery) { -- client->priv->on_low_battery = ret; -+ client->priv->on_low_battery = prop_val; - g_object_notify (G_OBJECT(client), "on-low-battery"); - } - -@@ -421,7 +421,7 @@ up_client_get_properties_sync (UpClient *client, GCancellable *cancellable, GErr - } - prop_val = g_value_get_boolean (value); - if (prop_val != client->priv->lid_is_present) { -- client->priv->lid_is_present = ret; -+ client->priv->lid_is_present = prop_val; - g_object_notify (G_OBJECT(client), "lid-is-present"); - } - -@@ -431,8 +431,8 @@ up_client_get_properties_sync (UpClient *client, GCancellable *cancellable, GErr - goto out; - } - prop_val = g_value_get_boolean (value); -- if (ret != client->priv->is_docked) { -- client->priv->is_docked = ret; -+ if (prop_val != client->priv->is_docked) { -+ client->priv->is_docked = prop_val; - g_object_notify (G_OBJECT(client), "is-docked"); - } - -@@ -443,7 +443,7 @@ up_client_get_properties_sync (UpClient *client, GCancellable *cancellable, GErr - } - prop_val = g_value_get_boolean (value); - if (prop_val != client->priv->lid_force_sleep) { -- client->priv->lid_force_sleep = ret; -+ client->priv->lid_force_sleep = prop_val; - g_object_notify (G_OBJECT(client), "lid-force-sleep"); - } - --- -cgit v0.9.0.2-2-gbebe -From d43ab28a29420a61d031908abbf1d13b2cb35796 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Thu, 10 Oct 2013 16:59:08 +0000 -Subject: lib: Fix a small memory leak - -The bus was never unreferenced in the UpWakeups object. ---- -diff --git a/libupower-glib/up-wakeups.c b/libupower-glib/up-wakeups.c -index 3729ad7..ed6bf80 100644 ---- a/libupower-glib/up-wakeups.c -+++ b/libupower-glib/up-wakeups.c -@@ -377,6 +377,8 @@ up_wakeups_finalize (GObject *object) - g_object_unref (wakeups->priv->proxy); - if (wakeups->priv->prop_proxy != NULL) - g_object_unref (wakeups->priv->prop_proxy); -+ if (wakeups->priv->bus) -+ dbus_g_connection_unref (wakeups->priv->bus); - - G_OBJECT_CLASS (up_wakeups_parent_class)->finalize (object); - } --- -cgit v0.9.0.2-2-gbebe diff --git a/extra/upower/linux-clamp-percentage-for-overfull-batteries.patch b/extra/upower/linux-clamp-percentage-for-overfull-batteries.patch new file mode 100644 index 000000000..6e643c42d --- /dev/null +++ b/extra/upower/linux-clamp-percentage-for-overfull-batteries.patch @@ -0,0 +1,72 @@ +From b8fe9902f3c6c50ca6a23e24fcea99582beebc65 Mon Sep 17 00:00:00 2001 +From: Martin Pitt +Date: Tue, 22 Oct 2013 08:02:51 +0000 +Subject: linux: Clamp percentage for overfull batteries + +Some batteries report energy > energy_full and a percentage ("capacity" +attribute) > 100%. Clamp these within 0 and 100% for both plausibility as well +as to avoid setting an out-of-range property which would then become 0%. + +https://launchpad.net/bugs/1240673 +--- +diff --git a/src/linux/integration-test b/src/linux/integration-test +index 8489bf3..4be1922 100755 +--- a/src/linux/integration-test ++++ b/src/linux/integration-test +@@ -442,6 +442,39 @@ class Tests(unittest.TestCase): + self.assertEqual(self.get_dbus_property('OnLowBattery'), False) + self.stop_daemon() + ++ def test_battery_overfull(self): ++ '''battery which reports a > 100% percentage for a full battery''' ++ ++ self.testbed.add_device('power_supply', 'BAT0', None, ++ ['type', 'Battery', ++ 'present', '1', ++ 'status', 'Full', ++ 'current_now', '1000', ++ 'charge_now', '11000000', ++ 'charge_full', '10000000', ++ 'charge_full_design', '11000000', ++ 'capacity', '110', ++ 'voltage_now', '12000000'], []) ++ ++ self.start_daemon() ++ devs = self.proxy.EnumerateDevices() ++ self.assertEqual(len(devs), 1) ++ bat0_up = devs[0] ++ ++ # should clamp percentage ++ self.assertEqual(self.get_dbus_dev_property(bat0_up, 'Percentage'), 100.0) ++ self.assertEqual(self.get_dbus_dev_property(bat0_up, 'IsPresent'), True) ++ self.assertEqual(self.get_dbus_dev_property(bat0_up, 'State'), ++ UP_DEVICE_STATE_FULLY_CHARGED) ++ self.assertEqual(self.get_dbus_dev_property(bat0_up, 'Energy'), 132.0) ++ # should adjust EnergyFull to reality, not what the battery claims ++ self.assertEqual(self.get_dbus_dev_property(bat0_up, 'EnergyFull'), 132.0) ++ self.assertEqual(self.get_dbus_dev_property(bat0_up, 'EnergyFullDesign'), 132.0) ++ self.assertEqual(self.get_dbus_dev_property(bat0_up, 'Voltage'), 12.0) ++ self.assertEqual(self.get_dbus_dev_property(bat0_up, 'PowerSupply'), True) ++ self.assertEqual(self.get_dbus_dev_property(bat0_up, 'Type'), 2) ++ self.stop_daemon() ++ + def test_battery_temperature(self): + '''battery which reports temperature''' + +diff --git a/src/linux/up-device-supply.c b/src/linux/up-device-supply.c +index 8020277..b953d65 100644 +--- a/src/linux/up-device-supply.c ++++ b/src/linux/up-device-supply.c +@@ -708,6 +708,10 @@ up_device_supply_refresh_battery (UpDeviceSupply *supply) + /* get a precise percentage */ + if (sysfs_file_exists (native_path, "capacity")) { + percentage = sysfs_get_double (native_path, "capacity"); ++ if (percentage < 0.0f) ++ percentage = 0.0f; ++ if (percentage > 100.0f) ++ percentage = 100.0f; + /* for devices which provide capacity, but not {energy,charge}_now */ + if (energy < 0.1f && energy_full > 0.0f) + energy = energy_full * percentage / 100; +-- +cgit v0.9.0.2-2-gbebe diff --git a/libre/bfgminer-libre/PKGBUILD b/libre/bfgminer-libre/PKGBUILD index db92fa191..3559adcf4 100644 --- a/libre/bfgminer-libre/PKGBUILD +++ b/libre/bfgminer-libre/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 98781 2013-10-18 14:05:15Z tredaelli $ +# $Id: PKGBUILD 99405 2013-10-28 11:43:52Z tredaelli $ # Maintainer: Timothy Redaelli # Contributor: Andy Weidenbaum _pkgname=bfgminer pkgname=bfgminer-libre -pkgver=3.3.0 +pkgver=3.4.0 pkgrel=1 pkgdesc="Bitcoin miner featuring overclocking, monitoring, fan speed control and remote management. For FPGA/GPU/CPU Bitcoin mining, without nonfree OpenCL recommendation." arch=('i686' 'x86_64' 'mips64el') -depends=('curl' 'jansson' 'libusbx' 'lm_sensors') +depends=('curl' 'jansson' 'libevent' 'libmicrohttpd' 'libusbx' 'lm_sensors') makedepends=('uthash' 'yasm') replaces=$_pkgname conflicts=$_pkgname @@ -18,7 +18,7 @@ license=('GPL3') options=(!libtool) source=(http://luke.dashjr.org/programs/bitcoin/files/$_pkgname/$pkgver/$_pkgname-$pkgver.tbz2 remove-dangerous-rpath.patch) -sha256sums=('773435dafb9b13c4450480a7731d024ffb2b7ac34d8511c9325d2a703f339ef6' +sha256sums=('5367802f303917810236be092a09400c6e105efc348eadcf27bdcea526728d67' 'd26d07ca23ae25798c4db37cfda1a6a76f22d06e73efab1ddf62b3e1a7eef04c') prepare() { @@ -31,7 +31,12 @@ prepare() { build() { cd "$srcdir"/$_pkgname-$pkgver - ./configure --prefix=/usr --enable-cpumining --enable-scrypt + ./configure --prefix=/usr \ + --enable-cpumining \ + --enable-bfsb \ + --enable-metabank \ + --enable-scrypt + # --enable-knc (FS#33640) make } diff --git a/pcr/pandoc/PKGBUILD b/pcr/pandoc/PKGBUILD index 0d2f2d8ea..49fcabcfe 100644 --- a/pcr/pandoc/PKGBUILD +++ b/pcr/pandoc/PKGBUILD @@ -5,36 +5,29 @@ pkgname=pandoc-static _pkgname=pandoc -pkgver=1.12 +pkgver=1.12.1 pkgrel=1 pkgdesc='Conversion between markup formats (no Haskell libs)' url='http://johnmacfarlane.net/pandoc/' license=('GPL') arch=('i686' 'x86_64') +# Needed for pandoc-citeproc +depends=('icu>=52' 'icu<=53') makedepends=('ghc' 'sh' 'cabal-install' 'alex' 'happy') options=(strip !makeflags !distcc !emptydirs) -#source=(https://repo.parabolagnulinux.org/other/${_pkgname}-${pkgver}-$pkgrel-any.src.tar.xz{,.sig} source=(https://repo.parabolagnulinux.org/other/${_pkgname}-${pkgver}-1-any.src.tar.xz{,.sig} SRCBUILD) -# citeproc-hs-pre-0.3.7.patch) replaces=('pandoc') provides=('pandoc') optdepends=('texlive-most: for pdf creation') -md5sums=('3d5f23060cad2ff29ba2df5651e92f8a' - 'SKIP' - 'c2e9f9b880468455b6e6a7f9ba7308e8') # PKGBUILD functions build() { - mkdir -p ${srcdir}/{build,${_pkgname}-${pkgver}} - cd ${srcdir}/${_pkgname}-${pkgver} + mkdir -p ${srcdir}/{build,${_pkgname}-${pkgver}} + cd ${srcdir}/${_pkgname}-${pkgver} -# Patches from the next citeproc-hs release -# These are needed because 0.3.6 with embed_data_files is broken -# darcs diff --from-tag=0.3.6 -# pushd ${srcdir}/${_pkgname}-${pkgver}/citeproc-hs-0.3.6 -# patch -Np1 -i ${srcdir}/citeproc-hs-pre-0.3.7.patch -# popd +# pandoc-citeproc needs hsb2hs + export PATH=${srcdir}/build/usr/bin:$PATH while read _hkpkg; do # Skip already built @@ -47,23 +40,29 @@ build() { case $_hkpkg in $_pkgname-$pkgver) HOME=${srcdir}/${_pkgname}-${pkgver} \ - cabal configure --flags='-library' \ - --prefix=/usr \ + cabal configure --prefix=/usr \ --libdir=${srcdir}/build/usr/lib -v HOME=${srcdir}/${_pkgname}-${pkgver} \ cabal build + + HOME=${srcdir}/${_pkgname}-${pkgver} \ + cabal register --inplace ;; - citeproc-hs-*) + pandoc-citeproc*) + HOME=${srcdir}/${_pkgname}-${pkgver} \ + cabal configure --flags='small_base embed_data_files bibutils hexpat unicode_collation' \ + --libdir=${srcdir}/build/usr/lib \ + --prefix=/usr -v + HOME=${srcdir}/${_pkgname}-${pkgver} \ - cabal install --flags='embed_data_files' \ - --prefix=${srcdir}/build/usr -v + cabal build ;; *) HOME=${srcdir}/${_pkgname}-${pkgver} \ - cabal install --prefix=${srcdir}/build/usr + cabal install --prefix=${srcdir}/build/usr --flags="embed_data_files" ;; esac @@ -77,11 +76,16 @@ package() { runghc Setup.hs copy --destdir=${pkgdir}/ + cd ${srcdir}/${_pkgname}-${pkgver}/pandoc-citeproc* + runghc Setup.hs copy --destdir=${pkgdir}/ + # For some reason the library is installed anyway # Remove all files and !emptydirs takes care of the rest msg2 "Removing lib files..." find ${pkgdir} -iname lib -print0 | xargs -0 rm -rvf + cp -av ${srcdir}/build/usr/bin/* ${pkgdir}/usr/bin/ + # EC is unfree and makes Parabola TeXLive cry # besides, it's unneeded sed "/fontenc/d" -i ${pkgdir}/usr/share/${_pkgname}-${pkgver}/data/templates/default.latex @@ -90,6 +94,9 @@ package() { find ${pkgdir}/usr/share -type d -exec chmod 755 {} \; msg2 "Installing licenses" - install -d ${pkgdir}/usr/share - cp -rv ${srcdir}/build/usr/share/doc ${pkgdir}/usr/share/ + install -d ${pkgdir}/usr/share/licenses + cp -rv ${srcdir}/build/usr/share/doc/* ${pkgdir}/usr/share/licenses/ } +sha256sums=('4cbeb1b112985961ff78b9baaa4cca3b24e5996c243c790fa00bbe44052cd418' + 'SKIP' + '25fae3ded388733915dbaca9970ac5f5ef53883410564305bd225a950e5951db') diff --git a/pcr/pandoc/SRCBUILD b/pcr/pandoc/SRCBUILD index f822bb1a0..242356c89 100644 --- a/pcr/pandoc/SRCBUILD +++ b/pcr/pandoc/SRCBUILD @@ -2,7 +2,7 @@ # Based on haskell-pandoc pkgname=pandoc -pkgver=1.12 +pkgver=1.12.1 pkgrel=1 pkgdesc='Conversion between markup formats (no Haskell libs)' url='http://johnmacfarlane.net/pandoc/' @@ -21,12 +21,14 @@ build() { cabal --verbose=3 update HOME=${srcdir}/${pkgname}-${pkgver} \ - cabal --verbose=3 fetch file-embed ${pkgname}-${pkgver} + cabal --verbose=3 fetch hs-bibutils network hexpat text text-icu hsb2hs ${pkgname}-${pkgver} pandoc-citeproc msg2 "Getting the dependency build order" # Ignore the cabal messages HOME=${srcdir}/${pkgname}-${pkgver} \ - cabal install --dry-run file-embed ${pkgname}-${pkgver} | grep "\-[0-9]\+" >>BUILDORDER + cabal install --flags="embed_data_files bibutils hexpat unicode_collation" --dry-run hsb2hs ${pkgname}-${pkgver} pandoc-citeproc | + grep "\-[0-9]\+" | + tee BUILDORDER } package() { diff --git a/pcr/youtube-dl-current/PKGBUILD b/pcr/youtube-dl-current/PKGBUILD index 5b8828b77..c877a3b27 100644 --- a/pcr/youtube-dl-current/PKGBUILD +++ b/pcr/youtube-dl-current/PKGBUILD @@ -5,7 +5,7 @@ pkgname=youtube-dl-current _pkgname=youtube-dl provides=(youtube-dl) -pkgver=2013.10.23.2 +pkgver=2013.10.28 pkgrel=1 pkgdesc="A small command-line program to download videos from YouTube.com and a few more sites" arch=('any') @@ -27,5 +27,5 @@ package() { "${pkgdir}/usr/share/bash-completion/completions/youtube-dl" install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE" } -md5sums=('72208a4aae88a51e1fba5d73cd5d7652' +md5sums=('cf6169efa73e6d546221eff89937bb85' 'SKIP') -- cgit v1.2.3-54-g00ecf From 7c151ac5589d3dbef5972f69a62b847ecf565bfa Mon Sep 17 00:00:00 2001 From: root Date: Wed, 30 Oct 2013 01:04:25 -0700 Subject: Wed Oct 30 01:01:59 PDT 2013 --- community/bmake/PKGBUILD | 29 ++++ community/chrony/PKGBUILD | 10 +- community/exim/PKGBUILD | 11 +- community/fbpanel/PKGBUILD | 6 +- community/gmic/PKGBUILD | 6 +- .../01-Fix-configure-failure-when-with-kmod.patch | 43 ----- community/ipset/PKGBUILD | 15 +- community/libclens/PKGBUILD | 43 +++++ community/libmediainfo/PKGBUILD | 6 +- community/lz4/PKGBUILD | 6 +- community/mailman/PKGBUILD | 10 +- community/mediainfo-gui/PKGBUILD | 6 +- community/mediainfo/PKGBUILD | 6 +- community/mg/PKGBUILD | 32 ++-- community/mg/README | 74 --------- community/mg/cleanup.patch | 178 +++------------------ community/mpv/PKGBUILD | 8 +- community/passenger/PKGBUILD | 17 +- community/perl-berkeleydb/PKGBUILD | 13 +- community/perl-fuse/PKGBUILD | 15 +- community/perl-fuse/build-fix.patch | 13 ++ community/perl-gstreamer/PKGBUILD | 8 +- community/plank/PKGBUILD | 8 +- community/python-psutil/PKGBUILD | 6 +- community/squid/PKGBUILD | 7 +- community/tcc/PKGBUILD | 10 +- community/vdrift/PKGBUILD | 4 +- core/lvm2/PKGBUILD | 6 +- core/lvm2/lvm-monitoring.service | 3 +- extra/ffmpeg-compat/PKGBUILD | 8 +- extra/ffmpeg/PKGBUILD | 8 +- extra/gdome2/PKGBUILD | 23 ++- extra/gdome2/gdome2-0.8.1-libxml2.patch | 18 +++ extra/git/PKGBUILD | 8 +- extra/hwloc/PKGBUILD | 20 ++- extra/jade/PKGBUILD | 24 +-- extra/kte-collaborative/PKGBUILD | 8 +- extra/libqinfinity/PKGBUILD | 8 +- extra/libsrtp/PKGBUILD | 4 +- extra/libzeitgeist/PKGBUILD | 11 +- extra/lzo/PKGBUILD | 25 +-- extra/nss/PKGBUILD | 4 +- extra/openmpi/PKGBUILD | 7 +- extra/perl-dbd-mysql/PKGBUILD | 8 +- extra/perl-dbi/PKGBUILD | 10 +- extra/perl-netaddr-ip/PKGBUILD | 6 +- extra/sqlite/PKGBUILD | 11 +- extra/sqlite/xbmc.patch | 22 +++ extra/vlc/PKGBUILD | 7 +- pcr/youtube-dl-current/PKGBUILD | 4 +- 50 files changed, 371 insertions(+), 472 deletions(-) create mode 100644 community/bmake/PKGBUILD delete mode 100644 community/ipset/01-Fix-configure-failure-when-with-kmod.patch create mode 100644 community/libclens/PKGBUILD delete mode 100644 community/mg/README create mode 100644 community/perl-fuse/build-fix.patch create mode 100644 extra/gdome2/gdome2-0.8.1-libxml2.patch create mode 100644 extra/sqlite/xbmc.patch (limited to 'community/mpv') diff --git a/community/bmake/PKGBUILD b/community/bmake/PKGBUILD new file mode 100644 index 000000000..76eb57865 --- /dev/null +++ b/community/bmake/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 99556 2013-10-29 17:22:35Z spupykin $ +# Maintainer: Sergej Pupykin +# Maintainer: Alex Szczuczko +# Contributor: Devin Cofer +# Contributor: Imanol Celaya + +pkgname=bmake +pkgver=20131001 +pkgrel=1 +pkgdesc="Portable version of the NetBSD 'make' build tool" +arch=('i686' 'x86_64') +url="http://www.crufty.net/help/sjg/bmake.html" +license=('BSD') +depends=('bmake-mk-files') +source=("http://www.crufty.net/ftp/pub/sjg/bmake-$pkgver.tar.gz") +sha256sums=('0a91ac60b82270c4b4f21a43e66eb51c32b4df55e01ea592e42eb323909a559b') + +build() { + rm -rf bmake-build + mkdir bmake-build + cd bmake-build + ../bmake/configure --prefix=/usr --with-default-sys-path=/usr/share/mk + sh make-bootstrap.sh +} + +package() { + install -Dm755 bmake-build/bmake "$pkgdir"/usr/bin/bmake + install -Dm644 bmake/bmake.1 "$pkgdir"/usr/share/man/man1/bmake.1 +} diff --git a/community/chrony/PKGBUILD b/community/chrony/PKGBUILD index b6b088bee..c04c7d4a1 100644 --- a/community/chrony/PKGBUILD +++ b/community/chrony/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 95307 2013-08-09 02:41:57Z thestinger $ +# $Id: PKGBUILD 99445 2013-10-29 00:06:24Z thestinger $ # Maintainer: Sergej Pupykin # Maintainer: Daniel Micay # Contributor: BartÅ‚omiej Piotrowski @@ -9,7 +9,7 @@ pkgname=chrony pkgver=1.29 -pkgrel=1 +pkgrel=2 pkgdesc='Lightweight NTP client and server' arch=('i686' 'x86_64') url="http://chrony.tuxfamily.org/" @@ -34,9 +34,9 @@ package() { install -Dm0644 "$srcdir/$pkgname-$pkgver/examples/chrony.conf.example" "$pkgdir/etc/chrony.conf" - # Arch's kernel has enhanced RTC support, make chrony use it by default - sed -i '/^! \(rtconutc\|rtcfile \/var\/lib\/chrony\/rtc\)$/ s/^! //' \ - "$pkgdir/etc/chrony.conf" + echo -e "\n# Enable kernel RTC sync\nrtcsync" >> "$pkgdir/etc/chrony.conf" + + sed -i '/^! rtconutc$/ s/^! //' "$pkgdir/etc/chrony.conf" mv "$pkgdir/usr/sbin/chronyd" "$pkgdir/usr/bin" rmdir "$pkgdir/usr/sbin" diff --git a/community/exim/PKGBUILD b/community/exim/PKGBUILD index f2bacb9de..403671761 100644 --- a/community/exim/PKGBUILD +++ b/community/exim/PKGBUILD @@ -1,11 +1,12 @@ -# $Id: PKGBUILD 92250 2013-06-03 11:15:19Z allan $ -# Maintainer: Lukas Fleischer +# $Id: PKGBUILD 99560 2013-10-29 18:01:02Z bpiotrowski $ +# Maintainer: BartÅ‚omiej Piotrowski +# Contributor: Lukas Fleischer # Contributor: Angel Velasquez # Contributor: judd pkgname=exim -pkgver=4.80.1 -pkgrel=5 +pkgver=4.82 +pkgrel=1 pkgdesc="Message Transfer Agent" arch=('x86_64' 'i686') url='http://www.exim.org/' @@ -25,7 +26,7 @@ source=("http://mirror.switch.ch/ftp/mirror/exim/exim/exim4/exim-$pkgver.tar.bz2 exim@.service exim.socket exim-submission.socket) -sha256sums=('9565b10f06be224fd03adafae2e07e6fdbb479f8873e3894ddb13f98eeebe78f' +sha256sums=('46dedfb6ced2aa4a1eddc5d8ce46a790a961508bd389faa2e215302ae80d91cf' '932c9149b6809c70e94c1256e28325d197bbf80d27322793e217d4b692d49c5a' '7f1408f9c5d905968e665941f5c5efcf9da53e7a0bbef6c66220343bc2ae994b' 'd33b8595e92ec812c9f6961f98e50b6a3986d5bd966ed4efec2c52c1fce47636' diff --git a/community/fbpanel/PKGBUILD b/community/fbpanel/PKGBUILD index 53119bb8e..287189613 100644 --- a/community/fbpanel/PKGBUILD +++ b/community/fbpanel/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 98391 2013-10-09 14:15:54Z spupykin $ +# $Id: PKGBUILD 99522 2013-10-29 10:57:06Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Jeff Mickey # Contributor: Torin Daniel @@ -6,7 +6,7 @@ pkgname=fbpanel pkgver=6.1 -pkgrel=4 +pkgrel=5 pkgdesc="NetWM compliant desktop panel" arch=('i686' 'x86_64') url="http://fbpanel.sourceforge.net/" @@ -20,7 +20,7 @@ md5sums=('80ca0c64195b30587cfcb8c2cd9887a0' build() { cd "$srcdir/$pkgname-$pkgver" patch -p1 <$srcdir/battery_fix.patch - ./configure --prefix=/usr + ./configure --prefix=/usr --libexecdir=/usr/lib echo "LDFLAGSX += -lX11 -lm" >>config.mk make } diff --git a/community/gmic/PKGBUILD b/community/gmic/PKGBUILD index 847a91c81..3c4dece82 100644 --- a/community/gmic/PKGBUILD +++ b/community/gmic/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 97134 2013-09-13 13:41:46Z spupykin $ +# $Id: PKGBUILD 99532 2013-10-29 11:26:02Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Jan "heftig" Steffens # Contributor: farid @@ -6,7 +6,7 @@ pkgbase=gmic pkgname=("gmic" "gimp-plugin-gmic" "zart") -pkgver=1.5.7.0 +pkgver=1.5.7.2 pkgrel=1 arch=("i686" "x86_64") url="http://gmic.sourceforge.net" @@ -15,7 +15,7 @@ makedepends=('gimp' 'qt4' 'fftw' 'openexr' 'opencv' 'mesa' 'gtk2') #options=('!emptydirs') source=("http://downloads.sourceforge.net/sourceforge/gmic/gmic_${pkgver}.tar.gz" "opencv-buildfix.patch") -md5sums=('76e4cc4847afb7fe8afa4d7f8690d4dc' +md5sums=('08aa65f01b5bec9cb0ff71b30102cf4e' '120319b0d6c81c5af186abe2281b79ca') prepare() { diff --git a/community/ipset/01-Fix-configure-failure-when-with-kmod.patch b/community/ipset/01-Fix-configure-failure-when-with-kmod.patch deleted file mode 100644 index d42884355..000000000 --- a/community/ipset/01-Fix-configure-failure-when-with-kmod.patch +++ /dev/null @@ -1,43 +0,0 @@ -From a76488a84db452865e114336b3fde6257e327715 Mon Sep 17 00:00:00 2001 -From: Oliver Smith -Date: Fri, 11 Oct 2013 16:41:12 +0200 -Subject: [PATCH 1/2] netfilter: ipset: Fix configure failure when - --with-kmod=no - -When configuring the sources to build without kernel modules, the path -to the kernel sources was not set and the kernel header files were still -checked. - -Now, we do not check the kernel sources for compatibility if we're not -going to build any kernel modules. - -Signed-off-by: Oliver Smith -Signed-off-by: Jozsef Kadlecsik ---- - configure.ac | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 0eb1022..d56328c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -167,6 +167,8 @@ AC_CHECK_TYPES([union nf_inet_addr],,,[#include - dnl Checks for functions - AC_CHECK_FUNCS(gethostbyname2) - -+if test "$BUILDKMOD" == "yes" -+then - dnl Check kernel incompatibilities... Ugly like hell - AC_MSG_CHECKING([kernel source for struct xt_action_param]) - if test -f $ksourcedir/include/linux/netfilter/x_tables.h && \ -@@ -309,6 +311,7 @@ else - AC_MSG_RESULT(no) - AC_MSG_ERROR([Netns support is required in the Linux kernel tree]) - fi -+fi - - dnl Checks for compiler characteristics. - dnl Check extra warning flags except --- -1.8.4 - diff --git a/community/ipset/PKGBUILD b/community/ipset/PKGBUILD index 5ec207883..e62823d19 100644 --- a/community/ipset/PKGBUILD +++ b/community/ipset/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 98882 2013-10-21 00:55:51Z seblu $ +# $Id: PKGBUILD 99568 2013-10-29 21:15:35Z seblu $ # Maintainer: Sébastien Luttringer pkgname=ipset -pkgver=6.20 -pkgrel=2 +pkgver=6.20.1 +pkgrel=1 pkgdesc='Administration tool for IP sets' arch=('i686' 'x86_64') url='http://ipset.netfilter.org' @@ -11,17 +11,10 @@ license=('GPL2') depends=('libmnl') backup=("etc/$pkgname.conf") source=("http://ipset.netfilter.org/$pkgname-$pkgver.tar.bz2" - '01-Fix-configure-failure-when-with-kmod.patch' "$pkgname.service") -md5sums=('af28b3af356fff3e4a8e321ff7145678' - '5569fd4ee93acac4ae01d091002cc2f5' +md5sums=('8af741492752fbf24d3a28a9d1473d40' '6be6a2b34c1f38fc8ad60828403e2077') -prepare() { - patch -p1 -d $pkgname-$pkgver < 01-Fix-configure-failure-when-with-kmod.patch - cd $pkgname-$pkgver && ./autogen.sh -} - build() { cd $pkgname-$pkgver ./configure --prefix=/usr --sbindir=/usr/bin --with-kmod=no diff --git a/community/libclens/PKGBUILD b/community/libclens/PKGBUILD new file mode 100644 index 000000000..5e521a830 --- /dev/null +++ b/community/libclens/PKGBUILD @@ -0,0 +1,43 @@ +# $Id: PKGBUILD 99539 2013-10-29 11:41:22Z spupykin $ +# Maintainer: Sergej Pupykin +# Maintainer: Dan Ziemba + +pkgname=libclens +pkgver=0.7.0 +pkgrel=1 +pkgdesc="Convenience library to aid in porting code from OpenBSD" +arch=(i686 x86_64) +url="https://opensource.conformal.com/wiki/clens" +license=(ISC) +makedepends=(libbsd) +options=('staticlibs') +source=(https://opensource.conformal.com/snapshots/clens/clens-$pkgver.tar.gz) +sha1sums=('71eb0011eef16f1e87131b5aba34d44db92b1145') + +build() { + cd "clens-$pkgver" + mkdir -p obj + make LOCALBASE=/usr +} + +package() { + cd "clens-$pkgver" + make LOCALBASE=/usr DESTDIR="$pkgdir" install + + mkdir -p $pkgdir/usr/share/licenses/libclens + cat <$pkgdir/usr/share/licenses/libclens/LICENSE + ISC + . + Permission to use, copy, modify, and distribute this software for any + purpose with or without fee is hereby granted, provided that the above + copyright notice and this permission notice appear in all copies. + . + THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER + IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING + OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +EOF +} diff --git a/community/libmediainfo/PKGBUILD b/community/libmediainfo/PKGBUILD index 3561880a4..a73eb9a2b 100644 --- a/community/libmediainfo/PKGBUILD +++ b/community/libmediainfo/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 90920 2013-05-15 13:45:55Z spupykin $ +# $Id: PKGBUILD 99524 2013-10-29 10:57:24Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: hydro pkgname=libmediainfo -pkgver=0.7.63 +pkgver=0.7.64 pkgrel=1 pkgdesc="shared library for mediainfo" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ makedepends=('libtool' 'automake' 'autoconf') options=(!libtool) source=(http://downloads.sourceforge.net/mediainfo/${pkgname}_${pkgver}.tar.bz2 libmediainfo-0.7.50-libmms.patch) -md5sums=('7a50881744a29dac6f93a8f6cbaebc0c' +md5sums=('27a6afbf5993c894bd38fab9b8e0fc27' '2f4b21cc250f663d52b497dedb963e3b') build() { diff --git a/community/lz4/PKGBUILD b/community/lz4/PKGBUILD index 4fcf145a9..8e8999037 100644 --- a/community/lz4/PKGBUILD +++ b/community/lz4/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 99061 2013-10-23 18:48:04Z seblu $ +# $Id: PKGBUILD 99573 2013-10-29 21:29:01Z seblu $ # Maintainer: Sébastien Luttringer # Contacted by mail, author use svn commit as release version. # He only push tested release code into svn and support using revision as version pkgname=lz4 -pkgver=106 -pkgrel=2 +pkgver=107 +pkgrel=1 pkgdesc='Very fast lossless compression algorithm' arch=('i686' 'x86_64') url='https://code.google.com/p/lz4/' diff --git a/community/mailman/PKGBUILD b/community/mailman/PKGBUILD index 91ef3a656..5bbe42856 100644 --- a/community/mailman/PKGBUILD +++ b/community/mailman/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 83707 2013-02-04 14:51:45Z seblu $ -# Maintainer: Sébastien Luttringer +# $Id: PKGBUILD 99571 2013-10-29 21:25:25Z seblu $ +# Maintainer: Sébastien Luttringer # Contributor: Paul Mattal pkgname=mailman -pkgver=2.1.15 -pkgrel=3 +pkgver=2.1.16 +pkgrel=1 pkgdesc='The GNU Mailing List Manager' arch=(i686 x86_64) license=('GPL') @@ -20,7 +20,7 @@ source=("http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tgz" "$pkgname.profile.sh" "$pkgname.profile.csh" "$pkgname.service") -md5sums=('7d207489e8e9de0727cb334d46029833' +md5sums=('ab8969dc68661f7a7af3beb797a46b3e' 'ed04d062379eb21e39ce1e70e6b1ade2' 'a9c71ec940c56173415fbd49087d10b0' '85a8c30ffc444e677b286f54df530482' diff --git a/community/mediainfo-gui/PKGBUILD b/community/mediainfo-gui/PKGBUILD index cf721eebe..d8fa8daba 100644 --- a/community/mediainfo-gui/PKGBUILD +++ b/community/mediainfo-gui/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 90926 2013-05-15 13:47:03Z spupykin $ +# $Id: PKGBUILD 99528 2013-10-29 10:58:03Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: hydro pkgname=mediainfo-gui -pkgver=0.7.63 +pkgver=0.7.64 pkgrel=1 pkgdesc="GUI for mediainfo" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('libmediainfo' 'wxgtk') makedepends=('libtool' 'automake' 'autoconf') install=mediainfo-gui.install source=(http://downloads.sourceforge.net/mediainfo/mediainfo_${pkgver}.tar.bz2) -md5sums=('bd794e4066b6bb197af23cb7b8ba832b') +md5sums=('f5cb798cf3b121359ab3173d70526518') build() { cd $srcdir/MediaInfo/Project/GNU/GUI diff --git a/community/mediainfo/PKGBUILD b/community/mediainfo/PKGBUILD index 3166fd6ad..951ec689f 100644 --- a/community/mediainfo/PKGBUILD +++ b/community/mediainfo/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 90924 2013-05-15 13:46:41Z spupykin $ +# $Id: PKGBUILD 99526 2013-10-29 10:57:46Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: hydro pkgname=mediainfo -pkgver=0.7.63 +pkgver=0.7.64 pkgrel=1 pkgdesc="supplies technical and tag information about a video or audio file" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('GPL') depends=('libmediainfo') makedepends=('libtool' 'automake' 'autoconf') source=(http://downloads.sourceforge.net/mediainfo/${pkgname}_${pkgver}.tar.bz2) -md5sums=('bd794e4066b6bb197af23cb7b8ba832b') +md5sums=('f5cb798cf3b121359ab3173d70526518') build() { cd $srcdir/MediaInfo/Project/GNU/CLI diff --git a/community/mg/PKGBUILD b/community/mg/PKGBUILD index be271595b..607c3b6c2 100644 --- a/community/mg/PKGBUILD +++ b/community/mg/PKGBUILD @@ -1,34 +1,38 @@ -# $Id: PKGBUILD 62917 2012-01-29 07:15:53Z spupykin $ +# $Id: PKGBUILD 99541 2013-10-29 11:42:26Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Hannes Rist pkgname=mg -pkgver=20110905 +pkgver=20130922 pkgrel=1 pkgdesc="mg is Micro GNU/emacs, this is a portable version of the mg maintained by the OpenBSD team." arch=('i686' 'x86_64') url="http://homepage.boetes.org/software/mg/" -depends=('ncurses') +depends=('ncurses' 'libbsd') +makedepends=('bmake' 'libclens') license=('custom') options=(!libtool) source=(http://homepage.boetes.org/software/mg/mg-$pkgver.tar.gz - README cleanup.patch) -md5sums=('2de35316fa8ebafe6003efaae70b723e' - '8cc5195ad4fabcf7c6782764f9617748' - 'e009afe0d249593f3436b2fea110f72e') +md5sums=('35bd196ab32bae3531d6bc48be8779d0' + '163ca88d422cf0cf0a3a44de9a2a3ac3') -build() { +prepare() { cd $srcdir/$pkgname-$pkgver - unset CFLAGS patch -p1 <$srcdir/cleanup.patch - ./configure - make prefix=/usr +} + +build() { + cd $srcdir/$pkgname-$pkgver + bmake prefix=/usr +} + +package() { + cd $srcdir/$pkgname-$pkgver mkdir -p $pkgdir/usr/bin - make install INSTALL=/bin/install prefix=$pkgdir/usr + bmake install INSTALL=install prefix=/usr DESTDIR=$pkgdir BINDIR=/usr/bin mkdir -p $pkgdir/usr/share/ - mv $pkgdir/usr/man $pkgdir/usr/share/ - install -D -m0644 $srcdir/README $pkgdir/usr/share/licenses/$pkgname/README + install -D -m0644 README $pkgdir/usr/share/licenses/$pkgname/README } diff --git a/community/mg/README b/community/mg/README deleted file mode 100644 index cf2d78917..000000000 --- a/community/mg/README +++ /dev/null @@ -1,74 +0,0 @@ -[This is an edited version of the original mg README, updated slightly to -reflect changes in the last 20 years.] - - -Mg (mg) is a Public Domain EMACS style editor. It is "broadly" -compatible with GNU Emacs, the latest creation of Richard M. -Stallman, Chief GNUisance and inventor of Emacs. GNU Emacs (and other -portions of GNU as they are released) are essentially free, (there are -handling charges for obtaining it) and so is Mg. You may never have -to learn another editor. (But probably will, at least long enough to -port Mg...) Mg was formerly named MicroGnuEmacs, the name change was -done at the request of Richard Stallman. - -Mg is not associated with the GNU project, and most of it does not -have the copyright restrictions present in GNU Emacs. (However, some -of the system dependent modules and the regular expression module do -have copyright notices. Look at the source code for exact -copyright restrictions.) The Mg authors individually may or may not -agree with the opinions expressed by Richard Stallman in "The GNU -Manifesto". - -This program is intended to be a small, fast, and portable editor for -people who can't (or don't want to) run real Emacs for one reason -or another. It is compatible with GNU because there shouldn't be -any reason to learn more than one Emacs flavor. - - -Beyond the work of Dave Conroy, author of the original public domain -v30, the current version contains the work of: - - blarson@ecla.usc.edu Bob Larson - mic@emx.utexas.edu Mic Kaczmarczik - mwm@violet.berkeley.edu Mike Meyer - sandra@cs.utah.edu Sandra Loosemore - mp1u+@andrew.cmu.edu Michael Portuesi - RCKG01M@CALSTATE.BITNET Stephen Walton - hakanson@mist.cs.orst.edu Marion Hakanson - -People who have worked on previous versions of Mg: - - rtech!daveb@sun.com Dave Brower - -Currently maintained in the OpenBSD src tree, with contributions from -many others. - ----------------------------------------------------------------------- - -Known limitations: - -Recursive bindings may cause help and key rebinding code to go into -an infinite loop, aborting with a stack overflow. - -Overwrite mode does not work in macros. (Characters are inserted -rather than overwriting.) - -Dired mode has some problems: Rename does not update the buffer. -Doing a dired again will update the buffer (whether it needs it or -not) and will lose any marks for deletion. .. and . are not -recognized as special cases. - -On systems with 16 bit integers, the kill buffer cannot exceed 32767 -bytes. - - - -New implementation oddities: - -insert and define-key are new commands corresponding to the mocklisp -functions in Gnu Emacs. (Mg does not have non-command functions.) -(Mg's insert will only insert one string.) - -The display wrap code does not work at all like that of GNU emacs. - - diff --git a/community/mg/cleanup.patch b/community/mg/cleanup.patch index 5a8e761cb..b12ed8fea 100644 --- a/community/mg/cleanup.patch +++ b/community/mg/cleanup.patch @@ -1,163 +1,21 @@ -Only in mg-20110120.my: autoexec.o -Only in mg-20110120.my: basename.o -Only in mg-20110120.my: basic.o -Only in mg-20110120.my: buffer.o -Only in mg-20110120.my: cinfo.o -diff -wbBur mg-20110120/cmode.c mg-20110120.my/cmode.c ---- mg-20110120/cmode.c 2011-01-20 07:36:13.000000000 +0300 -+++ mg-20110120.my/cmode.c 2011-11-21 15:40:11.000000000 +0400 -@@ -158,7 +158,7 @@ - cc_indent(int f, int n) - { - int pi, mi; /* Previous indents */ -- int ci, dci; /* current indent, don't care */ -+ int ci; /* current indent, don't care */ - struct line *lp; - int ret; - -@@ -181,7 +181,7 @@ - /* Strip leading space on current line */ - delleadwhite(FFRAND, 1); - /* current indent is computed only to current position */ -- dci = getindent(curwp->w_dotp, &ci); -+ getindent(curwp->w_dotp, &ci); - - if (pi + ci < 0) - ret = indent(FFOTHARG, 0); -@@ -217,7 +217,6 @@ - { - int lo, co; /* leading space, current offset*/ - int nicol = 0; /* position count */ -- int ccol = 0; /* current column */ - int c = '\0'; /* current char */ - int newind = 0; /* new index value */ - int stringp = FALSE; /* in string? */ -@@ -226,7 +225,6 @@ - int nparen = 0; /* paren count */ - int obrace = 0; /* open brace count */ - int cbrace = 0; /* close brace count */ -- int contp = FALSE; /* Continue? */ - int firstnwsp = FALSE; /* First nonspace encountered? */ - int colonp = FALSE; /* Did we see a colon? */ - int questionp = FALSE; /* Did we see a question mark? */ -@@ -256,13 +254,11 @@ - nicol = 0; +diff -wbBur mg-20130922/Makefile mg-20130922.y/Makefile +--- mg-20130922/Makefile 2013-09-22 18:06:43.000000000 +0400 ++++ mg-20130922.y/Makefile 2013-10-29 15:18:18.795139731 +0400 +@@ -4,7 +4,7 @@ + NOGCCERROR= true + PROG= mg - newind = 0; -- ccol = nicol; /* current column */ - /* Compute modifiers */ - for (co = lo; co < llength(lp); co++) { - c = lgetc(lp, co); - /* We have a non-whitespace char */ - if (!firstnwsp && !isspace(c)) { -- contp = TRUE; - if (c == '#') - cppp = TRUE; - firstnwsp = TRUE; -@@ -285,7 +281,6 @@ - } else if (c == '{') { - obrace++; - firstnwsp = FALSE; -- contp = FALSE; - } else if (c == '}') { - cbrace++; - } else if (c == '?') { -@@ -294,9 +289,6 @@ - /* ignore (foo ? bar : baz) construct */ - if (!questionp) - colonp = TRUE; -- } else if (c == ';') { -- if (nparen > 0) -- contp = FALSE; - } else if (c == '/') { - /* first nonwhitespace? -> indent */ - if (firstnwsp) { -Only in mg-20110120.my: cmode.o -diff -wbBur mg-20110120/config.h mg-20110120.my/config.h ---- mg-20110120/config.h 2011-01-20 07:37:40.000000000 +0300 -+++ mg-20110120.my/config.h 2011-11-21 15:39:43.000000000 +0400 -@@ -7,4 +7,8 @@ - #ifndef MAXLOGNAME - #define MAXLOGNAME LOGIN_NAME_MAX - #endif --#define HAVE_ARC4RANDOM -+#define HAVE_NOSTRTONUM -+#define HAVE_NOSTRLCPY -+#define HAVE_NOSTRLCAT -+#define HAVE_NOFGETLN -+#define GNU_LS -Only in mg-20110120.my: config.log -Only in mg-20110120.my: dired.o -Only in mg-20110120.my: dirname.o -Only in mg-20110120.my: dir.o -Only in mg-20110120.my: display.o -Only in mg-20110120.my: echo.o -Only in mg-20110120.my: extend.o -Only in mg-20110120.my: fgetln.o -diff -wbBur mg-20110120/fileio.c mg-20110120.my/fileio.c ---- mg-20110120/fileio.c 2008-12-30 19:04:23.000000000 +0300 -+++ mg-20110120.my/fileio.c 2011-11-21 15:43:12.000000000 +0400 -@@ -121,10 +121,8 @@ - * future writes will do the same thing. - */ - if (bp && bp->b_fi.fi_mode) { -- int ret; -- - fchmod(fd, bp->b_fi.fi_mode & 07777); -- ret = fchown(fd, bp->b_fi.fi_uid, bp->b_fi.fi_gid); -+ (void)fchown(fd, bp->b_fi.fi_uid, bp->b_fi.fi_gid); - } - return (FIOSUC); - } -Only in mg-20110120.my: fileio.o -Only in mg-20110120.my: file.o -Only in mg-20110120.my: funmap.o -Only in mg-20110120.my: grep.o -Only in mg-20110120.my: help.o -Only in mg-20110120.my: kbd.o -Only in mg-20110120.my: keymap.o -Only in mg-20110120.my: line.o -Only in mg-20110120.my: macro.o -Only in mg-20110120.my: main.o -Only in mg-20110120.my: Makefile -Only in mg-20110120.my: match.o -Only in mg-20110120.my: mg -Only in mg-20110120.my: modes.o -Only in mg-20110120.my: paragraph.o -Only in mg-20110120.my: random.o -Only in mg-20110120.my: region.o -Only in mg-20110120.my: re_search.o -Only in mg-20110120.my: search.o -Only in mg-20110120.my: spawn.o -Only in mg-20110120.my: strlcat.o -Only in mg-20110120.my: strlcpy.o -Only in mg-20110120.my: strtonum.o -Only in mg-20110120.my: theo.o -Only in mg-20110120.my: ttyio.o -Only in mg-20110120.my: ttykbd.o -Only in mg-20110120.my: tty.o -diff -wbBur mg-20110120/undo.c mg-20110120.my/undo.c ---- mg-20110120/undo.c 2011-01-03 01:57:57.000000000 +0300 -+++ mg-20110120.my/undo.c 2011-11-21 15:41:05.000000000 +0400 -@@ -464,14 +464,14 @@ - struct undo_rec *ptr, *nptr; - int done, rval; - struct line *lp; -- int offset, save, dot; -+ int offset, save; - static int nulled = FALSE; - int lineno; +-LDADD+= -lcurses -lutil -lclens ++LDADD+= -lcurses -lutil -lclens -lbsd + DPADD+= ${LIBCURSES} ${LIBUTIL} - if (n < 0) - return (FALSE); + # (Common) compile-time options: +@@ -17,7 +17,7 @@ + # + CFLAGS = -O2 + CFLAGS += -Wall -DFKEYS -DREGEX -DXKEYS +-CFLAGS += -I/usr/local/include/clens ++CFLAGS += -I/usr/include/clens -isystem /usr/include/bsd -DLIBBSD_OVERLAY -- dot = find_dot(curwp->w_dotp, curwp->w_doto); -+ find_dot(curwp->w_dotp, curwp->w_doto); - - ptr = curbp->b_undoptr; - -Only in mg-20110120.my: undo.o -Only in mg-20110120.my: version.o -Only in mg-20110120.my: window.o -Only in mg-20110120.my: word.o -Only in mg-20110120.my: yank.o + SRCS= autoexec.c basic.c bell.c buffer.c cinfo.c dir.c display.c \ + echo.c extend.c file.c fileio.c funmap.c help.c kbd.c keymap.c \ diff --git a/community/mpv/PKGBUILD b/community/mpv/PKGBUILD index 66cf7c9a1..3f5d53af8 100644 --- a/community/mpv/PKGBUILD +++ b/community/mpv/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 99435 2013-10-28 20:04:56Z bpiotrowski $ +# $Id: PKGBUILD 99558 2013-10-29 17:41:46Z bpiotrowski $ # Maintainer: BartÅ‚omiej Piotrowski # Contributor: Eivind Uggedal pkgname=mpv pkgver=0.2.1 -pkgrel=3 +pkgrel=4 pkgdesc='Video player based on MPlayer/mplayer2' arch=('i686' 'x86_64') license=('GPL') @@ -12,9 +12,9 @@ url='http://mpv.io' depends=( 'portaudio' 'ffmpeg' 'lcms2' 'libdvdread' 'libcdio-paranoia' 'libxinerama' 'libquvi' 'mpg123' 'libxv' 'libxkbcommon' 'libva' 'lirc-utils' - 'desktop-file-utils' 'hicolor-icon-theme' 'xdg-utils' + 'desktop-file-utils' 'hicolor-icon-theme' 'xdg-utils' 'lua51' ) -makedepends=('mesa' 'python-docutils' 'lua') +makedepends=('mesa' 'python-docutils') options=(!emptydirs) install=mpv.install source=("https://github.com/mpv-player/$pkgname/archive/v$pkgver.tar.gz") diff --git a/community/passenger/PKGBUILD b/community/passenger/PKGBUILD index b32b989fb..401cefd29 100644 --- a/community/passenger/PKGBUILD +++ b/community/passenger/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 96150 2013-08-20 11:37:13Z spupykin $ +# $Id: PKGBUILD 99543 2013-10-29 12:13:00Z spupykin $ # Maintainer: Sergej Pupykin pkgname=passenger -pkgver=4.0.14 +pkgver=4.0.21 pkgrel=1 pkgdesc="mod_rails passenger" arch=('i686' 'x86_64') @@ -14,11 +14,20 @@ makedepends=('apache') install=passenger.install options=('!emptydirs') source=($pkgname-$pkgver.tar.gz::https://github.com/FooBarWidget/passenger/archive/release-$pkgver.tar.gz) -md5sums=('064ba40c29364351e2a67c2ac6a13ce4') +md5sums=('200ba8636baa06c9a44d30c7bbb50ac3') prepare() { cd $srcdir/passenger-release-$pkgver - sed -i '1,1i#include ' ext/common/Utils/MD5.cpp + sed -i '1,1i#include ' \ + ext/common/Utils/MD5.cpp \ + ext/common/Logging.cpp \ + ext/common/Utils/StrIntUtils.cpp \ + ext/common/Utils.cpp \ + ext/common/ApplicationPool2/AppTypes.cpp \ + ext/boost/libs/thread/src/pthread/once.cpp \ + ext/boost/libs/thread/src/pthread/once_atomic.cpp \ + ext/boost/libs/thread/src/pthread/thread.cpp \ + ext/boost/atomic/atomic.hpp } build(){ diff --git a/community/perl-berkeleydb/PKGBUILD b/community/perl-berkeleydb/PKGBUILD index 59fc61a37..598d127e3 100644 --- a/community/perl-berkeleydb/PKGBUILD +++ b/community/perl-berkeleydb/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 93668 2013-07-08 11:19:35Z spupykin $ +# $Id: PKGBUILD 99506 2013-10-29 10:25:03Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Charles Mauch # Contributor: Francois Charette pkgname=perl-berkeleydb -pkgver=0.52 -pkgrel=1 +pkgver=0.53 +pkgrel=2 pkgdesc="Interface to Berkeley DB version 2, 3 or 4" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/BerkeleyDB/" @@ -13,7 +13,7 @@ license=('GPL' 'PerlArtistic') depends=('perl' 'db') options=('!emptydirs') source=(http://search.cpan.org/CPAN/authors/id/P/PM/PMQS/BerkeleyDB-$pkgver.tar.gz) -md5sums=('e1031f4cd3062fdb1597af4373789d79') +md5sums=('899c6967316c7a36b1d5b6a4c7ffbb02') build() { cd $srcdir/BerkeleyDB-$pkgver @@ -22,8 +22,9 @@ build() { } package() { - _dbver=`pacman -Q db | cut -d\ -f2 | cut -d- -f1` - depends=('perl' "db=$_dbver") + _dbver1=`pacman -Q db | cut -d\ -f2 | cut -d- -f1 | cut -f1 -d.` + _dbver2=`pacman -Q db | cut -d\ -f2 | cut -d- -f1 | cut -f2 -d.` + depends=('perl' "db>=${_dbver1}.${_dbver2}" "db<${_dbver1}.$(expr $_dbver2 + 1)") cd $srcdir/BerkeleyDB-$pkgver make pure_install doc_install DESTDIR=$pkgdir diff --git a/community/perl-fuse/PKGBUILD b/community/perl-fuse/PKGBUILD index a7efcd34d..ca5b8ce33 100644 --- a/community/perl-fuse/PKGBUILD +++ b/community/perl-fuse/PKGBUILD @@ -1,17 +1,24 @@ -# $Id: PKGBUILD 95164 2013-08-06 11:52:21Z spupykin $ +# $Id: PKGBUILD 99530 2013-10-29 10:58:33Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Tom K pkgname=perl-fuse -pkgver=0.15 +pkgver=0.16 pkgrel=1 pkgdesc="write filesystems in Perl using FUSE" arch=('i686' 'x86_64') 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=('5c521508bea036fed946d43b44d56056') +source=(http://search.cpan.org/CPAN/authors/id/D/DP/DPATES/Fuse-$pkgver.tar.gz + build-fix.patch) +md5sums=('d7f36eb55392270d2c6b2f05737b553f' + '16d985400e620286efdf4610d78cb5d6') + +prepare() { + cd $srcdir/Fuse-$pkgver + patch -p1 <$srcdir/build-fix.patch +} build() { cd $srcdir/Fuse-$pkgver diff --git a/community/perl-fuse/build-fix.patch b/community/perl-fuse/build-fix.patch new file mode 100644 index 000000000..51cb5ebce --- /dev/null +++ b/community/perl-fuse/build-fix.patch @@ -0,0 +1,13 @@ +diff -wbBur Fuse-0.16/Fuse.xs Fuse-0.16.q/Fuse.xs +--- Fuse-0.16/Fuse.xs 2013-09-13 06:16:35.000000000 +0400 ++++ Fuse-0.16.q/Fuse.xs 2013-10-29 14:38:44.000000000 +0400 +@@ -754,6 +754,9 @@ + + int _PLfuse_release (const char *file, struct fuse_file_info *fi) { + int rv; ++#ifndef PERL_HAS_64BITINT ++ char *temp; ++#endif + int flags = fi->flags; + FUSE_CONTEXT_PRE; + DEBUGf("release begin\n"); diff --git a/community/perl-gstreamer/PKGBUILD b/community/perl-gstreamer/PKGBUILD index 99d656129..215b84d7e 100644 --- a/community/perl-gstreamer/PKGBUILD +++ b/community/perl-gstreamer/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 91674 2013-05-26 09:25:14Z bluewind $ +# $Id: PKGBUILD 99484 2013-10-29 10:21:54Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Corrado Primier pkgname=perl-gstreamer -pkgver=0.18 -pkgrel=2 +pkgver=0.19 +pkgrel=1 pkgdesc="Interface to the GStreamer library" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/GStreamer" @@ -12,7 +12,7 @@ license=('GPL' 'PerlArtistic') depends=('glib-perl>=1.180' 'gstreamer0.10' 'perl-extutils-pkgconfig>=1.07' 'perl-extutils-depends>=0.205') options=('!emptydirs') source=(http://search.cpan.org/CPAN/authors/id/X/XA/XAOC/GStreamer-$pkgver.tar.gz) -md5sums=('7ac748677f00d1fd966b09e10448cff6') +md5sums=('886bc1f553fa288ca86842332ddadd8e') build() { cd GStreamer-${pkgver} diff --git a/community/plank/PKGBUILD b/community/plank/PKGBUILD index c36204e7b..94521202e 100644 --- a/community/plank/PKGBUILD +++ b/community/plank/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 99220 2013-10-25 21:06:18Z alucryd $ +# $Id: PKGBUILD 99552 2013-10-29 14:43:20Z alucryd $ # Maintainer: Maxime Gauduin # Contributor: Ner0 # Contributor: dcelasun pkgname=plank pkgver=0.4.0 -pkgrel=1 +pkgrel=2 pkgdesc="Elegant, simple, clean dock" arch=('i686' 'x86_64') url="https://launchpad.net/plank" license=('GPL3') -depends=('bamf' 'libdbusmenu-gtk3' 'libgee' 'python2') +depends=('bamf' 'libdbusmenu-gtk3' 'libgee06' 'python2') makedepends=('gnome-common' 'intltool' 'vala') install="${pkgname}.install" source=("https://launchpad.net/${pkgname}/1.0/${pkgver}/+download/${pkgname}-${pkgver}.tar.xz") @@ -25,7 +25,7 @@ prepare() { build() { cd ${pkgname}-${pkgver} - ./configure --prefix='/usr' --sysconfdir='/etc' --localstatedir='/var' + ./configure --prefix='/usr' --sysconfdir='/etc' --localstatedir='/var' --disable-gee-0.8 make } diff --git a/community/python-psutil/PKGBUILD b/community/python-psutil/PKGBUILD index 3e3408638..0346c6098 100644 --- a/community/python-psutil/PKGBUILD +++ b/community/python-psutil/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 98418 2013-10-09 22:50:40Z seblu $ +# $Id: PKGBUILD 99570 2013-10-29 21:24:23Z seblu $ # Maintainer: Sébastien Luttringer pkgbase=python-psutil pkgname=('python-psutil' 'python2-psutil') -pkgver=1.1.1 +pkgver=1.1.2 pkgrel=1 arch=('i686' 'x86_64') url='http://code.google.com/p/psutil/' license=('custom: BSD') makedepends=('python' 'python-setuptools' 'python2' 'python2-setuptools') source=("https://pypi.python.org/packages/source/p/psutil/psutil-$pkgver.tar.gz") -md5sums=('24430ee6486be2f1a960d9ce4dc87ad0') +md5sums=('fe9c9a3ed95fe6564acf8b4500c7b5da') build() { cd psutil-$pkgver diff --git a/community/squid/PKGBUILD b/community/squid/PKGBUILD index febc414d7..b624edbae 100644 --- a/community/squid/PKGBUILD +++ b/community/squid/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 97531 2013-09-23 16:17:02Z spupykin $ +# $Id: PKGBUILD 99520 2013-10-29 10:35:25Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Mark Coolen # Contributor: Tom Newsom @@ -6,7 +6,7 @@ pkgname=squid pkgver=3.3.9 -pkgrel=1 +pkgrel=2 pkgdesc='Full-featured Web proxy cache server' arch=('x86_64' 'i686') url='http://www.squid-cache.org' @@ -87,7 +87,8 @@ build() { --with-default-user=proxy \ --enable-async-io \ --enable-truncate \ - --enable-icap-client + --enable-icap-client \ + --enable-ssl-crtd make } diff --git a/community/tcc/PKGBUILD b/community/tcc/PKGBUILD index ebb5f21b3..352c80b5b 100644 --- a/community/tcc/PKGBUILD +++ b/community/tcc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 86525 2013-03-18 16:24:05Z spupykin $ +# $Id: PKGBUILD 99550 2013-10-29 14:08:21Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer : Gergely Imreh # Contributor : dschauer @@ -7,13 +7,13 @@ pkgname=tcc pkgver=0.9.26 -pkgrel=1 +pkgrel=2 pkgdesc="Tiny C Compiler" arch=('i686' 'x86_64') url="http://bellard.org/tcc/" license=('LGPL') makedepends=('gcc') -options=('docs') +options=('docs' 'staticlibs') source=(http://download.savannah.nongnu.org/releases/tinycc/${pkgname}-${pkgver}.tar.bz2) md5sums=('5fb28e4abc830c46a7f54c1f637fb25d') @@ -44,7 +44,7 @@ package() { install make clean - make CFLAGS="-fPIC" libtcc.o - ld -shared -soname libtcc.so -o libtcc.so libtcc.o + make CFLAGS="-fPIC" + ld -shared -soname libtcc.so -o libtcc.so *.o install -D -m 755 libtcc.so "${pkgdir}/usr/lib/libtcc.so" } diff --git a/community/vdrift/PKGBUILD b/community/vdrift/PKGBUILD index 0225b12f9..7ea03206f 100644 --- a/community/vdrift/PKGBUILD +++ b/community/vdrift/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 94910 2013-08-01 06:55:43Z bpiotrowski $ +# $Id: PKGBUILD 99451 2013-10-29 09:00:10Z svenstaro $ # Maintainer: Sven-Hendrik Haase # Contributor: Anton Bazhenov # Contributor: Lone_Wolf lonewolf@xs4all.nl pkgname=vdrift pkgver=2012.07.22 -pkgrel=5 +pkgrel=6 pkgdesc="Open source driving simulation made with drift racing in mind" arch=('i686' 'x86_64') url="http://vdrift.net/" diff --git a/core/lvm2/PKGBUILD b/core/lvm2/PKGBUILD index f57c8bcbf..facd7a94e 100644 --- a/core/lvm2/PKGBUILD +++ b/core/lvm2/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 196179 2013-10-07 23:45:54Z thomas $ +# $Id: PKGBUILD 197750 2013-10-29 09:58:36Z thomas $ # Maintainer: Eric Bélanger # Maintainer: Thomas Bächler pkgbase=lvm2 pkgname=('lvm2' 'device-mapper') pkgver=2.02.103 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://sourceware.org/lvm2/" license=('GPL2' 'LGPL2.1') @@ -31,7 +31,7 @@ sha1sums=('1194babd8d3cd5a9620bec1fe98a3be060465daf' 'ccefad65fde3d50331a42b0e90a1539dc7c8b9e4' '01782ce8e10718c1513e3906b126f30f682f5cab' '1d56f47a81350ae37ffbf61ee036fe31f4c5d504' - 'adf26f5e5636de9c055b2ac3b179641a543a8937' + 'aad90fce0e12eda41d38571d8eb27c5d5a8c59ec' 'f857a4a63fcc604a981e56875edda91767d4f1bf' 'fcfc265e3b10294cc4b10949a342e9db4310b186') diff --git a/core/lvm2/lvm-monitoring.service b/core/lvm2/lvm-monitoring.service index 138e91a08..14b2d1dee 100644 --- a/core/lvm2/lvm-monitoring.service +++ b/core/lvm2/lvm-monitoring.service @@ -2,8 +2,7 @@ Description=Monitoring of LVM2 mirrors, snapshots etc. using dmeventd or progress polling Documentation=man:dmeventd(8) man:lvcreate(8) man:lvchange(8) man:vgchange(8) Requires=dmeventd.socket -After=dmeventd.socket lvmetad.socket lvmetad.service dmeventd.service -Before=local-fs-pre.target +After=dmeventd.socket lvmetad.socket DefaultDependencies=no Conflicts=shutdown.target diff --git a/extra/ffmpeg-compat/PKGBUILD b/extra/ffmpeg-compat/PKGBUILD index 68ffd41cd..cea6fdc66 100644 --- a/extra/ffmpeg-compat/PKGBUILD +++ b/extra/ffmpeg-compat/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 197409 2013-10-25 13:13:16Z giovanni $ +# $Id: PKGBUILD 197753 2013-10-29 18:00:31Z bpiotrowski $ # Maintainer: Sergej Pupykin # Maintainer: BartÅ‚omiej Piotrowski # Contributor: Ionut Biru @@ -6,8 +6,8 @@ # Contributor: Paul Mattal pkgname=ffmpeg-compat -pkgver=0.10.8 -pkgrel=5 +pkgver=0.10.9 +pkgrel=1 epoch=1 pkgdesc='Complete and free Internet live audio and video broadcasting solution for Linux/Unix' arch=('i686' 'x86_64') @@ -21,7 +21,7 @@ depends=( ) makedepends=('libvdpau' 'yasm') source=(http://ffmpeg.org/releases/ffmpeg-$pkgver.tar.bz2) -sha256sums=('2e371088a71656be41b4ff70ae7e80a1d88c5149d6209013c9cce4b84278cbc8') +sha256sums=('1d0cc2dd539faefe47554935ea4e4f6aa779d0896b3e722d595aa5abe2304cf9') build() { cd ffmpeg-$pkgver diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD index b5e46a5fa..2fd2009b4 100644 --- a/extra/ffmpeg/PKGBUILD +++ b/extra/ffmpeg/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 197407 2013-10-25 13:06:38Z giovanni $ +# $Id: PKGBUILD 197751 2013-10-29 17:42:37Z bpiotrowski $ # Maintainer : Ionut Biru # Contributor: Tom Newsom # Contributor: Paul Mattal pkgname=ffmpeg -pkgver=2.0.2 -pkgrel=3 +pkgver=2.1 +pkgrel=1 epoch=1 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" arch=('i686' 'x86_64') @@ -19,7 +19,7 @@ depends=( ) makedepends=('libvdpau' 'yasm') source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2) -sha256sums=('986f63dc0785f473b1832d0eead502e39c9706fbe7f9677bbea0dad6fe0fab4a') +sha256sums=('926603fd974e9b38071a5cfc6fd0d93857801d1968145dfce7fdc627ab1d68df') build() { cd $pkgname-$pkgver diff --git a/extra/gdome2/PKGBUILD b/extra/gdome2/PKGBUILD index 6f97ea5ea..9522ae97d 100644 --- a/extra/gdome2/PKGBUILD +++ b/extra/gdome2/PKGBUILD @@ -1,26 +1,33 @@ -# $Id: PKGBUILD 150508 2012-02-18 11:44:22Z pierre $ +# $Id: PKGBUILD 197759 2013-10-29 18:43:37Z eric $ # Maintainer: # Contributor: Jan de Groot pkgname=gdome2 pkgver=0.8.1 -pkgrel=4 +pkgrel=5 pkgdesc="Gnome DOM Engine" -url="http://gdome2.cs.unibo.it/" arch=('i686' 'x86_64') +url="http://gdome2.cs.unibo.it/" license=('LGPL') depends=('libxml2' 'glib2') -options=(!libtool) -source=("http://gdome2.cs.unibo.it/tarball/${pkgname}-${pkgver}.tar.gz") -md5sums=('bfc114e59eec50cbda8e4ece751ff022') +source=("http://gdome2.cs.unibo.it/tarball/${pkgname}-${pkgver}.tar.gz" + gdome2-0.8.1-libxml2.patch) +md5sums=('bfc114e59eec50cbda8e4ece751ff022' + 'bde155107f30bf65d441adf70efc3c00') + +prepare() { + cd ${pkgname}-${pkgver} + patch -p0 -i "${srcdir}/gdome2-0.8.1-libxml2.patch" +} + build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} ./configure --prefix=/usr --mandir=/usr/share/man make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/gdome2/gdome2-0.8.1-libxml2.patch b/extra/gdome2/gdome2-0.8.1-libxml2.patch new file mode 100644 index 000000000..bf493bc22 --- /dev/null +++ b/extra/gdome2/gdome2-0.8.1-libxml2.patch @@ -0,0 +1,18 @@ +Patch by Harris Landgarten. + +The patch was submitted on bug 448236, following the announcement on +https://mail.gnome.org/archives/xml/2012-August/msg00005.html +--- libgdome/gdomecore/gdome-xml-documentt.c.orig 2003-07-13 06:47:54.000000000 -0400 ++++ libgdome/gdomecore/gdome-xml-documentt.c 2012-12-23 08:57:23.000000000 -0500 +@@ -342,7 +342,11 @@ + } + xmlNodeDumpOutput (out_buff, NULL, (xmlNode *)is, 0, 0, NULL); + xmlOutputBufferFlush(out_buff); ++#if LIBXML_VERSION < 20900 + ret = g_strndup (out_buff->buffer->content, out_buff->buffer->use); ++#else ++ ret = g_strndup (xmlBufContent(out_buff->buffer), xmlBufUse(out_buff->buffer)); ++#endif + (void)xmlOutputBufferClose(out_buff); + + return gdome_xml_str_mkref_own (ret); diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD index 14bcec800..a81dff9ab 100644 --- a/extra/git/PKGBUILD +++ b/extra/git/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 196624 2013-10-15 21:11:32Z dan $ +# $Id: PKGBUILD 197743 2013-10-29 02:17:19Z dan $ # Maintainer: Dan McGee pkgname=git -pkgver=1.8.4.1 +pkgver=1.8.4.2 pkgrel=1 pkgdesc="the fast distributed version control system" arch=(i686 x86_64) @@ -111,7 +111,7 @@ package() { install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket } -md5sums=('5d8c89ad312ca0b0e603259c9357e6b8' - 'd3f87251966f2bfabdad428b781fef4f' +md5sums=('6f63d103465b86ca0ebe4189ea54731c' + '2b4719ec820d845134b689247abe65e8' '042524f942785772d7bd52a1f02fe5ae' 'f67869315c2cc112e076f0c73f248002') diff --git a/extra/hwloc/PKGBUILD b/extra/hwloc/PKGBUILD index 3db995891..b153b012f 100644 --- a/extra/hwloc/PKGBUILD +++ b/extra/hwloc/PKGBUILD @@ -1,29 +1,33 @@ -# $Id: PKGBUILD 188118 2013-06-10 06:43:40Z bpiotrowski $ +# $Id: PKGBUILD 197744 2013-10-29 02:18:00Z eric $ # Maintainer : Stéphane Gaudreault # Contributor: Sylvain HENRY # Contributor: Hervé YVIQUEL pkgname=hwloc -pkgver=1.7.1 +pkgver=1.7.2 pkgrel=1 pkgdesc="Portable Hardware Locality is a portable abstraction of hierarchical architectures" arch=('i686' 'x86_64') url="http://www.open-mpi.org/projects/hwloc/" license=('BSD') depends=('sh' 'pciutils' 'cairo' 'libxml2') -makedepends=('pkg-config') -options=('!libtool' '!docs') -source=(http://www.open-mpi.org/software/hwloc/v1.7/downloads/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('7bb4e6c68d1c24f881d3f7ddf0682b50622351c8') +options=('!docs') +source=(http://www.open-mpi.org/software/hwloc/v${pkgver%.*}/downloads/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('bcd7d71e038af6e1f06a233fdf1c00739033e128') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} ./configure --prefix=/usr make } +check() { + cd ${pkgname}-${pkgver} + make check +} + package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE diff --git a/extra/jade/PKGBUILD b/extra/jade/PKGBUILD index 1fa51e196..78719af83 100644 --- a/extra/jade/PKGBUILD +++ b/extra/jade/PKGBUILD @@ -1,39 +1,39 @@ -# $Id: PKGBUILD 161891 2012-06-16 05:10:30Z eric $ +# $Id: PKGBUILD 197761 2013-10-29 19:12:18Z eric $ # Maintainer: # Contributor: dorphell # Contributor: Tom Newsom pkgname=jade pkgver=1.2.1 -pkgrel=8 -_debpatch=47.1 +pkgrel=9 +_debpatch=47.3 pkgdesc="James Clark's DSSSL Engine" url='http://www.jclark.com/jade/' arch=('i686' 'x86_64') license=('custom') depends=('gcc-libs') replaces=('openjade') -options=('!libtool' '!makeflags') +options=('!makeflags') source=("ftp://ftp.jclark.com/pub/${pkgname}/${pkgname}-${pkgver}.tar.gz" "http://ftp.debian.org/debian/pool/main/j/jade/jade_${pkgver}-${_debpatch}.diff.gz") md5sums=('4239670ca6b578bff68b8c2e7cd1225f' - '6c9c0109e3b6d283cb7a18ec8a672575') - -build() { - cd "${srcdir}"/${pkgname}-${pkgver} - - export CXXFLAGS="$CXXFLAGS -fpermissive" + 'dc50fb2aad40ad4b26373953805fe4fc') +prepare() { + cd ${pkgname}-${pkgver} patch -p1 -i "${srcdir}"/jade_${pkgver}-${_debpatch}.diff +} +build() { + cd ${pkgname}-${pkgver} + export CXXFLAGS="$CXXFLAGS -fpermissive" chmod 755 configure ./configure --prefix=/usr --enable-default-catalog=/usr/share/sgml/catalog - make } package() { - cd "${srcdir}"/${pkgname}-${pkgver} + cd ${pkgname}-${pkgver} install -d -m755 "${pkgdir}"/usr/lib make prefix="${pkgdir}"/usr install mv "${pkgdir}"/usr/bin/sx "${pkgdir}"/usr/bin/sgml2xml diff --git a/extra/kte-collaborative/PKGBUILD b/extra/kte-collaborative/PKGBUILD index 9213a4b64..c6cfb42d5 100644 --- a/extra/kte-collaborative/PKGBUILD +++ b/extra/kte-collaborative/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 197600 2013-10-27 14:17:27Z andrea $ +# $Id: PKGBUILD 197748 2013-10-29 07:58:30Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Antonio Rojas pkgname=kte-collaborative -pkgver=0.1.80 +pkgver=0.2.0 pkgrel=1 pkgdesc="A plugin for KTextEditor which allows to edit text documents collaboratively" arch=('i686' 'x86_64') @@ -11,8 +11,8 @@ url='https://projects.kde.org/projects/playground/network/kte-collaborative' license=('GPL') depends=('libqinfinity' 'telepathy-kde-common-internals') makedepends=('cmake' 'automoc4') -source=("http://download.kde.org/unstable/${pkgname}/${pkgver}/src/${pkgname}-v${pkgver}.tar.xz") -md5sums=('4e5c8e81d02ab1ccb5f0f6b1f739707a') +source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-v${pkgver}.tar.xz") +md5sums=('e96718ed62b3bb315364fd03a4f2b463') prepare() { mkdir build diff --git a/extra/libqinfinity/PKGBUILD b/extra/libqinfinity/PKGBUILD index d7f16d1c6..51afc1839 100644 --- a/extra/libqinfinity/PKGBUILD +++ b/extra/libqinfinity/PKGBUILD @@ -1,10 +1,10 @@ -# $Id$ +# $Id: PKGBUILD 197746 2013-10-29 07:56:59Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Antonio Rojas pkgname=libqinfinity -pkgver=0.5.1 -pkgrel=2 +pkgver=0.5.2 +pkgrel=1 pkgdesc="Qt wrapper around libinfinity, a library for collaborative editing" arch=('i686' 'x86_64') url='https://projects.kde.org/projects/playground/libs/libqinfinity' @@ -12,7 +12,7 @@ license=('LGPL') depends=('libinfinity' 'qt4') makedepends=('cmake') source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-v${pkgver}.tar.xz") -md5sums=('ca40902e7a9a699d3d83138cb76d569a') +md5sums=('de78878142b492e2f9c79c3684ac2d23') prepare() { mkdir build diff --git a/extra/libsrtp/PKGBUILD b/extra/libsrtp/PKGBUILD index 731f2ea75..7107d8c49 100644 --- a/extra/libsrtp/PKGBUILD +++ b/extra/libsrtp/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 188535 2013-06-15 10:01:17Z andrea $ +# $Id: PKGBUILD 197763 2013-10-29 19:24:02Z eric $ # Maintainer: # Contributor: Sergej Pupykin # Contributor: Yejun Yang @@ -6,7 +6,7 @@ pkgname=libsrtp pkgver=15.1c9bd90 -pkgrel=1 +pkgrel=2 pkgdesc="Open-source implementation of the Secure Real-time Transport Protocol (SRTP)" url="http://srtp.sourceforge.net/srtp.html" arch=('i686' 'x86_64') diff --git a/extra/libzeitgeist/PKGBUILD b/extra/libzeitgeist/PKGBUILD index 65137cd82..5c2606960 100644 --- a/extra/libzeitgeist/PKGBUILD +++ b/extra/libzeitgeist/PKGBUILD @@ -1,29 +1,28 @@ +# $Id: PKGBUILD 197766 2013-10-29 19:55:09Z eric $ # Maintainer: Jan de Groot # Contributor: kiefer # Contributor: Alessio Sergi pkgname=libzeitgeist pkgver=0.3.18 -_pkgmainver=0.3 -pkgrel=3 +pkgrel=4 pkgdesc="Zeitgeist client library" arch=('i686' 'x86_64') url="https://launchpad.net/libzeitgeist" license=('LGPL2.1') depends=('glib2') optdepends=("zeitgeist: zeitgeist framework") -options=('!libtool') -source=(http://launchpad.net/${pkgname}/${_pkgmainver}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz) +source=(http://launchpad.net/${pkgname}/${pkgver%.*}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz) md5sums=('d63a37295d01a58086d0d4ae26e604c2') 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/lzo/PKGBUILD b/extra/lzo/PKGBUILD index ba60530e4..115baed03 100644 --- a/extra/lzo/PKGBUILD +++ b/extra/lzo/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 150589 2012-02-18 15:59:31Z pierre $ +# $Id: PKGBUILD 197768 2013-10-29 20:44:43Z eric $ # Maintainer: # Contributor: Low Kian Seong # Contributor: Judd Vinet @@ -6,30 +6,31 @@ pkgname=lzo pkgver=1.08 -pkgrel=7 +pkgrel=8 pkgdesc='A portable lossless data compression library written in ANSI C' arch=('i686' 'x86_64') license=('GPL') url='http://www.oberhumer.com/opensource/lzo' depends=('glibc') makedepends=('nasm') -options=('!libtool') source=("http://www.oberhumer.com/opensource/lzo/download/LZO-v1/${pkgname}-${pkgver}.tar.gz" 'nasm-gcc3.patch') md5sums=('ab94d3da364c7cbd5b78d76f1875b0f6' '43fb13762383b572d22152f8815ea4a5') -build() { - cd "${srcdir}"/${pkgname}-${pkgver} +prepare() { + cd ${pkgname}-${pkgver} + patch -p0 -i "${srcdir}"/nasm-gcc3.patch +} - patch -p0 -i "${srcdir}"/nasm-gcc3.patch - autoconf - ./configure --prefix=/usr --enable-shared - make +build() { + cd ${pkgname}-${pkgver} + autoconf + ./configure --prefix=/usr --enable-shared + make } package() { - cd "${srcdir}"/${pkgname}-${pkgver} - - make DESTDIR="${pkgdir}" install + cd ${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install } diff --git a/extra/nss/PKGBUILD b/extra/nss/PKGBUILD index 3fc05134c..c572b2595 100644 --- a/extra/nss/PKGBUILD +++ b/extra/nss/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 196167 2013-10-07 13:20:22Z jgc $ +# $Id: PKGBUILD 197720 2013-10-28 23:19:38Z jgc $ # Maintainer: Jan de Groot pkgname=nss @@ -11,7 +11,7 @@ license=('MPL' 'GPL') _nsprver=4.10 depends=("nspr>=${_nsprver}" 'sqlite' 'zlib' 'sh') makedepends=('perl') -options=('!strip' '!makeflags') +options=('!strip' '!makeflags' 'staticlibs') source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgname}-${pkgver}.tar.gz nss.pc.in nss-config.in diff --git a/extra/openmpi/PKGBUILD b/extra/openmpi/PKGBUILD index 2c6bb39c0..5c4ba5d9d 100644 --- a/extra/openmpi/PKGBUILD +++ b/extra/openmpi/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 189231 2013-06-30 23:32:16Z eric $ +# $Id: PKGBUILD 197773 2013-10-29 21:29:45Z eric $ # Maintainer: Stéphane Gaudreault pkgname=openmpi pkgver=1.6.5 @@ -9,19 +9,18 @@ url="http://www.open-mpi.org" license=('custom') depends=('gcc-fortran' 'openssh' 'valgrind' 'libltdl' 'hwloc') makedepends=('inetutils') -options=('!libtool') +options=('staticlibs') source=(http://www.open-mpi.org/software/ompi/v1.6/downloads/${pkgname}-${pkgver}.tar.bz2) sha1sums=('93859d515b33dd9a0ee6081db285a2d1dffe21ce') build() { cd ${pkgname}-${pkgver} - # Make sure we use the system ltdl librariry rather than the ones in the tarball + # Make sure we use the system ltdl library rather than the ones in the tarball rm -r opal/libltdl ./configure --prefix=/usr \ --sysconfdir=/etc/${pkgname} \ - --mandir=/usr/share/man \ --enable-mpi-f90 \ --libdir=/usr/lib/${pkgname} \ --with-threads=posix \ diff --git a/extra/perl-dbd-mysql/PKGBUILD b/extra/perl-dbd-mysql/PKGBUILD index ae62a279c..d74b164a5 100644 --- a/extra/perl-dbd-mysql/PKGBUILD +++ b/extra/perl-dbd-mysql/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 186399 2013-05-26 09:25:04Z bluewind $ +# $Id: PKGBUILD 197755 2013-10-29 18:05:53Z bpiotrowski $ # Maintainer: BartÅ‚omiej Piotrowski # Contributor: kevin # Contributor: Eric Johnson pkgname=perl-dbd-mysql _realname=DBD-mysql -pkgver=4.023 -pkgrel=2 +pkgver=4.024 +pkgrel=1 pkgdesc="Perl/CPAN DBD::mysql module for interacting with MySQL via DBD" arch=('i686' 'x86_64') license=('GPL' 'PerlArtistic') @@ -15,7 +15,7 @@ depends=('libmariadbclient' 'perl-dbi') makedepends=('mariadb') options=('!emptydirs') source=(http://search.cpan.org/CPAN/authors/id/C/CA/CAPTTOFU/${_realname}-${pkgver}.tar.gz) -md5sums=('6ee956cf33ddce6441b36b6c1c983528') +md5sums=('280922d577aa95bf3f9ae21bd75e08c4') build() { cd $_realname-$pkgver diff --git a/extra/perl-dbi/PKGBUILD b/extra/perl-dbi/PKGBUILD index b913e9959..05aa43bff 100644 --- a/extra/perl-dbi/PKGBUILD +++ b/extra/perl-dbi/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 191377 2013-07-24 22:05:06Z eric $ +# $Id: PKGBUILD 197736 2013-10-29 01:54:29Z eric $ # Maintainer: pkgname=perl-dbi -pkgver=1.628 +pkgver=1.630 pkgrel=1 pkgdesc="Database independent interface for Perl" arch=('i686' 'x86_64') -license=('GPL' 'PerlArtistic') url="http://search.cpan.org/dist/DBI/" +license=('GPL' 'PerlArtistic') depends=('perl') options=('!emptydirs') source=(http://www.cpan.org/authors/id/T/TI/TIMB/DBI-${pkgver}.tar.gz) -md5sums=('4273f8cc6ee3979ce448c7eb3f8a6a5a') +md5sums=('306020fe7b54a53773f54ad581af8c54') build() { cd DBI-${pkgver} @@ -26,5 +26,5 @@ check() { package() { cd DBI-${pkgver} - make install DESTDIR="${pkgdir}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/perl-netaddr-ip/PKGBUILD b/extra/perl-netaddr-ip/PKGBUILD index 0e149c3ee..68d3e06bc 100644 --- a/extra/perl-netaddr-ip/PKGBUILD +++ b/extra/perl-netaddr-ip/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 192117 2013-08-06 02:08:02Z eric $ +# $Id: PKGBUILD 197740 2013-10-29 02:03:08Z eric $ # Maintainer: # Contributor: Dale Blount # Contributor: Francois Charette pkgname=perl-netaddr-ip -pkgver=4.069 +pkgver=4.071 pkgrel=1 pkgdesc="Perl module to manage IP addresses and subnets" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ license=('PerlArtistic' 'GPL') depends=('perl') options=('!emptydirs') source=(http://search.cpan.org/CPAN/authors/id/M/MI/MIKER/NetAddr-IP-${pkgver}.tar.gz) -md5sums=('7721135fcea390327f75421a6b701144') +md5sums=('f0da45422022fdf1ccfa90b8068d782b') build() { cd NetAddr-IP-${pkgver} diff --git a/extra/sqlite/PKGBUILD b/extra/sqlite/PKGBUILD index cadeb5c13..491c50fdc 100644 --- a/extra/sqlite/PKGBUILD +++ b/extra/sqlite/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 196768 2013-10-18 13:37:47Z andyrtr $ +# $Id: PKGBUILD 197765 2013-10-29 19:53:54Z andyrtr $ # Maintainer: Andreas Radke # Contributor: Tom Newsom @@ -8,7 +8,7 @@ _amalgamationver=3080100 _docver=${_amalgamationver} #_docver=3080001 pkgver=3.8.1 -pkgrel=1 +pkgrel=2 pkgdesc="A C library that implements an SQL database engine" arch=('i686' 'x86_64') license=('custom:Public Domain') @@ -17,10 +17,12 @@ makedepends=('tcl' 'readline') source=( # tarball containing the amalgamation for SQLite >= 3.7.5 together with a configure script and makefile for building it; includes now also the Tcl Extension Architecture (TEA) http://www.sqlite.org/2013/sqlite-autoconf-$_amalgamationver.tar.gz http://www.sqlite.org/2013/sqlite-doc-${_docver}.zip + xbmc.patch license.txt) options=('!libtool' '!emptydirs') sha1sums=('42464b07df2d6f8aa28f73ce4cc6d48b47be810e' 'd7cb698f32318fbf5dce9f10c9cd7b84c3d70105' + '01bcbffc422b354a4ad6737e472f06b321ce52ef' 'f34f6daa4ab3073d74e774aad21d66878cf26853') build() { @@ -28,6 +30,11 @@ build() { # build sqlite cd "$srcdir"/sqlite-autoconf-$_amalgamationver + + # fix http://www.sqlite.org/src/info/9aac4e588c?sbs=0 + # https://bugs.archlinux.org/task/37417 + patch -Np1 -i $srcdir/xbmc.patch + ./configure --prefix=/usr \ --disable-static make diff --git a/extra/sqlite/xbmc.patch b/extra/sqlite/xbmc.patch new file mode 100644 index 000000000..3a58dd242 --- /dev/null +++ b/extra/sqlite/xbmc.patch @@ -0,0 +1,22 @@ +Index: src/where.c +================================================================== +--- src/sqlite3.c ++++ src/sqlite3.c +@@ -876,11 +876,14 @@ + while( pScan->iEquiv<=pScan->nEquiv ){ + iCur = pScan->aEquiv[pScan->iEquiv-2]; + iColumn = pScan->aEquiv[pScan->iEquiv-1]; + while( (pWC = pScan->pWC)!=0 ){ + for(pTerm=pWC->a+k; knTerm; k++, pTerm++){ +- if( pTerm->leftCursor==iCur && pTerm->u.leftColumn==iColumn ){ ++ if( pTerm->leftCursor==iCur ++ && pTerm->u.leftColumn==iColumn ++ && (pScan->iEquiv<=2 || !ExprHasProperty(pTerm->pExpr, EP_FromJoin)) ++ ){ + if( (pTerm->eOperator & WO_EQUIV)!=0 + && pScan->nEquivaEquiv) + ){ + int j; + pX = sqlite3ExprSkipCollate(pTerm->pExpr->pRight); + + diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD index 87f417a1e..374a3ca6a 100644 --- a/extra/vlc/PKGBUILD +++ b/extra/vlc/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 197395 2013-10-25 12:07:13Z giovanni $ +# $Id: PKGBUILD 197770 2013-10-29 21:10:16Z bpiotrowski $ # Maintainer: Giovanni Scafora # Contributor: Sarah Hay # Contributor: Martin Sandsmark pkgname=vlc pkgver=2.1.0 -pkgrel=4 +pkgrel=5 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" arch=('i686' 'x86_64') url="http://www.videolan.org/vlc/" license=('LGPL2.1' 'GPL2') depends=('a52dec' 'libdvbpsi' 'libxpm' 'libdca' 'qt4' 'libproxy' 'sdl_image' 'libdvdnav' 'libtiger' 'lua' 'libmatroska' - 'zvbi' 'taglib' 'libmpcdec' 'ffmpeg-compat' 'faad2' 'libupnp' + 'zvbi' 'taglib' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp' 'libshout' 'libmad' 'libmpeg2' 'xcb-util-keysyms') makedepends=('live-media' 'libnotify' 'libbluray' 'flac' 'kdelibs' 'libdc1394' 'libavc1394' 'lirc-utils' 'libcaca' @@ -73,7 +73,6 @@ build() { cd "${srcdir}/${pkgname}-${pkgver/.a}" CFLAGS+="-I/usr/include/samba-4.0" CPPFLAGS+="-I/usr/include/samba-4.0" \ - PKG_CONFIG_PATH+="/usr/lib/ffmpeg-compat/pkgconfig" \ ./configure --prefix=/usr \ --sysconfdir=/etc \ --disable-rpath \ diff --git a/pcr/youtube-dl-current/PKGBUILD b/pcr/youtube-dl-current/PKGBUILD index c877a3b27..4d6011ef0 100644 --- a/pcr/youtube-dl-current/PKGBUILD +++ b/pcr/youtube-dl-current/PKGBUILD @@ -5,7 +5,7 @@ pkgname=youtube-dl-current _pkgname=youtube-dl provides=(youtube-dl) -pkgver=2013.10.28 +pkgver=2013.10.29 pkgrel=1 pkgdesc="A small command-line program to download videos from YouTube.com and a few more sites" arch=('any') @@ -29,3 +29,5 @@ package() { } md5sums=('cf6169efa73e6d546221eff89937bb85' 'SKIP') +md5sums=('5b518f25385ff86f8d8b0e3db085f7c6' + 'SKIP') -- cgit v1.2.3-54-g00ecf From 058983fb5cb16dbb25368dd464cbcf27205b3f93 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 4 Nov 2013 01:27:27 -0800 Subject: Mon Nov 4 01:26:54 PST 2013 --- community/fcitx-m17n/PKGBUILD | 14 ++- community/fcitx-mozc/PKGBUILD | 48 ++++----- community/gdc/PKGBUILD | 7 +- community/libpinyin/PKGBUILD | 22 ++-- community/lz4/PKGBUILD | 4 +- community/mpv/PKGBUILD | 12 +-- .../0002-epass2003-properly-disable-padding.patch | 39 +++++++ community/opensc/PKGBUILD | 11 +- community/perl-xml-libxml/PKGBUILD | 16 +-- community/python-pyzmq/PKGBUILD | 6 +- community/ruby-iconv/PKGBUILD | 5 +- community/wiznote/PKGBUILD | 4 +- community/wvstreams/PKGBUILD | 6 +- core/curl/PKGBUILD | 12 ++- core/libssh2/PKGBUILD | 4 +- core/openldap/PKGBUILD | 6 +- extra/imagemagick/PKGBUILD | 9 +- extra/lapack/PKGBUILD | 16 +-- extra/libindi/PKGBUILD | 5 +- extra/mercurial/PKGBUILD | 6 +- libre/icedove-l10n/PKGBUILD | 114 ++++++++++----------- libre/icedove-libre/PKGBUILD | 8 +- pcr/youtube-dl-current/PKGBUILD | 8 +- 23 files changed, 216 insertions(+), 166 deletions(-) create mode 100644 community/opensc/0002-epass2003-properly-disable-padding.patch (limited to 'community/mpv') diff --git a/community/fcitx-m17n/PKGBUILD b/community/fcitx-m17n/PKGBUILD index b593fe10b..1c3a9b140 100644 --- a/community/fcitx-m17n/PKGBUILD +++ b/community/fcitx-m17n/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 93368 2013-07-02 09:47:25Z fyan $ +# $Id: PKGBUILD 100394 2013-11-03 12:25:13Z fyan $ # Maintainer: Felix Yan pkgname=fcitx-m17n -pkgver=0.2.1 +pkgver=0.2.2 pkgrel=1 pkgdesc="Fcitx Wrapper for m17n." arch=('i686' 'x86_64') @@ -13,17 +13,15 @@ makedepends=('cmake') source=("http://download.fcitx-im.org/$pkgname/$pkgname-${pkgver}.tar.xz") build() { - cd "$srcdir/${pkgname}-${pkgver}" - mkdir -p build - cd build + cd ${pkgname}-${pkgver} - cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release .. + cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release . make } package() { - cd "$srcdir/${pkgname}-${pkgver}/build" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install } -sha512sums=('b2becf6f20de32191690a5541956dc0a607443bd593fbfb61d1663dcc1f854df6b146c17ed73afbdff4006c12f001707de87adc706b3e1d45608bbf2bc045bce') +sha512sums=('f0a708a351956c3972ae7d91050e274438c5631c785e829f746629f9cf2cb4c0bfe7dcb5f4e8bcda62e7761081526a484afb533a86b1c8b5c7d063f6ecbc502a') diff --git a/community/fcitx-mozc/PKGBUILD b/community/fcitx-mozc/PKGBUILD index 36ce20149..26a0f871b 100644 --- a/community/fcitx-mozc/PKGBUILD +++ b/community/fcitx-mozc/PKGBUILD @@ -1,40 +1,37 @@ -# $Id: PKGBUILD 97633 2013-09-26 06:11:29Z fyan $ +# $Id: PKGBUILD 100392 2013-11-03 11:48:16Z fyan $ # Maintainer: Felix Yan # Contributor: ponsfoot ## Mozc compile option _bldtype=Release -_zipcoderel=201307 +_zipcoderel=201309 _protobuf_ver=2.5.0 -_gyp_rev=1656 +_gyp_rev=1774 _pkgbase=mozc +_revision=178 pkgname=fcitx-mozc pkgdesc="Fcitx Module of A Japanese Input Method for Chromium OS, Windows, Mac and Linux (the Open Source Edition of Google Japanese Input)" -pkgver=1.11.1522.102 +pkgver=1.12.1599.102 _patchver=${pkgver}.1 -pkgrel=2 +pkgrel=1 arch=('i686' 'x86_64') url="http://code.google.com/p/mozc/" license=('custom') depends=('qt4' 'fcitx' 'zinnia') -makedepends=('pkg-config' 'python2' 'gtest' 'curl' 'gtk2' 'mesa') +makedepends=('pkg-config' 'python2' 'gtest' 'curl' 'gtk2' 'mesa' 'svn') replaces=('mozc-fcitx') conflicts=('mozc' 'mozc-server' 'mozc-utils-gui' 'mozc-fcitx') -source=(http://mozc.googlecode.com/files/mozc-${pkgver}.tar.bz2 - http://downloads.sourceforge.net/project/pnsft-aur/mozc/gyp-${_gyp_rev}.tar.xz +source=(svn+http://mozc.googlecode.com/svn#revision=$_revision + gyp::svn+http://gyp.googlecode.com/svn/trunk#revision=$_gyp_rev http://downloads.sourceforge.net/pnsft-aur/ken_all-${_zipcoderel}.zip http://downloads.sourceforge.net/pnsft-aur/jigyosyo-${_zipcoderel}.zip http://protobuf.googlecode.com/files/protobuf-${_protobuf_ver}.tar.bz2 http://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-${_patchver}.patch - http://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-icon.tar.gz - #mozc_1.10.1390.102_remove_warn_as_error.patch -) + http://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-icon.tar.gz) build() { - cd "$srcdir" - #source /etc/profile.d/qt4.sh # Update: Fix qt4 include path too @@ -44,19 +41,16 @@ build() { CFLAGS="${CFLAGS} -I/usr/include/qt4 -fvisibility=hidden" CXXFLAGS="${CXXFLAGS} -I/usr/include/qt4 -fvisibility=hidden" - cd "${srcdir}/${_pkgbase}-${pkgver}" + cd svn/trunk/src # Apply fcitx patch rm unix/fcitx -rf - patch -Np2 -i ${srcdir}/fcitx-mozc-${_patchver}.patch + patch -Np2 -i "$srcdir/fcitx-mozc-${_patchver}.patch" # Fix qt4 binary path sed -i 's|(qt_dir)/bin|(qt_dir)/lib/qt4/bin|' gui/*.gyp{,i} sed -i 's|(qt_dir_env)/bin|(qt_dir_env)/lib/qt4/bin|' gui/*.gyp{,i} - # Patch for gcc>=4.8 - #patch -p0 -i "${srcdir}/mozc_1.10.1390.102_remove_warn_as_error.patch" - # Adjust to use python2 find . -name \*.py -type f -exec sed -i -e "1s|python.*$|python2|" {} + find . -regex '.*\.gypi?$' -type f -exec sed -i -e "s|'python'|'python2'|g" {} + @@ -67,10 +61,12 @@ build() { msg "Done." # Copy gyp - cp -rf "${srcdir}"/gyp-${_gyp_rev}/* third_party/gyp + mkdir third_party/gyp + cp -rf "${srcdir}"/gyp/* third_party/gyp # Copy protobuf to be linked statically - cp -rf "${srcdir}/protobuf-${_protobuf_ver}" protobuf/files + mkdir third_party/protobuf + cp -rf "${srcdir}/protobuf-${_protobuf_ver}"/* third_party/protobuf msg "Starting make..." @@ -85,7 +81,7 @@ build() { } package() { - cd "${srcdir}/${_pkgbase}-${pkgver}" + cd svn/trunk/src install -D -m 755 out_linux/${_bldtype}/mozc_server "${pkgdir}/usr/lib/mozc/mozc_server" install -m 755 out_linux/${_bldtype}/mozc_tool "${pkgdir}/usr/lib/mozc/mozc_tool" @@ -116,10 +112,10 @@ package() { install -m 644 "$srcdir/fcitx-mozc-icons/mozc-tool.png" "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-tool.png" } -sha512sums=('f1319b6cee9ba9444e75a3775abbd5804fda545be87e1977aa48825a14073448db6b12c2312d1cf74469cec7392af5c889a0fbd64cf741cc4e8c1c44dcdbf68f' - 'c162dab8d2935793002fef9a12d49a9ec36b4be3af73fe425e522302871744bf0710726539444bfd354244b41cea9fc649fb83a957000d70bcb0556265cdb171' - '9661c697368e3d3afec65fda3e07db5ceea358e26ecc372872dcdd52a688c5cf5a14d2b2eeb8a3875c1941b192efb5a100eb846067d4d5cb32afdb9dd4b0ba29' - '14b0dd6854e8732c4aa0105b6a8e39e7778c86ac94adf899ddb42424c6033eccd5686734f4bbe7ba8542903ac987fd553a051abfeeceae5c1649f9a74cb9e8a1' +sha512sums=('SKIP' + 'SKIP' + 'e497d6dfca2cf06d4ab0ed7f84e1daea8da776071d19818dc09b5c2586d52dfceebd3b665ebc0eb1143e84c8dcb11cac6197e8cbff617415cc6f16316e9a2004' + '04c2719618227beea8b41705d25382a78fa4173c7355c2a4ebd4d424538e0591513aa951eb9a8a11a4ad4ff379839fda42264a98e07f1b062ff8e4200af7c741' '5994b3669808b82fef5c860ecad36358c0767f84acac877e7bfcf722e59d972835a955714149bdd4158fbd1328a51d01397a563991d26475351ee72be48142ee' - '8d7a132613193c2e120d4a17fad97045451bcc700a552fa52e85f83cf5403de36b66c4bf6148c9cdabb493e82a5338cc090b693569d8ff087f4646e0604e0d3b' + 'e6a5a21520e36aa6cd27295c5a1b050a8f1a8dccf82918b0b57f17c79393c8b527c3f70dbfa2de0af42d3f85eac3095ef476a067fb24dbc2fa325c1f6a1138cc' '5507c637e5a65c44ccf6e32118b6d16647ece865171b9a77dd3c78e6790fbd97e6b219e68d2e27750e22074eb536bccf8d553c295d939066b72994b86b2f251a') diff --git a/community/gdc/PKGBUILD b/community/gdc/PKGBUILD index b4adc310e..aa3224743 100644 --- a/community/gdc/PKGBUILD +++ b/community/gdc/PKGBUILD @@ -4,8 +4,8 @@ # Contributor: Jesus Alvarez pkgname=('gdc' 'libgphobos-devel') -pkgver=4.8.1 -pkgrel=6 +pkgver=4.8.2 +pkgrel=1 arch=('i686' 'x86_64') url="https://github.com/D-Programming-GDC/GDC" license=('GPL') @@ -75,13 +75,14 @@ package_gdc() pkgdesc="Compiler for D programming language wich uses gcc backend" install -D -m755 $srcdir/gcc-build/gcc/gdc $pkgdir/usr/bin/gdc - install -D -m755 $srcdir/gcc-build/gcc/cc1d $pkgdir/usr/lib/gcc/$CHOST/4.8.1/cc1d + install -D -m755 $srcdir/gcc-build/gcc/cc1d $pkgdir/usr/lib/gcc/$CHOST/$pkgver/cc1d } package_libgphobos-devel() { pkgdesc="Standard library for D programming language, GDC port" provides=("d-runtime" "d-stdlib") + options=("staticlibs") depends=('gdc') # druntime diff --git a/community/libpinyin/PKGBUILD b/community/libpinyin/PKGBUILD index 2648976e0..0ffcd5742 100644 --- a/community/libpinyin/PKGBUILD +++ b/community/libpinyin/PKGBUILD @@ -1,10 +1,11 @@ -# $Id: PKGBUILD 99874 2013-10-31 02:13:03Z allan $ +# $Id: PKGBUILD 100397 2013-11-03 12:30:24Z fyan $ # Maintainer: Felix Yan # Contributor: Yangtse # Contributor: WU Jun pkgname=libpinyin -pkgver=0.9.93 +pkgver=0.9.94 +_modelver=7 pkgrel=1 pkgdesc="Library to deal with pinyin" arch=('i686' 'x86_64') @@ -12,22 +13,23 @@ url="https://github.com/libpinyin/libpinyin" license=('GPL') depends=('db' 'glib2') source=("https://github.com/libpinyin/libpinyin/archive/${pkgver}.tar.gz" - "http://downloads.sourceforge.net/libpinyin/model6.text.tar.gz") -noextract=("model6.text.tar.gz") + "http://downloads.sourceforge.net/libpinyin/model${_modelver}.text.tar.gz") +noextract=("model${_modelver}.text.tar.gz") build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} - cp "${srcdir}/model6.text.tar.gz" "${srcdir}/${pkgname}-${pkgver}/data/" - sed -i '/wget.*model6\.text\.tar\.gz/ d' ${srcdir}/${pkgname}-${pkgver}/data/Makefile.am + cp ../model${_modelver}.text.tar.gz data/ + sed -i "/wget.*model${_modelver}\.text\.tar\.gz/ d" data/Makefile.am aclocal && libtoolize --force && autoheader && automake -a && autoconf ./configure --prefix=/usr && make } package() { - cd "${srcdir}/libpinyin-$pkgver" + cd ${pkgname}-$pkgver make DESTDIR="${pkgdir}" install } -sha512sums=('7214c7913ed116a5557e89958d0d117e7a2781dcbbcc8b1c6713fb569ca121a5763e5cf1dedfdb4607638f773875c374112865d3a306876906a126954c4ef387' - '8719d99b2efb22438ec067c046f8d45addb3e0d336e8d6ec4b8ed22370fe81366d19a34934bb059230f86e74c379acb62822ee3458850437880d531de8ff3e0e') + +sha512sums=('733083a8ed1dc0d230c8830e67c4d23b28ecf4c2b4adf386aee5f1e3cd9849363951c60720d5ae5fe9c075b4dbdda88969473c19bb1a8c8187cbc21e35445108' + '74a56a23cdca24124037f688ed85a921089155a1b9a0b61e646f805b2bb698c56682c5d6a47ff86657c8b131a831dbee9d5cc5165d4c1f235b77fcd5b2e480ad') diff --git a/community/lz4/PKGBUILD b/community/lz4/PKGBUILD index 8e8999037..ea5e83ec7 100644 --- a/community/lz4/PKGBUILD +++ b/community/lz4/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 99573 2013-10-29 21:29:01Z seblu $ +# $Id: PKGBUILD 100408 2013-11-03 17:44:50Z seblu $ # Maintainer: Sébastien Luttringer # Contacted by mail, author use svn commit as release version. # He only push tested release code into svn and support using revision as version pkgname=lz4 -pkgver=107 +pkgver=108 pkgrel=1 pkgdesc='Very fast lossless compression algorithm' arch=('i686' 'x86_64') diff --git a/community/mpv/PKGBUILD b/community/mpv/PKGBUILD index 3f5d53af8..4ea19c68e 100644 --- a/community/mpv/PKGBUILD +++ b/community/mpv/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 99558 2013-10-29 17:41:46Z bpiotrowski $ +# $Id: PKGBUILD 100387 2013-11-03 11:15:18Z bpiotrowski $ # Maintainer: BartÅ‚omiej Piotrowski # Contributor: Eivind Uggedal pkgname=mpv -pkgver=0.2.1 -pkgrel=4 +pkgver=0.2.2 +pkgrel=1 pkgdesc='Video player based on MPlayer/mplayer2' arch=('i686' 'x86_64') license=('GPL') @@ -17,8 +17,8 @@ depends=( makedepends=('mesa' 'python-docutils') options=(!emptydirs) install=mpv.install -source=("https://github.com/mpv-player/$pkgname/archive/v$pkgver.tar.gz") -md5sums=('4e7c8823354f97753f0cbe17c61ec211') +source=(https://github.com/mpv-player/$pkgname/archive/v$pkgver.tar.gz) +md5sums=('632d1ee368fe7355563047bbdcd7b08a') build() { unset CFLAGS @@ -51,6 +51,4 @@ package() { "$pkgdir"/usr/share/doc/mpv/examples install -m644 DOCS/{encoding.rst,tech-overview.txt} \ "$pkgdir"/usr/share/doc/mpv - - #install -Dm644 etc/mpv.desktop "$pkgdir"/usr/share/applications/mpv.desktop } diff --git a/community/opensc/0002-epass2003-properly-disable-padding.patch b/community/opensc/0002-epass2003-properly-disable-padding.patch new file mode 100644 index 000000000..0e3ad65fb --- /dev/null +++ b/community/opensc/0002-epass2003-properly-disable-padding.patch @@ -0,0 +1,39 @@ +From b1a4775310a4e30d8fd5c1cc91e60971f922e64a Mon Sep 17 00:00:00 2001 +From: Zbigniew Halas +Date: Wed, 27 Feb 2013 23:44:02 +0000 +Subject: [PATCH] epass2003: properly disable padding + +EVP_CIPHER_CTX_set_padding needs to be called after EVP_EncryptInit_ex +and EVP_DecryptInit_ex, otherwise padding is re-enabled, which in turn +causes buffer overruns +--- + src/libopensc/card-epass2003.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/libopensc/card-epass2003.c b/src/libopensc/card-epass2003.c +index 80088b9..6f04573 100644 +--- a/src/libopensc/card-epass2003.c ++++ b/src/libopensc/card-epass2003.c +@@ -117,8 +117,8 @@ + + memcpy(iv_tmp, iv, EVP_MAX_IV_LENGTH); + EVP_CIPHER_CTX_init(&ctx); +- EVP_CIPHER_CTX_set_padding(&ctx, 0); + EVP_EncryptInit_ex(&ctx, cipher, NULL, key, iv_tmp); ++ EVP_CIPHER_CTX_set_padding(&ctx, 0); + + if (!EVP_EncryptUpdate(&ctx, output, &outl, input, length)) + goto out; +@@ -146,8 +146,8 @@ + + memcpy(iv_tmp, iv, EVP_MAX_IV_LENGTH); + EVP_CIPHER_CTX_init(&ctx); +- EVP_CIPHER_CTX_set_padding(&ctx, 0); + EVP_DecryptInit_ex(&ctx, cipher, NULL, key, iv_tmp); ++ EVP_CIPHER_CTX_set_padding(&ctx, 0); + + if (!EVP_DecryptUpdate(&ctx, output, &outl, input, length)) + goto out; +-- +1.8.4 + diff --git a/community/opensc/PKGBUILD b/community/opensc/PKGBUILD index 8b2047a2c..d8832845e 100644 --- a/community/opensc/PKGBUILD +++ b/community/opensc/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 99939 2013-10-31 02:35:12Z allan $ +# $Id: PKGBUILD 100414 2013-11-03 18:13:58Z seblu $ # Maintainer: Sébastien Luttringer # Contributor: kevku pkgname=opensc pkgver=0.13.0 -pkgrel=3 +pkgrel=4 pkgdesc='Tools and libraries for smart cards' arch=('x86_64' 'i686') url='https://github.com/OpenSC/OpenSC/wiki' @@ -14,12 +14,15 @@ makedepends=('docbook-xsl') depends=('openssl' 'pcsclite' 'libltdl') options=('!emptydirs') source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" - '0001-pkcs15-regression-in-e35febe-compute-cert-length.patch') + '0001-pkcs15-regression-in-e35febe-compute-cert-length.patch' + '0002-epass2003-properly-disable-padding.patch') md5sums=('74a10de6c646bdaae307d6dc9e9accc0' - '49a0989c169decf6876a3a9631289dbc') + '49a0989c169decf6876a3a9631289dbc' + '68fe80c8fb6c28c0bcf9d36e3245e4ae') prepare() { patch -p1 -d $pkgname-$pkgver < 0001-pkcs15-regression-in-e35febe-compute-cert-length.patch + patch -p1 -d $pkgname-$pkgver < 0002-epass2003-properly-disable-padding.patch } build() { diff --git a/community/perl-xml-libxml/PKGBUILD b/community/perl-xml-libxml/PKGBUILD index f6bbd8c00..a187bb4c4 100644 --- a/community/perl-xml-libxml/PKGBUILD +++ b/community/perl-xml-libxml/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 97592 2013-09-24 21:06:57Z jsteel $ +# $Id: PKGBUILD 100412 2013-11-03 17:59:19Z jsteel $ # Maintainer: Jonathan Steel # Contributor: Justin "juster" Davis # Contributor: François Charette pkgname=perl-xml-libxml -pkgver=2.0106 +pkgver=2.0107 pkgrel=1 pkgdesc="Interface to the libxml library" arch=('i686' 'x86_64') @@ -13,24 +13,26 @@ license=('GPL') depends=('libxml2' 'perl-xml-sax' 'perl-xml-namespacesupport') provides=('perl-libxml' 'perl-xml-libxml-common') replaces=('perl-libxml' 'perl-xml-libxml-common') -conflicts=('perl-libxml' 'perl-xml-libxml-common') options=('!emptydirs') install=$pkgname.install source=(http://www.cpan.org/authors/id/S/SH/SHLOMIF/XML-LibXML-$pkgver.tar.gz) -md5sums=('5da8ecfdedccca81fe0821e9935fe11c') +md5sums=('4caedd8fb64167e1caf0443f18ec47a2') build() { - cd XML-LibXML-$pkgver + cd "$srcdir"/XML-LibXML-$pkgver + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd XML-LibXML-$pkgver + cd "$srcdir"/XML-LibXML-$pkgver + make test } package() { - cd XML-LibXML-$pkgver + cd "$srcdir"/XML-LibXML-$pkgver + make pure_install doc_install DESTDIR="$pkgdir"/ } diff --git a/community/python-pyzmq/PKGBUILD b/community/python-pyzmq/PKGBUILD index c531e17c1..4b45e70c1 100644 --- a/community/python-pyzmq/PKGBUILD +++ b/community/python-pyzmq/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 92654 2013-06-10 15:28:34Z bpiotrowski $ +# $Id: PKGBUILD 100379 2013-11-03 07:15:10Z kkeen $ # Maintainer: Kyle Keen pkgbase=python-pyzmq pkgname=(python2-pyzmq python-pyzmq) -pkgver=13.1.0 +pkgver=14.0.0 pkgrel=1 pkgdesc="Python bindings for zeromq, written in Cython" arch=(i686 x86_64) @@ -12,7 +12,7 @@ depends=(zeromq python) makedepends=(python python2 zeromq) #source=(https://github.com/zeromq/pyzmq/downloads/pyzmq-$pkgver.tar.gz) source=(https://pypi.python.org/packages/source/p/pyzmq/pyzmq-$pkgver.tar.gz) -md5sums=('b54a2209a4efed93ed00282d949db8d9') +md5sums=('ce62ce9807b0b5da0076eaa9cf6cc24e') build() { cd "$srcdir" diff --git a/community/ruby-iconv/PKGBUILD b/community/ruby-iconv/PKGBUILD index 3b9315ed6..528fa5c14 100755 --- a/community/ruby-iconv/PKGBUILD +++ b/community/ruby-iconv/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 97686 2013-09-27 08:51:25Z alucryd $ +# $Id: PKGBUILD 100391 2013-11-03 11:24:29Z alucryd $ # Maintainer: Maxime Gauduin pkgname=ruby-iconv pkgver=1.0.3 -pkgrel=4 +pkgrel=6 pkgdesc="Wrapper library for iconv" arch=('i686' 'x86_64') url="https://github.com/nurse/iconv" @@ -15,6 +15,7 @@ sha256sums=('94a9b62a56c96226b62b787cd45fdc48c03f4517f1e36e64db113b010fb012da') prepare() { gem install --no-{document,user-install} --ignore-dependencies -i . ${pkgname#*-}-${pkgver}.gem + sed "s|iconv/iconv.so|$CARCH-linux/iconv.so|" -i gems/${pkgname#*-}-${pkgver}/lib/iconv.rb } package() { diff --git a/community/wiznote/PKGBUILD b/community/wiznote/PKGBUILD index f578654c0..da1e90b64 100644 --- a/community/wiznote/PKGBUILD +++ b/community/wiznote/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 100066 2013-11-01 07:14:23Z fyan $ +# $Id: PKGBUILD 100396 2013-11-03 12:29:00Z fyan $ # Maintainer: Felix Yan # Contributor: Albert.Zhou pkgname=wiznote -pkgver=2.0.59 +pkgver=2.0.62 pkgrel=1 pkgdesc="Opensource cross-platform cloud based note-taking client" arch=('i686' 'x86_64') diff --git a/community/wvstreams/PKGBUILD b/community/wvstreams/PKGBUILD index eb5b48e7f..f54213524 100644 --- a/community/wvstreams/PKGBUILD +++ b/community/wvstreams/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 92257 2013-06-03 11:15:30Z allan $ -# Maintainer: +# $Id: PKGBUILD 100398 2013-11-03 12:30:25Z fyan $ +# Maintainer: Felix Yan # Contributor: Andrea Scarpino # Contributor: dorphell pkgname=wvstreams pkgver=4.6.1 -pkgrel=6 +pkgrel=7 pkgdesc="A network programming library written in C++" arch=('i686' 'x86_64') url="http://alumnit.ca/wiki/?page=WvStreams" diff --git a/core/curl/PKGBUILD b/core/curl/PKGBUILD index 384e163d9..0c88797cf 100644 --- a/core/curl/PKGBUILD +++ b/core/curl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 197806 2013-10-30 11:02:54Z allan $ +# $Id: PKGBUILD 198761 2013-11-03 13:49:41Z dreisner $ # Maintainer: Dave Reisner # Contributor: Angel Velasquez # Contributor: Eric Belanger @@ -7,7 +7,7 @@ pkgname=curl pkgver=7.33.0 -pkgrel=2 +pkgrel=3 pkgdesc="An URL retrieval utility and library" arch=('i686' 'x86_64') url="http://curl.haxx.se" @@ -16,11 +16,19 @@ depends=('ca-certificates' 'libssh2' 'openssl' 'zlib') provides=('libcurl.so') options=('strip' 'debug') source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc} + "0001-glob-fix-regression-from-commit-5ca96cb844.patch::https://github.com/bagder/curl/commit/867b52a.patch" curlbuild.h) md5sums=('c8a4eaac7ce7b0d1bf458d62ccd4ef93' 'SKIP' + 'd71c7eab7d38f1731f78285634a4c390' '751bd433ede935c8fae727377625a8ae') +prepare() { + cd "$pkgname-$pkgver" + + patch -Np1 < "$srcdir"/0001-glob-fix-regression-from-commit-5ca96cb844.patch +} + build() { cd "$pkgname-$pkgver" diff --git a/core/libssh2/PKGBUILD b/core/libssh2/PKGBUILD index 29202c5dc..a723e0ba6 100644 --- a/core/libssh2/PKGBUILD +++ b/core/libssh2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 197828 2013-10-30 11:05:28Z allan $ +# $Id: PKGBUILD 198760 2013-11-03 13:49:40Z dreisner $ # Maintainer: Dave Reisner # Contributor: Angel Velasquez # Contributor: Sergej Pupykin @@ -7,7 +7,7 @@ pkgname=libssh2 pkgver=1.4.3 -pkgrel=1 +pkgrel=2 pkgdesc="A library implementing the SSH2 protocol as defined by Internet Drafts" url="http://www.libssh2.org/" arch=('i686' 'x86_64') diff --git a/core/openldap/PKGBUILD b/core/openldap/PKGBUILD index 066cd0fd4..98807de9e 100644 --- a/core/openldap/PKGBUILD +++ b/core/openldap/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 197834 2013-10-30 11:06:09Z allan $ +# $Id: PKGBUILD 198764 2013-11-03 16:44:35Z eric $ # Maintainer: pkgbase=openldap pkgname=('libldap' 'openldap') -pkgver=2.4.36 +pkgver=2.4.37 pkgrel=1 arch=('i686' 'x86_64') url="http://www.openldap.org/" @@ -12,7 +12,7 @@ makedepends=('libltdl' 'libsasl' 'e2fsprogs' 'util-linux' 'chrpath') options=('!makeflags') source=(ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${pkgbase}-${pkgver}.tgz slapd.service slapd.tmpfiles openldap-ntlm.patch) -sha1sums=('da0e18a28a5dade5c98d9a382fd8f0a676a12aca' +sha1sums=('179b3d51f7569cca768384fee92aa43c8a82c5d9' '2441815efbfa01ad7a1d39068e5503b53d1d04b0' '59241a813d7508294e4ef1cec3bfe1f5495e109d' 'e4afd9f1c810ef4c4cd8fe1101dfe5887f2b7eef') diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD index 88a87a2f3..3c81ee687 100644 --- a/extra/imagemagick/PKGBUILD +++ b/extra/imagemagick/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 198679 2013-11-02 02:19:38Z eric $ +# $Id: PKGBUILD 198752 2013-11-03 00:30:32Z eric $ # Maintainer: Eric Bélanger pkgbase=imagemagick pkgname=('imagemagick' 'imagemagick-doc') pkgver=6.8.7.4 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://www.imagemagick.org/" license=('custom') @@ -27,12 +27,15 @@ prepare() { build() { cd ImageMagick-${pkgver%.*}-${pkgver##*.} + [[ $CARCH = "i686" ]] && EXTRAOPTS="--with-gcc-arch=i686" + [[ $CARCH = "x86_64" ]] && EXTRAOPTS="--with-gcc-arch=x86-64" + ./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 \ --enable-opencl --without-gvc --without-djvu --without-autotrace \ - --without-jbig --without-fpx --without-dps --without-fftw + --without-jbig --without-fpx --without-dps --without-fftw $EXTRAOPTS make } diff --git a/extra/lapack/PKGBUILD b/extra/lapack/PKGBUILD index cdefb4720..31ab30360 100644 --- a/extra/lapack/PKGBUILD +++ b/extra/lapack/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 171531 2012-11-18 12:48:44Z ronald $ +# $Id: PKGBUILD 198759 2013-11-03 11:28:03Z ronald $ # Maintainer: Ronald van Haren # Contributor: Jan de Groot # Contributor: damir @@ -7,7 +7,7 @@ pkgbase=lapack pkgname=('lapack' 'blas') pkgver=3.4.2 -pkgrel=1 +pkgrel=2 url="http://www.netlib.org/lapack" pkgdesc="Linear Algebra PACKage" makedepends=('gcc-fortran' 'cmake') @@ -29,23 +29,25 @@ build() { -DCMAKE_SKIP_RPATH=ON \ -DBUILD_SHARED_LIBS=ON \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_Fortran_COMPILER=gfortran + -DCMAKE_Fortran_COMPILER=gfortran \ + -DLAPACKE=ON make } package_lapack() { depends=("blas=${pkgver}") - install -m755 -d ${pkgdir}/usr/{lib,bin} + install -m755 -d ${pkgdir}/usr/{lib,bin,include} - for libname in liblapack libtmglib; do + for libname in liblapack libtmglib liblapacke; do install -m755 "${srcdir}/build/lib/${libname}.so" \ "${pkgdir}/usr/lib/" - ln -sf liblapack.so "${pkgdir}/usr/lib/${libname}.so.${pkgver}" - ln -sf liblapack.so "${pkgdir}/usr/lib/${libname}.so.3" + ln -sf ${libname}.so "${pkgdir}/usr/lib/${libname}.so.${pkgver}" + ln -sf ${libname}.so "${pkgdir}/usr/lib/${libname}.so.3" done install -m755 ${srcdir}/build/bin/* ${pkgdir}/usr/bin + install -m644 ${srcdir}/build/include/* ${pkgdir}/usr/include install -m755 -d "${pkgdir}/usr/share/licenses/lapack" install -m644 "${srcdir}/${pkgname}-${pkgver}/LICENSE" \ "${pkgdir}/usr/share/licenses/lapack/" diff --git a/extra/libindi/PKGBUILD b/extra/libindi/PKGBUILD index e8866c165..105a060ad 100644 --- a/extra/libindi/PKGBUILD +++ b/extra/libindi/PKGBUILD @@ -1,16 +1,17 @@ -# $Id: PKGBUILD 196980 2013-10-21 12:13:11Z andrea $ +# $Id: PKGBUILD 198755 2013-11-03 09:14:05Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Tobias Powalowski pkgname=libindi pkgver=0.9.6 -pkgrel=4 +pkgrel=5 pkgdesc="A distributed control protocol designed to operate astronomical instrumentation" url="http://www.indilib.org/index.php?title=Main_Page" license=('GPL2') arch=('i686' 'x86_64') depends=('libnova' 'cfitsio' 'boost-libs' 'libusb-compat') makedepends=('cmake' 'boost') +options=('staticlibs') # libindiclient builds as static only source=("http://downloads.sourceforge.net/indi/${pkgname}_${pkgver}.tar.gz") md5sums=('c1456544a36f543e2884f88913cf3eb0') diff --git a/extra/mercurial/PKGBUILD b/extra/mercurial/PKGBUILD index 4e086ad51..654f69a43 100644 --- a/extra/mercurial/PKGBUILD +++ b/extra/mercurial/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 196286 2013-10-10 15:22:37Z giovanni $ +# $Id: PKGBUILD 198757 2013-11-03 10:27:39Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Douglas Soares de Andrade pkgname=mercurial -pkgver=2.7.2 +pkgver=2.8 pkgrel=1 pkgdesc="A scalable distributed SCM tool" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ optdepends=('tk: for the hgk GUI') backup=('etc/mercurial/hgrc') source=("http://mercurial.selenic.com/release/${pkgname}-${pkgver}.tar.gz" 'mercurial.profile') -md5sums=('ec00ddc6aadfea1e11b23650cb741d53' +md5sums=('76b565f48000e9f331356ab107a5bcbb' '43e1d36564d4c7fbe9a091d3ea370a44') package() { diff --git a/libre/icedove-l10n/PKGBUILD b/libre/icedove-l10n/PKGBUILD index 0698ac098..98b9747e0 100644 --- a/libre/icedove-l10n/PKGBUILD +++ b/libre/icedove-l10n/PKGBUILD @@ -3,8 +3,8 @@ pkgbase=icedove-l10n epoch=1 -_pkgver=17.0.9esr -pkgver=17.0.9.deb2 +_pkgver=17.0.10esr +pkgver=17.0.10.deb1 _langpacks=(ar ast be bg bn-BD br ca cs da de el en-GB en-US es-AR es-ES et eu fi fr fy-NL ga-IE gd gl he hr hu hy-AM id is it ja ko lt nb-NO nl nn-NO pa-IN pl pt-BR pt-PT rm ro ru si sk sl sq sr sv-SE ta-LK tr uk vi zh-CN zh-TW) @@ -65,58 +65,58 @@ done md5sums=('d5b2567a8cc8f64591f313a6efdaaffc' 'f3719964e893c1002b7a923e8f95f923' - 'cc32b8aa30e0e54fcea11b76a9a030f4' - 'a18431241d61f6f517c1b8c3d8ce884f' - '28b6143d9dea47b9bd89453fea455457' - 'e1139e6b943a02af2be130f66db99390' - '6c446ab3cfc39b1b177f0b7c4558ffd6' - 'f6a88413d68fff4451fb675586539705' - '8e77e2d1236ee08c690edd6617bc61ec' - '7a5748c07c863745540e4dc48773bdfe' - 'fabe0a051dfedeee5b7301ae1f886aa2' - '171068c63cb0819a5c8769d92a713c6e' - '64d5d905bba39a9c857e16e2deed8d92' - '41a11fedd4f0721c7dfa7b4f294c4578' - '8a23d4d6616428292c9edf432e747543' - '41aa0520d62b7f257938bae83a3fc72b' - '2b1f30b215838a256a15eb87f93825a8' - '1c125ec400fa3d9de88cf6a775f5deae' - 'd85151b34d12e265f3df28dfbc78dd1b' - '0ab58f3f0ee604e1af3dc5c16b0c2ea0' - 'e7a3d71e609efcefe71c57b7890fb37c' - '166efd822691c91a722d53e8e9c6d7a8' - 'f7837a358208e6720f18e9858478915a' - '58b38fd78be414cf4d10c2ac6dfd128c' - 'aceb524b1e843668405b762ee7258756' - '2dfc7c8760aa197efe662a389614e284' - '5886ef068a1b73bfd7d8c3c2628d8674' - 'ab535a80c409fd0b4b732fdb79f525ad' - '12dd37921eedcd2c9e5a4484315bed6d' - '0766135b41053a1b168b8a5d2b865025' - 'fb61057edad48f619a4943d7033ea4ac' - 'e7eb605e77a7dcf2093c78fee22432a8' - 'ac3455b559e3be6bba9b801e54fba4a6' - '1ab817dd1e0b2a20c7b95b3821626e4b' - '239a2ce9ada5bee297a3abc5d382fbc0' - '5159ca357d344d48e4a1ed7f5d0c6148' - 'b260be89e9ae689a2285995541055f06' - 'fe3a462afcb4a9e0a4228f0f5a894790' - 'e775993988b93497c062c0e0b5cf8c5e' - '67fec92b3bdaa8267467e96cde7145e1' - '36d0044c7e1808bc80fb7aa27c37f540' - 'fcea0c7480719cf77b7d38a23114ac25' - '205bd5873fcb142b3c3828a8a6bbe4f9' - 'e82f9a3ef19ec74d235c71d4162bef28' - 'e38119f6bfc43aec4016120c970fa1eb' - '9e89b3c89bc8f6e4dd1c80e25591b634' - 'af4688e2617a18410165da9474de7fdc' - '09f10be4a94a6eb9f91aa9be6fd65a65' - '864fe0fae10e437dd764454f87ad0cc1' - 'b2e7cbfa68bcb2e7eac21e18d87a3d93' - '171a1064054f4fd185ce896738d50cbc' - '2f34b234825e28993eb244862cef607b' - 'ad7814da5ccddfbba70fc9389b7b1368' - '41513e2cef7b5a311e8f3de988f2594b' - 'a929204d41eba4631b97892f4a915591' - '6a36f76040d930fa8a448c1d7b6c7c22' - 'be9c55a9994069fa8ebac022201cdaf3') + '8e791692eea1d3362dc3591ea0ec8593' + 'efd3bc6b816bd65544c866f53f78f278' + '6191f2d8be8e159b5660402d3452dde7' + '372e2c07cc13eb1d107c511c587049fd' + '8c0e7078deb311dc4b70b64f6891f880' + '9620ee9661a71329f0a3beaa6c68cc05' + '7e11cfe5c7b8f5ea365d25facd0578eb' + '60b59f79d7cb40ade5127f32856cb1cb' + 'f755ec87d0564dc36d8fb7de9477e415' + '6fe04cc1b6c73abae4f613cc9ef4affc' + '89cc2c93e7ed011204a1fb0e86dc4aa7' + 'dd0e47be47a9a18835c6070e48d7e07a' + '72b8a0262534c998e8c1604e15fd80af' + 'b18d9a8e54d7fb8d607c477611eee9c6' + '082baba9a78b449000961a48277479a3' + 'f5e2404638bacab4f38926d4ff7443d8' + '63484a3008ce1892a7e04e0378706cff' + '56befa3bb4792167de1ecb18919fe21c' + 'b8868ceb3d5da64be76935ef743c3ace' + '4b803458fd101fc5444b491b04de1eed' + '407387a006d14e7c1f6b0284f6c1fb2e' + '4e727822a0d4647f6de8ba1044b21b09' + '762725dd50e1bf655cf702bf3931fe9c' + '2069e7952995b2d7276f0413235d7203' + 'b102cd49a3ff300143a4240b92b3abfb' + 'cfcbfef6f4e86956059a18918ec56299' + 'c5250b9f59b0d7d34dd6afb752f94fdb' + 'aea9d435ba9a75382aceb865f73ccfe1' + '3dfc2f141b8dd36ed69e48821173a530' + 'b80d573644034fb0de121f45ebbb843e' + '327eff67979ff6ee62907940ec5773ec' + '477a25730b8d22db20d4870febfda1fc' + '770d533c56934b1f70dff1112c0f3693' + 'd77c872cfd3a96117fedeb5b8cf0ef4f' + '766ee0b04341270ef71f3d25436d6fb4' + '5669ac9b087760363713e10f0682849c' + 'e65f2c37b894d85152892da770470df0' + 'e1175d0806c229bf290aca74b1d5c57b' + '8402b9f98afdadae2a7651e4a03b9bcd' + 'b05250bdb9ce8bafe7fdaab8e005a340' + '4b32fdd2393d7395f121e05033f656a9' + '33e2e2d561f8d9549fbc7502b2702e5f' + '4017b43941dd1b16ed73f0e3ef3e25b3' + '55e23c9af6ee67182716b40c5a2296b0' + 'd8c7c561a2679395c9de4052122857d3' + '2ff180e37947d2c44a9985925d8e0a0e' + '9ff0b73411a1494658cdda374e70a2c4' + 'e1e3f296627a25721f88038841ad8965' + 'b3f50f66904f68ad82a7d20ff5adb80a' + 'e8c0f7ddeacae4b804af6ed2c27358e8' + 'd01b753d349ebe86a99832a75c7e4a37' + 'aa2fa304a4d7b4a1f0c8b83dbf6741d8' + '9b612da82cb6d65b2a1090debb7ef7be' + 'dd44a654781b0ae7550b0383cf4cc33f' + '8219c036a66f491eb5cf878ae5567aff') diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD index 18e394f61..caf158671 100644 --- a/libre/icedove-libre/PKGBUILD +++ b/libre/icedove-libre/PKGBUILD @@ -3,8 +3,8 @@ # We're getting this from Debian Sid _debname=icedove -_debver=17.0.9 -_debrel=deb2 +_debver=17.0.10 +_debrel=deb1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -31,8 +31,8 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2" vendor.js ${_pkgname}.desktop) options=(!emptydirs) -md5sums=('4c2aacece253be8f177a74d90d782f45' - 'dd8ccad23583cc0d8c3b77066711f077' +md5sums=('47df9e8d62a2bf37d0f184c6b96a377a' + '07f2fb97c98ddead98ccb537a63b6a92' '5cf95ea94f69cdd36604890cfbf7b954' 'a8fc4658d45b6bf9350023e5c3f34e56' '4eecc4fc5aafaf0da651a09eadc90bee' diff --git a/pcr/youtube-dl-current/PKGBUILD b/pcr/youtube-dl-current/PKGBUILD index 9c38c18cb..f6aeb166c 100644 --- a/pcr/youtube-dl-current/PKGBUILD +++ b/pcr/youtube-dl-current/PKGBUILD @@ -5,7 +5,7 @@ pkgname=youtube-dl-current _pkgname=youtube-dl provides=(youtube-dl) -pkgver=2013.10.30 +pkgver=2013.11.03 pkgrel=1 pkgdesc="A small command-line program to download videos from YouTube.com and a few more sites" arch=('any') @@ -27,9 +27,5 @@ package() { "${pkgdir}/usr/share/bash-completion/completions/youtube-dl" install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE" } -md5sums=('cf6169efa73e6d546221eff89937bb85' - 'SKIP') -md5sums=('5b518f25385ff86f8d8b0e3db085f7c6' - 'SKIP') -md5sums=('86891d5bf22d2a45fb3d1430cb1bfcca' +md5sums=('62e49076cb5e67233b3a8a8df9c8c0e8' 'SKIP') -- cgit v1.2.3-54-g00ecf