diff options
author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-01-31 03:43:15 +0000 |
---|---|---|
committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-01-31 03:43:15 +0000 |
commit | e7daa750c892363d7624ed0951bbb89ad71a3247 (patch) | |
tree | 8999b16b95f255a89c55a23cc9fb2ef42f9c303e | |
parent | abecd94e38c95522f241c335c76aa3150e43eedd (diff) |
Fri Jan 31 03:41:19 UTC 2014
36 files changed, 350 insertions, 599 deletions
diff --git a/community/augeas/PKGBUILD b/community/augeas/PKGBUILD index 52ef6f776..c73aea724 100644 --- a/community/augeas/PKGBUILD +++ b/community/augeas/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 100130 2013-11-01 20:20:20Z spupykin $ +# $Id: PKGBUILD 105015 2014-01-30 08:53:11Z spupykin $ # Contributor: Thomas S Hatch <thatch45@gmail.com> # Contributor: Jon Nordby <jononor@gmail.com> pkgname=augeas -pkgver=1.1.0 -pkgrel=2 +pkgver=1.2.0 +pkgrel=1 pkgdesc="A configuration editing tool that parses config files and transforms them into a tree" arch=('i686' 'x86_64') url="http://augeas.net" license=('LGPL') depends=('libxml2' 'gcc-libs') source=(http://download.augeas.net/augeas-$pkgver.tar.gz{,.sig}) -md5sums=('520ce983457ff9ffa3816bc41a9f328b' +md5sums=('dce2f52cbd20f72c7da48e014ad48076' 'SKIP') build() { diff --git a/community/instead/PKGBUILD b/community/instead/PKGBUILD index 2169587cd..04b247bda 100644 --- a/community/instead/PKGBUILD +++ b/community/instead/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 104923 2014-01-28 11:19:00Z spupykin $ +# $Id: PKGBUILD 105061 2014-01-30 20:23:17Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Peter Kosyh <p.kosyhgmail.com> pkgname=instead -pkgver=2.0.1 +pkgver=2.0.2 pkgrel=1 pkgdesc="a quest interpreter" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('GPL') depends=('sdl_image' 'sdl_mixer' 'sdl_ttf' 'lua') optdepends=('instead-launcher: install and update INSTEAD games from net') source=(http://downloads.sourceforge.net/project/instead/instead/${pkgver}/instead_${pkgver}.tar.gz) -md5sums=('28adadd80c3726ebd3856aa3fa372ea3') +md5sums=('040d8378df4695aed771d6699e1cd7d8') build() { cd "${srcdir}/instead-${pkgver}" diff --git a/community/libvdpau-va-gl/PKGBUILD b/community/libvdpau-va-gl/PKGBUILD index 160f8685b..6134346c9 100644 --- a/community/libvdpau-va-gl/PKGBUILD +++ b/community/libvdpau-va-gl/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 104362 2014-01-19 13:06:16Z bpiotrowski $ +# $Id: PKGBUILD 105035 2014-01-30 12:39:32Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Behem0th <grantipak@gmail.com> pkgname=libvdpau-va-gl -pkgver=0.3.1 +pkgver=0.3.2 pkgrel=1 pkgdesc='VDPAU driver with OpenGL/VAAPI backend' arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('LGPL3') depends=('libvdpau' 'libva' 'libgl' 'ffmpeg' 'glu') makedepends=('cmake') source=(https://github.com/i-rinat/$pkgname/archive/v$pkgver.tar.gz) -md5sums=('2ec5c68282aac9720525e16e858cd599') +md5sums=('3fea8e94a67cd54c2f1d3ce1907c910a') build() { cd $pkgname-$pkgver diff --git a/community/luakit/PKGBUILD b/community/luakit/PKGBUILD index 4a24f7182..82d2ea2d7 100644 --- a/community/luakit/PKGBUILD +++ b/community/luakit/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 104487 2014-01-21 17:50:07Z bpiotrowski $ +# $Id: PKGBUILD 105053 2014-01-30 18:41:11Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: J. W. Birdsong <jwbirdsong AT gmail DOT com> @@ -6,15 +6,18 @@ pkgname=luakit pkgver=2012.09.13.r1 _pkgver=2012.09.13-r1 -pkgrel=6 +pkgrel=7 pkgdesc='Fast, small, Webkit based browser framework extensible by Lua' arch=('i686' 'x86_64') url='http://mason-larobina.github.com/luakit/' license=('GPL3') depends=('webkitgtk2' 'lua51-filesystem' 'libunique' 'desktop-file-utils' 'luajit') makedepends=('help2man') +backup=(etc/xdg/luakit/binds.lua etc/xdg/luakit/globals.lua + etc/xdg/luakit/modes.lua etc/xdg/luakit/rc.lua etc/xdg/luakit/theme.lua + etc/xdg/luakit/webview.lua etc/xdg/luakit/window.lua) options=(!makeflags) -install='luakit.install' +install=luakit.install source=($pkgname-$pkgver.tar.gz::https://github.com/mason-larobina/luakit/tarball/$_pkgver) md5sums=('77b02e6d19ba021409f1778fddd94a42') diff --git a/community/mate-disk-utility/PKGBUILD b/community/mate-disk-utility/PKGBUILD new file mode 100644 index 000000000..84ab0f8da --- /dev/null +++ b/community/mate-disk-utility/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 105033 2014-01-30 12:06:00Z flexiondotorg $ +# Maintainer : Martin Wimpress <code@flexion.org> + +pkgname=mate-disk-utility +pkgver=1.6.2 +pkgrel=1 +pkgdesc="Disk management application for MATE." +url="https://github.com/NiceandGently/mate-disk-utility" +arch=('i686' 'x86_64') +license=('GPL') +depends=('avahi' 'dbus' 'gtk2' 'libatasmart' 'libgnome-keyring' 'libnotify' + 'libunique' 'mate-file-manager' 'udisks') +makedepends=('mate-common' 'mate-doc-utils' 'perl-xml-parser') +options=('!emptydirs') +source=("https://github.com/NiceandGently/${pkgname}/archive/v${pkgver}.tar.gz") +md5sums=('ff3b520a06c367124558cdd252f1956d') +install=${pkgname}.install + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./autogen.sh \ + --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib/${pkgname} \ + --enable-gnome-keyring \ + --disable-static \ + --disable-scrollkeeper + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/community/mate-file-archiver/mate-file-archiver.install b/community/mate-disk-utility/mate-disk-utility.install index bf6781f93..94794eb8d 100644 --- a/community/mate-file-archiver/mate-file-archiver.install +++ b/community/mate-disk-utility/mate-disk-utility.install @@ -1,6 +1,5 @@ post_install() { - glib-compile-schemas /usr/share/glib-2.0/schemas/ - gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor + gtk-update-icon-cache -q -t -f /usr/share/icons/mate update-desktop-database -q } diff --git a/community/mate-document-viewer/PKGBUILD b/community/mate-document-viewer/PKGBUILD deleted file mode 100644 index cb761aa84..000000000 --- a/community/mate-document-viewer/PKGBUILD +++ /dev/null @@ -1,47 +0,0 @@ -# Maintainer : Martin Wimpress <code@flexion.org> - -pkgname=mate-document-viewer -pkgver=1.6.2 -pkgrel=1 -pkgdesc="Simply a document viewer" -url="http://mate-desktop.org" -arch=('i686' 'x86_64') -license=('GPL') -depends=('dconf' 'dbus' 'desktop-file-utils' 'gtk2' 'libmatekeyring' 'libsm' - 'libspectre' 'mate-icon-theme' 'poppler-glib' 'zlib') -makedepends=('djvulibre' 'gobject-introspection' 'libgxps' 'mate-common' - 'mate-doc-utils' 'mate-file-manager' 'perl-xml-parser' 'texlive-bin') -optdepends=('djvulibre: DjVu support' - 'libgxps: XPS support' - 'mate-file-manager: Document Properties extension' - 'p7zip: cbz and cb7 compressed comic books' - 'texlive-bin: DVI support' - 'unrar: cbr compressed comic books') -options=('!emptydirs') -groups=('mate-extra') -source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz") -sha1sums=('295a59e7b7babd86f42eebb2a9ac5405dd7b2997') -install=${pkgname}.install - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure \ - --prefix=/usr \ - --libexecdir=/usr/lib/${pkgname} \ - --enable-gtk-doc \ - --enable-djvu \ - --enable-dvi \ - --enable-t1lib \ - --enable-pixbuf \ - --enable-comics \ - --enable-introspection \ - --disable-static \ - --disable-scrollkeeper - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - ln -s atril "${pkgdir}/usr/bin/mate-document-viewer" -} diff --git a/community/mate-document-viewer/mate-document-viewer.install b/community/mate-document-viewer/mate-document-viewer.install deleted file mode 100644 index bf6781f93..000000000 --- a/community/mate-document-viewer/mate-document-viewer.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - glib-compile-schemas /usr/share/glib-2.0/schemas/ - gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/community/mate-file-archiver/PKGBUILD b/community/mate-file-archiver/PKGBUILD deleted file mode 100644 index 8f5f07026..000000000 --- a/community/mate-file-archiver/PKGBUILD +++ /dev/null @@ -1,48 +0,0 @@ -# Maintainer : Martin Wimpress <code@flexion.org> - -pkgname=mate-file-archiver -pkgver=1.6.1 -pkgrel=1 -pkgdesc="Archive manipulator for MATE" -url="http://mate-desktop.org" -arch=('i686' 'x86_64') -license=('GPL') -depends=('bzip2' 'desktop-file-utils' 'gtk2' 'gzip' 'libarchive' - 'mate-file-manager' 'tar') -makedepends=('mate-common' 'mate-doc-utils' 'perl-xml-parser') -optdepends=('arj: for ARJ support' - 'p7zip: for 7zip support' - 'unrar: for RAR extract support' - 'unace: for ACE extract support' - 'unzip: for ZIP extract support' - 'zip: for ZIP support') -options=('!emptydirs') -groups=('mate-extra') -source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz" - fr-rpm-bsdtar.patch) -sha1sums=('53a28d6fb559151c0b8d6f9a658113c77cdb938a' - '219b05a979bf6f249aaae27964f02345fd81168d') -install=${pkgname}.install - -prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" - # This patch 'depends' on libarchive - patch -Np1 -i "${srcdir}/fr-rpm-bsdtar.patch" -} - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure \ - --prefix=/usr \ - --libexecdir=/usr/lib/${pkgname} \ - --disable-static \ - --disable-scrollkeeper \ - --disable-packagekit - mate-doc-prepare --force - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/community/mate-file-archiver/fr-rpm-bsdtar.patch b/community/mate-file-archiver/fr-rpm-bsdtar.patch deleted file mode 100644 index 93a783176..000000000 --- a/community/mate-file-archiver/fr-rpm-bsdtar.patch +++ /dev/null @@ -1,60 +0,0 @@ -This makes Engrampa use bsdtar to extract .RPM packages instead of using cpio. -It is useful on systems that do not have cpio or RPM/YUM -This patch was created for Arch Linux, however should work on any system that has bsdtar capable of handling cpio archives. - -------------------+ - rpm2cpio.c | 2 +- - fr-command-rpm.c | 8 ++++---- - 2 files changed, 5 insertions(+), 5 deletions(-) - -Index: src/commands/rpm2cpio.c -================================ ---- mate-file-archiver-1.6.0/src/commands/rpm2cpio.c 2013-03-31 -+++ mate-file-archiver-1.6.0/src/commands/rpm2cpio.c 2013-07-26 -@@ -128,7 +128,7 @@ - archive_command = "bzip2 -dc"; - fclose (stream); - -- command = g_strdup_printf ("sh -c \"dd if=%s ibs=%u skip=1 2>/dev/null | %s | cpio %s\"", g_shell_quote (filename), offset, archive_command, cpio_args->str); -+ command = g_strdup_printf ("sh -c \"dd if=%s ibs=%u skip=1 2>/dev/null | %s | bsdtar %s\"", g_shell_quote (filename), offset, archive_command, cpio_args->str); - - return system (command); - } -Index: src/fr-command-rpm.c -================================ ---- mate-file-archiver-1.6.0/src/fr-command-rpm.c 2013-03-31 -+++ mate-file-archiver-1.6.0/src/fr-command-rpm.c 2013-07-26 -@@ -175,7 +175,7 @@ - - fr_process_begin_command (comm->process, "sh"); - fr_process_add_arg (comm->process, "-c"); -- fr_process_add_arg_concat (comm->process, PRIVEXECDIR "rpm2cpio ", comm->e_filename, " -itv", NULL); -+ fr_process_add_arg_concat (comm->process, PRIVEXECDIR "rpm2cpio ", comm->e_filename, " -tvf -", NULL); - fr_process_end_command (comm->process); - fr_process_start (comm->process); - } -@@ -200,7 +200,7 @@ - - cmd = g_string_new (PRIVEXECDIR "rpm2cpio "); - g_string_append (cmd, comm->e_filename); -- g_string_append (cmd, " -idu "); -+ g_string_append (cmd, " -xf - "); - for (scan = file_list; scan; scan = scan->next) { - char *filename = g_shell_quote (scan->data); - g_string_append (cmd, filename); -@@ -233,7 +233,7 @@ - FrCommandCap capabilities; - - capabilities = FR_COMMAND_CAN_ARCHIVE_MANY_FILES; -- if (is_program_available ("cpio", check_command)) -+ if (is_program_available ("bsdtar", check_command)) - capabilities |= FR_COMMAND_CAN_READ; - - return capabilities; -@@ -244,7 +244,7 @@ - fr_command_rpm_get_packages (FrCommand *comm, - const char *mime_type) - { -- return PACKAGES ("cpio,rpm"); -+ return PACKAGES ("bsdtar,rpm"); - } diff --git a/community/mate-screensaver/PKGBUILD b/community/mate-screensaver/PKGBUILD index a7600ea20..3ff0d4b0b 100644 --- a/community/mate-screensaver/PKGBUILD +++ b/community/mate-screensaver/PKGBUILD @@ -2,7 +2,7 @@ pkgname=mate-screensaver pkgver=1.6.2 -pkgrel=2 +pkgrel=3 pkgdesc='Screensaver for MATE' url="http://mate-desktop.org" arch=('i686' 'x86_64') @@ -10,7 +10,9 @@ license=('GPL') depends=('dbus-glib' 'libmatekbd' 'libnotify' 'libxss' 'mate-desktop' 'mate-menus' 'mate-session-manager') makedepends=('mate-common' 'mate-doc-utils' 'perl-xml-parser' 'xmlto') -optdepends=('mate-power-manager: Add power management support.') +optdepends=('mate-power-manager: Add power management support.' + 'mate-screensaver-hacks: Additional screensavers.' + 'rss-glx: Really slick screensavers.') options=('!emptydirs') groups=('mate-extra') source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz") diff --git a/community/mupdf/PKGBUILD b/community/mupdf/PKGBUILD index daf8c42ad..6f736631e 100644 --- a/community/mupdf/PKGBUILD +++ b/community/mupdf/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 99335 2013-10-27 10:47:47Z bpiotrowski $ +# $Id: PKGBUILD 105051 2014-01-30 18:29:49Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Brad Fanella <bradfanella@archlinux.us> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> @@ -7,23 +7,34 @@ pkgname=mupdf pkgver=1.3 -pkgrel=7 +pkgrel=8 pkgdesc='Lightweight PDF and XPS viewer' arch=('i686' 'x86_64') url='http://mupdf.com' license=('GPL3') -depends=('curl' 'desktop-file-utils' 'freetype2' 'jbig2dec' 'libjpeg' 'libxext' 'openssl') +depends=('curl' 'desktop-file-utils' 'freetype2' 'jbig2dec' 'libjpeg' 'libxext' + 'openssl') install=mupdf.install options=('staticlibs') source=(https://mupdf.googlecode.com/files/$pkgname-$pkgver-source.tar.gz - mupdf-1.3-system-libcurl.patch) -sha256sums=('aba8b31bee9cc0a16abedab5e31c81c65996cba5591e62a50a79bea2a63d4478' - '41a3b6df736f971e91c066e73afac286eec8fa37af244a55df52e8b173646f42') + mupdf-1.3-system-libcurl.patch + mupdf-1.3-stack-buffer-overflow-in-xps_parse_color.patch) +md5sums=('fe53c2a56ebd7759f5f965bc4ff66359' + '6d11387e9bb9897f6f1ecc3956f8e2d4' + 'f4d785b28f711e12d4a078ce9b3ed8f5') prepare() { cd $pkgname-$pkgver-source rm -rf thirdparty/{curl,freetype,jpeg,zlib,jbig2dec} - patch -Np1 -i ../mupdf-1.3-system-libcurl.patch + patch -p1 -i ../mupdf-1.3-system-libcurl.patch + patch -p1 -i ../mupdf-1.3-stack-buffer-overflow-in-xps_parse_color.patch + + cd platform/debian + sed -i -e 's/mupdf.xpm/mupdf/' \ + -e 's/application\/x-pdf/application\/x-pdf/' \ + -e 's/mupdf-select-file/mupdf/' \ + -e 's/^$/NoDisplay=true/' \ + mupdf.desktop } build() { @@ -42,11 +53,6 @@ package() { rm "$pkgdir"/usr/bin/mupdf-x11 cd platform/debian - sed -i -e 's/mupdf.xpm/mupdf/' \ - -e 's/application\/x-pdf/application\/x-pdf/' \ - -e 's/mupdf-select-file/mupdf/' \ - -e 's/^$/NoDisplay=true/' \ - mupdf.desktop install -Dm644 mupdf.desktop "$pkgdir"/usr/share/applications/mupdf.desktop install -Dm644 mupdf.xpm "$pkgdir"/usr/share/pixmaps/mupdf.xpm diff --git a/community/mupdf/mupdf-1.3-stack-buffer-overflow-in-xps_parse_color.patch b/community/mupdf/mupdf-1.3-stack-buffer-overflow-in-xps_parse_color.patch new file mode 100644 index 000000000..bfe86f320 --- /dev/null +++ b/community/mupdf/mupdf-1.3-stack-buffer-overflow-in-xps_parse_color.patch @@ -0,0 +1,135 @@ +From 60dabde18d7fe12b19da8b509bdfee9cc886aafc Mon Sep 17 00:00:00 2001 +From: =?utf8?q?Simon=20B=C3=BCnzli?= <zeniko@gmail.com> +Date: Thu, 16 Jan 2014 22:04:51 +0100 +Subject: [PATCH] Bug 694957: fix stack buffer overflow in xps_parse_color +MIME-Version: 1.0 +Content-Type: text/plain; charset=utf8 +Content-Transfer-Encoding: 8bit + +xps_parse_color happily reads more than FZ_MAX_COLORS values out of a +ContextColor array which overflows the passed in samples array. +Limiting the number of allowed samples to FZ_MAX_COLORS and make sure +to use that constant for all callers fixes the problem. + +Thanks to Jean-Jamil Khalifé for reporting and investigating the issue +and providing a sample exploit file. +--- + source/xps/xps-common.c | 22 ++++++++++++++-------- + source/xps/xps-glyphs.c | 2 +- + source/xps/xps-gradient.c | 2 +- + source/xps/xps-path.c | 2 +- + 4 files changed, 17 insertions(+), 11 deletions(-) + +diff --git a/source/xps/xps-common.c b/source/xps/xps-common.c +index b780f42..32a30ba 100644 +--- a/source/xps/xps-common.c ++++ b/source/xps/xps-common.c +@@ -89,7 +89,7 @@ xps_begin_opacity(xps_document *doc, const fz_matrix *ctm, const fz_rect *area, + if (scb_color_att) + { + fz_colorspace *colorspace; +- float samples[32]; ++ float samples[FZ_MAX_COLORS]; + xps_parse_color(doc, base_uri, scb_color_att, &colorspace, samples); + opacity = opacity * samples[0]; + } +@@ -208,12 +208,13 @@ void + xps_parse_color(xps_document *doc, char *base_uri, char *string, + fz_colorspace **csp, float *samples) + { ++ fz_context *ctx = doc->ctx; + char *p; + int i, n; + char buf[1024]; + char *profile; + +- *csp = fz_device_rgb(doc->ctx); ++ *csp = fz_device_rgb(ctx); + + samples[0] = 1; + samples[1] = 0; +@@ -259,7 +260,7 @@ xps_parse_color(xps_document *doc, char *base_uri, char *string, + profile = strchr(buf, ' '); + if (!profile) + { +- fz_warn(doc->ctx, "cannot find icc profile uri in '%s'", string); ++ fz_warn(ctx, "cannot find icc profile uri in '%s'", string); + return; + } + +@@ -267,12 +268,17 @@ xps_parse_color(xps_document *doc, char *base_uri, char *string, + p = strchr(profile, ' '); + if (!p) + { +- fz_warn(doc->ctx, "cannot find component values in '%s'", profile); ++ fz_warn(ctx, "cannot find component values in '%s'", profile); + return; + } + + *p++ = 0; + n = count_commas(p) + 1; ++ if (n > FZ_MAX_COLORS) ++ { ++ fz_warn(ctx, "ignoring %d color components (max %d allowed)", n - FZ_MAX_COLORS, FZ_MAX_COLORS); ++ n = FZ_MAX_COLORS; ++ } + i = 0; + while (i < n) + { +@@ -292,10 +298,10 @@ xps_parse_color(xps_document *doc, char *base_uri, char *string, + /* TODO: load ICC profile */ + switch (n) + { +- case 2: *csp = fz_device_gray(doc->ctx); break; +- case 4: *csp = fz_device_rgb(doc->ctx); break; +- case 5: *csp = fz_device_cmyk(doc->ctx); break; +- default: *csp = fz_device_gray(doc->ctx); break; ++ case 2: *csp = fz_device_gray(ctx); break; ++ case 4: *csp = fz_device_rgb(ctx); break; ++ case 5: *csp = fz_device_cmyk(ctx); break; ++ default: *csp = fz_device_gray(ctx); break; + } + } + } +diff --git a/source/xps/xps-glyphs.c b/source/xps/xps-glyphs.c +index b26e18d..e621257 100644 +--- a/source/xps/xps-glyphs.c ++++ b/source/xps/xps-glyphs.c +@@ -590,7 +590,7 @@ xps_parse_glyphs(xps_document *doc, const fz_matrix *ctm, + + if (fill_att) + { +- float samples[32]; ++ float samples[FZ_MAX_COLORS]; + fz_colorspace *colorspace; + + xps_parse_color(doc, base_uri, fill_att, &colorspace, samples); +diff --git a/source/xps/xps-gradient.c b/source/xps/xps-gradient.c +index 7d03f89..76188e9 100644 +--- a/source/xps/xps-gradient.c ++++ b/source/xps/xps-gradient.c +@@ -39,7 +39,7 @@ xps_parse_gradient_stops(xps_document *doc, char *base_uri, fz_xml *node, + struct stop *stops, int maxcount) + { + fz_colorspace *colorspace; +- float sample[8]; ++ float sample[FZ_MAX_COLORS]; + float rgb[3]; + int before, after; + int count; +diff --git a/source/xps/xps-path.c b/source/xps/xps-path.c +index b97ee17..ea84a81 100644 +--- a/source/xps/xps-path.c ++++ b/source/xps/xps-path.c +@@ -826,7 +826,7 @@ xps_parse_path(xps_document *doc, const fz_matrix *ctm, char *base_uri, xps_reso + + fz_stroke_state *stroke = NULL; + fz_matrix transform; +- float samples[32]; ++ float samples[FZ_MAX_COLORS]; + fz_colorspace *colorspace; + fz_path *path = NULL; + fz_path *stroke_path = NULL; +-- +1.7.9.5 + diff --git a/community/myodbc/PKGBUILD b/community/myodbc/PKGBUILD index a9709614c..f7a501498 100644 --- a/community/myodbc/PKGBUILD +++ b/community/myodbc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 100622 2013-11-06 14:11:22Z spupykin $ +# $Id: PKGBUILD 105021 2014-01-30 10:11:38Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=myodbc pkgver=5.2.6 -pkgrel=1 +pkgrel=2 pkgdesc="ODBC driver/connector for mariadb" arch=(i686 x86_64) url="http://dev.mysql.com/downloads/connector/odbc/" @@ -20,7 +20,7 @@ build() { export LDFLAGS="-lpthread -ldl" cmake -G "Unix Makefiles" \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DMYSQLCLIENT_LIB_NAME=libmysqlclient_r.so \ + -DMYSQLCLIENT_LIB_NAME=libmysqlclient_r.a \ -DWITH_UNIXODBC=1 . make } diff --git a/community/passenger/PKGBUILD b/community/passenger/PKGBUILD index 3954a612a..c82736da4 100644 --- a/community/passenger/PKGBUILD +++ b/community/passenger/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 104886 2014-01-28 03:34:17Z td123 $ +# $Id: PKGBUILD 105017 2014-01-30 08:53:30Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=passenger -pkgver=4.0.21 -pkgrel=3 +pkgver=4.0.37 +pkgrel=1 pkgdesc="mod_rails passenger" arch=('i686' 'x86_64') url="http://www.modrails.com" @@ -14,7 +14,7 @@ makedepends=('apache') install=passenger.install options=('!emptydirs' 'staticlibs') source=($pkgname-$pkgver.tar.gz::https://github.com/FooBarWidget/passenger/archive/release-$pkgver.tar.gz) -md5sums=('200ba8636baa06c9a44d30c7bbb50ac3') +md5sums=('7040af5314fe19a420f38732c6bd4f5b') prepare() { cd $srcdir/passenger-release-$pkgver diff --git a/community/python2-traits/PKGBUILD b/community/python2-traits/PKGBUILD index 17e8ac07f..b29d31cf1 100644 --- a/community/python2-traits/PKGBUILD +++ b/community/python2-traits/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 96105 2013-08-20 06:32:41Z lcarlier $ +# $Id: PKGBUILD 105025 2014-01-30 10:34:22Z aginiewicz $ # Maintainer: Andrzej Giniewicz <gginiu@gmail.com> pkgname=python2-traits -pkgver=4.3.0 -pkgrel=2 +pkgver=4.4.0 +pkgrel=1 pkgdesc="Explicitly typed attributes for Python" arch=('i686' 'x86_64') url="https://github.com/enthought/traits" @@ -13,7 +13,7 @@ makedepends=('python2-setuptools') options=(!emptydirs) source=("$pkgname-$pkgver.tar.gz::https://github.com/enthought/traits/archive/${pkgver}.tar.gz") -md5sums=('f78c15c44e0f965cc2ab799806a80388') +md5sums=('f284e67ae3437e9427e23f7f8a4975d6') build() { cd "$srcdir"/traits-$pkgver diff --git a/community/qtcurve/PKGBUILD b/community/qtcurve/PKGBUILD index d85ed86d5..f64a14d42 100644 --- a/community/qtcurve/PKGBUILD +++ b/community/qtcurve/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 98877 2013-10-21 00:42:02Z speps $ +# $Id: PKGBUILD 105059 2014-01-30 19:46:54Z speps $ # Maintainer : speps <speps at aur dot archlinux dot org> # Contributor: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -6,16 +6,16 @@ pkgbase=qtcurve pkgname=('qtcurve-utils' 'qtcurve-gtk2' 'qtcurve-qt4' 'qtcurve-qt5' 'qtcurve-kde4') -pkgver=1.8.17 +pkgver=1.8.18 pkgrel=1 pkgdesc='A configurable set of widget styles for KDE and Gtk' arch=('i686' 'x86_64') url='https://github.com/QtCurve/qtcurve' -license=('GPL') +license=('LGPL') groups=('qtcurve') makedepends=('cmake' 'automoc4' 'gtk2' 'qt4' 'qt5-svg' 'qt5-x11extras' 'kdebase-workspace') source=("$pkgbase-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz") -md5sums=('c4f2e9bc296398b42bfc132b88a3b989') +md5sums=('422d1876d944bb278855f320eda19368') build() { cd $pkgbase-$pkgver @@ -37,7 +37,7 @@ build() { package_qtcurve-utils() { depends=('libx11') - cd $pkgbase-$pkgver/build/qtcurve-utils + cd $pkgbase-$pkgver/build/lib/utils make DESTDIR="$pkgdir" install } @@ -45,6 +45,8 @@ package_qtcurve-gtk2() { depends=('qtcurve-utils' 'gtk2') cd $pkgbase-$pkgver/build/gtk2 make DESTDIR="$pkgdir" install + cd ../lib/cairo + make DESTDIR="$pkgdir" install } package_qtcurve-qt4() { diff --git a/community/scummvm/PKGBUILD b/community/scummvm/PKGBUILD index edf6e859b..d09467180 100644 --- a/community/scummvm/PKGBUILD +++ b/community/scummvm/PKGBUILD @@ -4,12 +4,14 @@ pkgname=scummvm pkgver=1.6.0 -pkgrel=1 +pkgrel=2 pkgdesc="A 'virtual machine' for several classic graphical point-and-click adventure games." arch=('i686' 'x86_64') license=('GPL') url="http://www.scummvm.org/" -depends=('libmad' 'sdl' 'fluidsynth' 'flac' 'faad2' 'libvorbis' 'libmad') +depends=('libpng' 'libtheora' 'libmad' 'sdl' 'fluidsynth' 'flac' 'faad2' 'libvorbis' 'libmad' 'freetype2' + 'libgl' 'glu') +makedepends=('mesa') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2) md5sums=('473c151ff44e3db7b603ecacd800a0d2') diff --git a/community/spacefm/PKGBUILD b/community/spacefm/PKGBUILD index 61aa478cd..f5a4bc09b 100644 --- a/community/spacefm/PKGBUILD +++ b/community/spacefm/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 104364 2014-01-19 14:07:40Z bpiotrowski $ +# $Id: PKGBUILD 105055 2014-01-30 18:44:14Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: IgnorantGuru http://igurublog.wordpress.com/contact-ignorantguru/ # Contributor: ridikulus_rat <the.ridikulus.rat@gmail.com> @@ -15,7 +15,6 @@ depends=('gtk3' 'shared-mime-info' 'desktop-file-utils' 'startup-notification' 'udev' 'bash') makedepends=('intltool' 'gettext') optdepends=('lsof: device processes' - 'eject: eject media' 'wget: plugin download' 'gksu: perform as root functionality' 'udevil: mount as non-root user and mount networks' diff --git a/core/util-linux/0001-lsblk-fix-D-segfault.patch b/core/util-linux/0001-lsblk-fix-D-segfault.patch deleted file mode 100644 index 8e4d7c6d2..000000000 --- a/core/util-linux/0001-lsblk-fix-D-segfault.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 71d842c01992b3678de4da4773ed54f08c0ab4f6 Mon Sep 17 00:00:00 2001 -From: Karel Zak <kzak@redhat.com> -Date: Mon, 18 Nov 2013 11:27:35 +0100 -Subject: [PATCH] lsblk: fix -D segfault - -References: https://bugzilla.redhat.com/show_bug.cgi?id=1031262 -Signed-off-by: Karel Zak <kzak@redhat.com> ---- - misc-utils/lsblk.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c -index 9f7f1b6..9b53be3 100644 ---- a/misc-utils/lsblk.c -+++ b/misc-utils/lsblk.c -@@ -903,7 +903,7 @@ static void set_tt_data(struct blkdev_cxt *cxt, int col, int id, struct tt_line - if (cxt->discard && p) - tt_line_set_data(ln, col, p); - else -- tt_line_set_data(ln, col, "0"); -+ tt_line_set_data(ln, col, xstrdup("0")); - break; - case COL_DGRAN: - if (lsblk->bytes) -@@ -936,7 +936,7 @@ static void set_tt_data(struct blkdev_cxt *cxt, int col, int id, struct tt_line - if (cxt->discard && p) - tt_line_set_data(ln, col, p); - else -- tt_line_set_data(ln, col, "0"); -+ tt_line_set_data(ln, col, xstrdup("0")); - break; - case COL_WSAME: - if (lsblk->bytes) -@@ -948,7 +948,7 @@ static void set_tt_data(struct blkdev_cxt *cxt, int col, int id, struct tt_line - "queue/write_same_max_bytes", &x) == 0) - p = size_to_human_string(SIZE_SUFFIX_1LETTER, x); - } -- tt_line_set_data(ln, col, p ? p : "0"); -+ tt_line_set_data(ln, col, p ? p : xstrdup("0")); - break; - }; - } --- -1.8.4.2 - diff --git a/core/util-linux/0001-pylibmount-correctly-import-from-pylibmount.so.patch b/core/util-linux/0001-pylibmount-correctly-import-from-pylibmount.so.patch deleted file mode 100644 index 34040b9eb..000000000 --- a/core/util-linux/0001-pylibmount-correctly-import-from-pylibmount.so.patch +++ /dev/null @@ -1,30 +0,0 @@ -From c8e5e6e7323642f7e6f12ee5f5231b0ec44c40ab Mon Sep 17 00:00:00 2001 -From: Dave Reisner <dreisner@archlinux.org> -Date: Thu, 21 Nov 2013 12:25:27 -0500 -Subject: [PATCH] pylibmount: correctly import from pylibmount.so - -Without this, python is unable to find the module: - -$ python -c 'import libmount' -Traceback (most recent call last): - File "<string>", line 1, in <module> - File "/usr/lib/python3.3/site-packages/libmount/__init__.py", line 1, in <module> - from pylibmount import * -ImportError: No module named 'pylibmount' - -Signed-off-by: Dave Reisner <dreisner@archlinux.org> ---- - libmount/python/libmount/__init__.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libmount/python/libmount/__init__.py b/libmount/python/libmount/__init__.py -index 243c639..09104e2 100644 ---- a/libmount/python/libmount/__init__.py -+++ b/libmount/python/libmount/__init__.py -@@ -1,2 +1,2 @@ --from pylibmount import * -+from .pylibmount import * - --- -1.8.4.2 - diff --git a/core/util-linux/PKGBUILD b/core/util-linux/PKGBUILD index d72a68384..a004fee54 100644 --- a/core/util-linux/PKGBUILD +++ b/core/util-linux/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 201467 2013-12-12 15:33:24Z dreisner $ +# $Id: PKGBUILD 204875 2014-01-30 03:12:08Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Maintainer: Dave Reisner <dreisner@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=util-linux -pkgver=2.24 -pkgrel=2 +pkgver=2.24.1 +pkgrel=1 pkgdesc="Miscellaneous system utilities for Linux" url="http://www.kernel.org/pub/linux/utils/util-linux/" arch=('i686' 'x86_64') @@ -19,8 +19,6 @@ provides=("util-linux-ng=$pkgver" 'eject') license=('GPL2') options=('strip' 'debug') source=("ftp://ftp.kernel.org/pub/linux/utils/$pkgname/v2.24/$pkgname-$pkgver.tar.xz" - 0001-lsblk-fix-D-segfault.patch - 0001-pylibmount-correctly-import-from-pylibmount.so.patch uuidd.tmpfiles pam-login pam-common @@ -31,21 +29,12 @@ backup=(etc/pam.d/chfn etc/pam.d/su etc/pam.d/su-l) install=util-linux.install -md5sums=('4fac6443427f575fc5f3531a4ad2ca01' - '1899fe3b853a5835c76cca0501b6b518' - 'a18a1e89ffdfa3bc96ae976646a723ec' +md5sums=('88d46ae23ca599ac5af9cf96b531590f' 'a39554bfd65cccfd8254bb46922f4a67' '4368b3f98abd8a32662e094c54e7f9b1' 'a31374fef2cba0ca34dfc7078e2969e4' 'fa85e5cce5d723275b14365ba71a8aad') -prepare() { - cd "$pkgname-$pkgver" - - patch -Np1 <"$srcdir"/0001-lsblk-fix-D-segfault.patch - patch -Np1 <"$srcdir"/0001-pylibmount-correctly-import-from-pylibmount.so.patch -} - build() { cd "$pkgname-$pkgver" diff --git a/extra/antlr2/PKGBUILD b/extra/antlr2/PKGBUILD deleted file mode 100644 index 77f37b20a..000000000 --- a/extra/antlr2/PKGBUILD +++ /dev/null @@ -1,63 +0,0 @@ -# $Id: PKGBUILD 193188 2013-08-18 11:26:04Z guillaume $ -# Maintainer: Guillaume ALAUX <guillaume@archlinux.org> -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: George Giorgidze <giorgidze (at) gmail.com> -# Contributor: Stefan Husmann <stefan-husmann@t-online.de> - -pkgbase=antlr2 -pkgname=('antlr2' 'python2-antlr2') -pkgver=2.7.7 -pkgrel=4 -# architecture dependant files in /usr/lib/libantlr.a -arch=('i686' 'x86_64') -url="http://www.antlr2.org/" -license=('custom') -makedepends=('java-environment' 'python2' 'sh') -source=("http://www.antlr2.org/download/antlr-${pkgver}.tar.gz" - 'runantlr2.sh' - 'gcc4.4.patch') -md5sums=('01cc9a2a454dd33dcd8c856ec89af090' - 'e4aa827cf78f97c4e5fae086831192d6' - '8574c93f40e6477e83c29f9b07de49da') - -build() { - cd "${srcdir}/antlr-${pkgver}" - - patch -Np0 -i ${srcdir}/gcc4.4.patch - - ./configure --prefix=/usr \ - --disable-examples \ - --disable-csharp - make -} - -package_antlr2() { - pkgdesc='Tool for language recognition with C++ or Java actions' - depends=('java-runtime' 'sh') - replaces=('antlr') - conflicts=('antlr') - provides=("antlr=${pkgver}") - - cd ${srcdir}/antlr-${pkgver}/lib/cpp - make prefix="${pkgdir}/usr" install - - install -Dm644 ${srcdir}/antlr-${pkgver}/antlr/antlr.jar \ - "${pkgdir}/usr/share/java/antlr2.jar" - install -Dm755 ${srcdir}/runantlr2.sh ${pkgdir}/usr/bin/runantlr2 - install -Dm644 ${srcdir}/antlr-${pkgver}/LICENSE.txt \ - "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} - -package_python2-antlr2() { - pkgdesc='Tool for language recognition with C++ or Java actions - Python runtime support' - depends=('antlr2' 'python2') - replaces=('python-antlr') - conflicts=('python-antlr') - provides=("python-antlr=${pkgver}") - - cd ${srcdir}/antlr-${pkgver}/lib/python - python2 setup.py install --root="${pkgdir}" --optimize=1 - - install -d ${pkgdir}/usr/share/licenses - ln -s /usr/share/licenses/antlr2 ${pkgdir}/usr/share/licenses/${pkgname} -} diff --git a/extra/antlr2/gcc4.4.patch b/extra/antlr2/gcc4.4.patch deleted file mode 100644 index de8de9d3f..000000000 --- a/extra/antlr2/gcc4.4.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naur antlr-2.7.7.orig/lib/cpp/antlr/CharScanner.hpp antlr-2.7.7/lib/cpp/antlr/CharScanner.hpp ---- lib/cpp/antlr/CharScanner.hpp 2006-11-01 22:37:17.000000000 +0100 -+++ lib/cpp/antlr/CharScanner.hpp 2008-03-19 20:09:21.000000000 +0100 -@@ -10,6 +10,7 @@ - - #include <antlr/config.hpp> - -+#include <cstring> - #include <map> - - #ifdef HAS_NOT_CCTYPE_H ---- lib/cpp/antlr/CharScanner.hpp~ 2008-11-11 21:24:02.000000000 +0000 -+++ lib/cpp/antlr/CharScanner.hpp 2008-11-11 21:24:33.000000000 +0000 -@@ -10,6 +10,7 @@ - - #include <antlr/config.hpp> - -+#include <cstdio> - #include <cstring> - #include <map> - diff --git a/extra/antlr2/runantlr2.sh b/extra/antlr2/runantlr2.sh deleted file mode 100644 index 716f6f887..000000000 --- a/extra/antlr2/runantlr2.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -echo Running 'java antlr.Tool $*' with /usr/share/java/antlr2.jar appended to the CLASSPATH variable -export CLASSPATH -CLASSPATH=$CLASSPATH:/usr/share/java/antlr2.jar -java antlr.Tool $* diff --git a/extra/ardour/PKGBUILD b/extra/ardour/PKGBUILD index 3ebf10195..7fb1e296c 100644 --- a/extra/ardour/PKGBUILD +++ b/extra/ardour/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 202775 2013-12-27 23:05:21Z schiv $ +# $Id: PKGBUILD 204889 2014-01-30 18:34:44Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: SpepS <dreamspepser at yahoo dot it> # Contributor: see .contrib pkgname=ardour _pkgname=Ardour3 -pkgver=3.5.143 +pkgver=3.5.308 pkgrel=1 pkgdesc="Professional-grade digital audio workstation" arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ optdepends=('xjadeo: video monitoring') install=$pkgname.install source=("ftp://ftp.archlinux.org/other/$pkgname/$_pkgname-$pkgver.tar.bz2" "$pkgname.desktop") -md5sums=('52c3b8ea3ab014002e84e377f8a15097' +md5sums=('710e084d5edeb3c216c8fdd57f6ed744' '316bd21ece5e2208a104fd09cac521af') prepare() { diff --git a/extra/ghostscript/PKGBUILD b/extra/ghostscript/PKGBUILD new file mode 100644 index 000000000..7e52904c5 --- /dev/null +++ b/extra/ghostscript/PKGBUILD @@ -0,0 +1,76 @@ +# $Id: PKGBUILD 204554 2014-01-22 13:38:01Z andyrtr $ +# Maintainer: AndyRTR <andyrtr@archlinux.org> + +### !!! rebuild groff from core that picks up hardcoding the GS versioned font path !!! ### + +pkgname=ghostscript +pkgver=9.10 +pkgrel=3 +pkgdesc="An interpreter for the PostScript language" +arch=('i686' 'x86_64') +license=('AGPL' 'custom') +depends=('libxt' 'libcups' 'fontconfig' 'jasper' 'zlib' 'libpng>=1.5.7' 'libjpeg' + 'libtiff>=4.0.0' 'lcms2' 'dbus' 'libpaper') +makedepends=('gtk3' 'gnutls') +optdepends=('texlive-core: needed for dvipdf' + 'gtk3: needed for gsx') +url="http://www.ghostscript.com/" +source=(http://downloads.ghostscript.com/public/ghostscript-${pkgver}.tar.bz2) +options=('!makeflags') +md5sums=('7179bb1ed4f6f453147e6f7e1f210ce8') + +build() { + cd ghostscript-${pkgver} + + # force it to use system-libs + # keep heavily patched included openjpeg, leads to segfault with system openjpeg + # https://bugs.archlinux.org/task/38226 + rm -rf jpeg libpng zlib jasper expat tiff lcms lcms2 freetype cups/libs # jbig2dec is in community + + ./configure --prefix=/usr \ + --enable-dynamic \ + --with-ijs \ + --with-jbig2dec \ + --with-omni \ + --with-x \ + --with-drivers=ALL\ + --with-fontpath=/usr/share/fonts/Type1:/usr/share/fonts \ + --enable-fontconfig \ + --enable-freetype \ + --enable-openjpeg \ + --without-luratech \ + --without-omni \ + --with-system-libtiff \ + --with-libpaper \ + --disable-compile-inits #--help # needed for linking with system-zlib + make + + # Build IJS + cd ijs + sed -i "s:AM_PROG_CC_STDC:AC_PROG_CC:g" configure.ac + ./autogen.sh + ./configure --prefix=/usr --enable-shared --disable-static + make +} + +package() { + cd ghostscript-${pkgver} + make DESTDIR="${pkgdir}" \ + cups_serverroot="${pkgdir}"/etc/cups \ + cups_serverbin="${pkgdir}"/usr/lib/cups install soinstall + + # install missing doc files # http://bugs.archlinux.org/task/18023 + install -m 644 "${srcdir}"/ghostscript-${pkgver}/doc/{Ps2ps2.htm,gs-vms.hlp,gsdoc.el,pscet_status.txt} "${pkgdir}"/usr/share/ghostscript/$pkgver/doc/ + + install -D -m644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE + + # remove unwanted localized man-pages + rm -rf "$pkgdir"/usr/share/man/[^man1]* + + # install IJS + cd ijs + make DESTDIR="${pkgdir}" install + + # remove filters that are now maintained in cups-filters as upstream home + rm -rf "$pkgdir"/usr/lib/cups/filter/{gstopxl,gstoraster} +} diff --git a/extra/id3lib/20-create-manpages.patch b/extra/id3lib/20-create-manpages.patch index b2ef4ef57..cebf3d4d4 100644 --- a/extra/id3lib/20-create-manpages.patch +++ b/extra/id3lib/20-create-manpages.patch @@ -133,7 +133,7 @@ This patch adds debian-made man pages +.B \-1, \-\-v1tag +Render only the id3v1 tag +.TP -+.B \-1, \-\-v2tag ++.B \-2, \-\-v2tag +Render only the id3v2 tag +.TP +.B \-s, \-\-strip @@ -181,7 +181,7 @@ This patch adds debian-made man pages +.B \-1, \-\-v1tag +Render only the id3v1 tag +.TP -+.B \-1, \-\-v2tag ++.B \-2, \-\-v2tag +Render only the id3v2 tag +.TP +.B \-h, \-\-help diff --git a/extra/id3lib/PKGBUILD b/extra/id3lib/PKGBUILD index 5d1ae757d..ff885aecd 100644 --- a/extra/id3lib/PKGBUILD +++ b/extra/id3lib/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 204871 2014-01-29 20:02:59Z guillaume $ +# $Id: PKGBUILD 204902 2014-01-30 20:34:39Z guillaume $ # Maintainer : Guillaume ALAUX <guillaume@archlinux.org> # Contributor: Jochem Kossen <j.kossen@home.nl> # Contributor: rtfreedman <rob.til.freedman@googlemail.com> pkgname=id3lib pkgver=3.8.3 -pkgrel=14 +pkgrel=15 pkgdesc='Library for reading, writing, and manipulating ID3v1 and ID3v2 tags' arch=('i686' 'x86_64') license=('LGPL') @@ -31,7 +31,7 @@ md5sums=('19f27ddd2dda4b2d26a559a4f0f402a7' '5a78e0fe586fba334eae2a29e4bf5a28' '88f21f1bf4f697be8030706bbec11705' 'b3de841cd2eda0d37c8c8330119e12d4' - 'd922a91abcdee1ffce26b512b171c2aa' + '0c7c939943bdfcc3a0f6be95fe9b2367' '74ba59c03f91fedbe4dd8045b29c7e15' 'd2d06d46df3867d73746f584d1e6fcc5' 'd3a61d07a2bfa83f4ac6290794789022' @@ -42,21 +42,21 @@ md5sums=('19f27ddd2dda4b2d26a559a4f0f402a7' '0973e285cdc420130b984a259cdd8ae0') prepare() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i ${srcdir}/00-add-libz-to-compilation.patch - patch -p1 -i ${srcdir}/05-create-m4-directory.patch - patch -p1 -i ${srcdir}/10-fix-compilation-with-cpp-headers.patch - patch -p1 -i ${srcdir}/15-fix-headers-of-main-functions.patch - patch -p1 -i ${srcdir}/20-create-manpages.patch - patch -p1 -i ${srcdir}/30-fix-utf16.patch - patch -p1 -i ${srcdir}/40-deal-with-mkstemp.patch - patch -p1 -i ${srcdir}/60-add-c-wrapper-functions.patch - patch -p1 -i ${srcdir}/60-fix_make_check.patch - patch -p1 -i ${srcdir}/60-id3lib-missing-nullpointer-check.patch - patch -p1 -i ${srcdir}/60-spelling.patch - patch -p1 -i ${srcdir}/61-fix_vbr_stack_smash.patch - patch -p1 -i ${srcdir}/50-remove-outdated-check.patch + patch -p1 -i ../00-add-libz-to-compilation.patch + patch -p1 -i ../05-create-m4-directory.patch + patch -p1 -i ../10-fix-compilation-with-cpp-headers.patch + patch -p1 -i ../15-fix-headers-of-main-functions.patch + patch -p1 -i ../20-create-manpages.patch + patch -p1 -i ../30-fix-utf16.patch + patch -p1 -i ../40-deal-with-mkstemp.patch + patch -p1 -i ../60-add-c-wrapper-functions.patch + patch -p1 -i ../60-fix_make_check.patch + patch -p1 -i ../60-id3lib-missing-nullpointer-check.patch + patch -p1 -i ../60-spelling.patch + patch -p1 -i ../61-fix_vbr_stack_smash.patch + patch -p1 -i ../50-remove-outdated-check.patch libtoolize -fc aclocal @@ -65,17 +65,20 @@ prepare() { } build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr make } check() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" make check } package() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install + + install -d "${pkgdir}"/usr/share/man/man1 + cp doc/man/* "${pkgdir}"/usr/share/man/man1 } diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD index d9678799e..f1f9a8a47 100644 --- a/extra/imagemagick/PKGBUILD +++ b/extra/imagemagick/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 204522 2014-01-22 01:48:52Z eric $ +# $Id: PKGBUILD 204904 2014-01-30 22:09:43Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgbase=imagemagick pkgname=('imagemagick' 'imagemagick-doc') -pkgver=6.8.8.2 +pkgver=6.8.8.4 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=('dc51b9d77f69bec96f398a557acb531c5af13fbc' +sha1sums=('1a7db104fc9ffd4ba0a50048a5d4eec90864a08e' 'SKIP' 'e143cf9d530fabf3b58023899b5cc544ba93daec') diff --git a/extra/leveldb/PKGBUILD b/extra/leveldb/PKGBUILD index c54f661fa..465006a8a 100644 --- a/extra/leveldb/PKGBUILD +++ b/extra/leveldb/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 196888 2013-10-20 21:56:36Z dreisner $ +# $Id: PKGBUILD 204900 2014-01-30 20:31:43Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Contributor: feydaykyn <feydaykyn@yahoo.fr> pkgname=leveldb -pkgver=1.14.0 -pkgrel=2 +pkgver=1.15.0 +pkgrel=1 pkgdesc="A fast and lightweight key/value database library" arch=('i686' 'x86_64') url="https://code.google.com/p/leveldb/" license=('BSD') depends=('gperftools' 'snappy') source=("https://leveldb.googlecode.com/files/$pkgname-$pkgver.tar.gz") -sha1sums=('641d54df4aaf7ee569ae003cfbdb888ebdee0d7f') +sha1sums=('74b70a1156d91807d8d84bfdd026e0bb5acbbf23') build() { make -C "$pkgname-$pkgver" diff --git a/extra/qt5/PKGBUILD b/extra/qt5/PKGBUILD index 497457f6d..ddec22a80 100644 --- a/extra/qt5/PKGBUILD +++ b/extra/qt5/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 203076 2014-01-03 12:12:14Z andrea $ +# $Id: PKGBUILD 204881 2014-01-30 08:57:40Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=qt5 @@ -22,7 +22,7 @@ pkgname=('qt5-base' 'qt5-x11extras' 'qt5-xmlpatterns') pkgver=5.2.0 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') url='http://qt-project.org/' license=('GPL3' 'LGPL' 'FDL' 'custom') @@ -31,7 +31,7 @@ makedepends=('libxcb' 'xcb-proto' 'xcb-util' 'xcb-util-image' 'xcb-util-wm' 'xcb 'libjpeg-turbo' 'cups' 'libpulse' 'hicolor-icon-theme' 'desktop-file-utils' 'postgresql-libs' 'libmariadbclient' 'sqlite' 'unixodbc' 'libfbclient' 'python2' 'ruby' 'gperf' 'libxslt' 'libxcomposite' 'fontconfig' - 'openal' 'gtk2' 'libxkbcommon' 'python' 'harfbuzz') + 'openal' 'gtk2' 'libxkbcommon' 'python') groups=('qt' 'qt5') _pkgfqn="qt-everywhere-opensource-src-${pkgver}" source=("http://download.qt-project.org/official_releases/qt/5.2/${pkgver}/single/${_pkgfqn}.tar.xz" @@ -75,7 +75,6 @@ build() { -sysconfdir /etc/xdg \ -examplesdir /usr/share/doc/qt/examples \ -plugin-sql-{psql,mysql,sqlite,odbc,ibase} \ - -system-harfbuzz \ -system-sqlite \ -openssl-linked \ -nomake examples \ @@ -100,7 +99,7 @@ package_qt5-base() { pkgdesc='A cross-platform application and UI framework' depends=('libjpeg-turbo' 'xcb-util-keysyms' 'libgl' 'dbus' 'fontconfig' 'systemd' 'xcb-util-wm' 'libxrender' 'libxi' 'sqlite' 'xcb-util-image' 'icu' - 'qtchooser' 'libxkbcommon' 'harfbuzz') + 'qtchooser' 'libxkbcommon') optdepends=('postgresql-libs: PostgreSQL driver' 'libmariadbclient: MariaDB driver' 'unixodbc: ODBC driver' diff --git a/libre/bfgminer-libre/PKGBUILD b/libre/bfgminer-libre/PKGBUILD deleted file mode 100644 index eb98f4aa9..000000000 --- a/libre/bfgminer-libre/PKGBUILD +++ /dev/null @@ -1,48 +0,0 @@ -# $Id: PKGBUILD 103233 2013-12-30 17:04:09Z tredaelli $ -# Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> -# Contributor: Andy Weidenbaum <archbaum@gmail.com> - -_pkgname=bfgminer -pkgname=bfgminer-libre -pkgver=3.9.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' 'libevent' 'libmicrohttpd' 'libusbx' 'lm_sensors') -makedepends=('uthash' 'yasm') -replaces=$_pkgname -conflicts=$_pkgname -provides=$_pkgname=$pkgver -url='https://bitcointalk.org/index.php?topic=168174.0' -license=('GPL3') -source=(http://luke.dashjr.org/programs/bitcoin/files/$_pkgname/$pkgver/$_pkgname-$pkgver.tbz2 - remove-dangerous-rpath.patch) -sha256sums=('4250ec5ccb0fd9bd8c6d35608b13b3e2f07857e46abc09b94514a2fd2af80f40' - 'd26d07ca23ae25798c4db37cfda1a6a76f22d06e73efab1ddf62b3e1a7eef04c') - -prepare() { - cd "$srcdir"/$_pkgname-$pkgver - - patch -p0 < "${srcdir}"/remove-dangerous-rpath.patch - NOSUBMODULES=1 ./autogen.sh -} - -build() { - cd "$srcdir"/$_pkgname-$pkgver - - ./configure --prefix=/usr \ - --enable-cpumining \ - --enable-bfsb \ - --enable-metabank \ - --enable-scrypt \ - --enable-opencl \ - --with-udevrulesdir=/usr/lib/udev/rules.d - # --enable-knc (FS#33640) - make -} - -package() { - cd "$srcdir"/$_pkgname-$pkgver - - make DESTDIR="$pkgdir" install -} diff --git a/libre/gstreamer0.10-bad-libre/PKGBUILD b/libre/gstreamer0.10-bad-libre/PKGBUILD deleted file mode 100644 index 2958425b2..000000000 --- a/libre/gstreamer0.10-bad-libre/PKGBUILD +++ /dev/null @@ -1,71 +0,0 @@ -# $Id: PKGBUILD 202895 2013-12-28 22:46:10Z bpiotrowski $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar> -# Maintainer (Parabola): André Silva <emulatorman@parabola.nu> - -pkgbase=gstreamer0.10-bad-libre -pkgname=('gstreamer0.10-bad-libre' 'gstreamer0.10-bad-libre-plugins') -pkgver=0.10.23 -pkgrel=7 -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' 'git' 'spandsp' 'celt') -url="http://gstreamer.freedesktop.org/" -options=(!emptydirs) -source=("git://anongit.freedesktop.org/gstreamer-sdk/gst-plugins-bad#commit=57569a4854a0f2d14ef19a8264a4ae9a7a1d1125" - disable-assrender-test.patch - disable-camerabin-test.patch) -sha256sums=('SKIP' - 'e66642affa6c0e69837d37615010e67e59ef3d672663303d46c1e2591e2ddfc6' - '01e780ddf1f8161a6115dded9dc5bf4bdd4d09a9eee00fa423b1330e90e76c68') - -prepare() { - cd gst-plugins-bad - sed -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' -i configure.ac - patch -Np1 -i ../disable-assrender-test.patch - patch -Np1 -i ../disable-camerabin-test.patch -} - -build() { - cd gst-plugins-bad - NOCONFIGURE=1 ./autogen.sh - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-static --enable-experimental --disable-gtk-doc \ - --with-package-name="GStreamer Bad Plugins (Parabola GNU/Linux-libre)" \ - --with-package-origin="https://parabolagnulinux.org/" - - make - sed -e 's/gst sys ext/gst/' -i Makefile -} - -check() { - cd gst-plugins-bad - make check -} - -package_gstreamer0.10-bad-libre() { - pkgdesc="GStreamer Multimedia Framework Bad Plugin libraries (gst-plugins-bad), without nonfree faac support" - depends=('gstreamer0.10-base>=0.10.34') - provides=("gstreamer0.10-bad=$pkgver") - conflicts=('gstreamer0.10-bad') - replaces=('gstreamer0.10-bad') - - cd gst-plugins-bad - make DESTDIR="${pkgdir}" install -} - -package_gstreamer0.10-bad-libre-plugins() { - pkgdesc="GStreamer Multimedia Framework Bad Plugins (gst-plugins-bad), without nonfree faac support" - depends=("gstreamer0.10-bad-libre=${pkgver}" 'xvidcore' 'libdca' 'bzip2' 'libdc1394' 'neon' 'musicbrainz' 'faad2' 'libmms' 'libcdaudio' 'libmpcdec' 'mjpegtools' 'libdvdnav' 'libmodplug' 'jasper' 'liblrdf' 'libofa' 'libvdpau' 'soundtouch' 'libass' 'schroedinger' 'libvpx' 'gsm' 'rtmpdump' 'libgme' 'libsndfile' 'librsvg' 'wildmidi' 'opus' 'celt' 'spandsp') - groups=('gstreamer0.10-plugins') - install=gstreamer0.10-bad-plugins.install - provides=("gstreamer0.10-bad-plugins=$pkgver") - conflicts=('gstreamer0.10-bad-plugins') - replaces=('gstreamer0.10-bad-plugins') - - cd gst-plugins-bad - make -C gst-libs DESTDIR="${pkgdir}" install - make -C ext DESTDIR="${pkgdir}" install - make -C sys DESTDIR="${pkgdir}" install - make -C gst-libs DESTDIR="${pkgdir}" uninstall -} diff --git a/~drtan/parabola-artwork/PKGBUILD b/~drtan/parabola-artwork/PKGBUILD deleted file mode 100644 index bbb6337aa..000000000 --- a/~drtan/parabola-artwork/PKGBUILD +++ /dev/null @@ -1,18 +0,0 @@ -# Maintainer: Drtan Samos <lashdu@drtan.twilightparadox.com> - -pkgname=parabola-artwork -pkgver=1.0 -pkgrel=2 -pkgdesc="The artwork for Parabola GNU/Linux-libre." -arch=('any') -url="https://parabolagnulinux.org" -license=('CCPL:cc-by-sa-3.0') -source=("http://repo.parabolagnulinux.org/other/${pkgname}/${pkgname}-${pkgver}-${pkgrel}.tar.gz") -sha256sums=('9a20cd3e725adc89dc9165452919316c69331d10e2f6a278a810075c9f006e31') - -package() { - cd "${srcdir}/${pkgname}-${pkgver}-${pkgrel}" - install -d "${pkgdir}/usr/share/parabola/artwork" - install -m644 *.bmp "${pkgdir}/usr/share/parabola/artwork/" - install -m644 *.png "${pkgdir}/usr/share/parabola/artwork/" -} diff --git a/~drtan/parabola-gnome/parabola-gnome.install b/~drtan/parabola-gnome/parabola-gnome.install deleted file mode 100644 index 8d87c609a..000000000 --- a/~drtan/parabola-gnome/parabola-gnome.install +++ /dev/null @@ -1,29 +0,0 @@ -post_install() { - # Change default wallpaper - dbus-launch gsettings set org.gnome.desktop.background picture-uri file:///usr/share/parabola/artwork/stripes.png - dbus-launch gsettings set org.gnome.desktop.background picture-options zoom - - # Change default lock screen wallpaper. - dbus-launch gsettings set org.gnome.desktop.screensaver picture-uri file:///usr/share/parabola/artwork/stripes-desaturated.png - dbus-launch gsettings set org.gnome.desktop.screensaver picture-options zoom -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - # Reset default wallpaper to default for GNOME (if the user didn't choose some other). - if [ $(dbus-launch gsettings get org.gnome.desktop.background picture-uri) == "file:///usr/share/parabola/artwork/stripes.png" ] - then - dbus-launch gsettings reset org.gnome.desktop.background picture-uri - dbus-launch gsettings reset org.gnome.desktop.background picture-options - fi - - # Reset default lock screen wallpaper to default for GNOME (if the user didn't choose some other). - if [ $(dbus-launch gsettings get org.gnome.desktop.screensaver picture-uri) == "file:///usr/share/parabola/artwork/stripes.png" ] - then - dbus-launch gsettings reset org.gnome.desktop.screensaver picture-uri - dbus-launch gsettings reset org.gnome.desktop.screensaver picture-options - fi -} |