diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-03-12 03:40:54 +0000 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-03-12 03:40:54 +0000 |
| commit | 5d4b5782f03734e12c907cbc7e4b8c35926e9554 (patch) | |
| tree | d6b52861ee269d63f88807a3e6cefc926a173247 | |
| parent | 345769552026b46d72b7318f1efa6d615ce03ee3 (diff) | |
Wed Mar 12 03:36:36 UTC 2014
54 files changed, 760 insertions, 440 deletions
diff --git a/community/aide/PKGBUILD b/community/aide/PKGBUILD index 684526ddc..96c3a6799 100644 --- a/community/aide/PKGBUILD +++ b/community/aide/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 60050 2011-12-03 20:33:18Z stativ $ +# $Id: PKGBUILD 106982 2014-03-11 10:00:32Z stativ $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> # Contributor: Thomas S Hatch <thatch45@gmail.copm> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> @@ -6,16 +6,18 @@ pkgname=aide pkgver=0.15.1 -pkgrel=3 +pkgrel=4 pkgdesc='A file integrity checker and intrusion detection program.' arch=('i686' 'x86_64') -url="http://www.cs.tut.fi/~rammer/aide.html" +url="http://aide.sourceforge.net/" license=('GPL') -makedepends=('mhash' 'elfutils') +depends=('mhash' 'elfutils') backup=('etc/aide.conf') source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz \ + http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz.asc \ aide.conf) md5sums=('d0b72535ff68b93a648e4d08b0ed7f07' + 'SKIP' 'd3ac69ad7c12c1686f8accf2717139f6') build() { @@ -28,7 +30,8 @@ build() { --with-prelink \ --with-xattr \ --with-zlib \ - --with-e2fsattrs + --with-e2fsattrs \ + --disable-static make } diff --git a/community/argyllcms/PKGBUILD b/community/argyllcms/PKGBUILD index c7cae856a..f5ca8c773 100644 --- a/community/argyllcms/PKGBUILD +++ b/community/argyllcms/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 106923 2014-03-10 14:57:49Z tredaelli $ +# $Id: PKGBUILD 107019 2014-03-11 11:34:21Z tredaelli $ # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> # Contributor: Frank Ickstadt (frank dot ickstadt at gmail dot com) @@ -6,7 +6,7 @@ pkgname=argyllcms _pkgname=Argyll pkgver=1.6.3 _pkgver="V${pkgver}" -pkgrel=2 +pkgrel=3 pkgdesc="An ICC compatible color management system with support for different colorimeter hardware" arch=(i686 x86_64) depends=('libxss' 'libxinerama' 'libxxf86vm' 'libxrandr') @@ -18,6 +18,10 @@ license=("GPL" "AGPL") install=${pkgname}.install sha256sums=('188beaa03dd2459403415023f8f8f9aab362bf3062a9822b3622dde6902e4b84') +prepare() { + sed -i 's:^TEST=="/lib/udev/usb-db", IMPORT{program}="usb-db %p":IMPORT{builtin}="hwdb --subsystem=usb":' ${_pkgname}_${_pkgver}/usb/55-Argyll.rules +} + build() { cd ${_pkgname}_${_pkgver} echo "***running makeall.sh***" @@ -43,15 +47,6 @@ package() { install -m644 ${_pkgname}_${_pkgver}/doc/*.* "${pkgdir}"/usr/share/${pkgname}/doc mkdir -p "${pkgdir}"/usr/lib/udev/rules.d install -m644 ${_pkgname}_${_pkgver}/usb/55-Argyll.rules "${pkgdir}"/usr/lib/udev/rules.d/55-Argyll.rules - sed -i 's|^IMPORT{program}="usb|#IMPORT{program}="usb|' "${pkgdir}"/usr/lib/udev/rules.d/55-Argyll.rules - cat <<EOF >>"${pkgdir}"/usr/lib/udev/rules.d/55-Argyll.rules - -# As mentioned in https://bugzilla.redhat.com/show_bug.cgi?id=859244 and https://bbs.archlinux.org/viewtopic.php?id=155589 -# I've commented out the line: -# IMPORT{program}="usb-db %p" -# to prevent the error messages: -# systemd-udevd[242]: failed to execute '/usr/lib/udev/usb-db'... -EOF } # vim:set ts=2 sw=2 et: diff --git a/community/awesome/PKGBUILD b/community/awesome/PKGBUILD index e7fca4c90..0f7907838 100644 --- a/community/awesome/PKGBUILD +++ b/community/awesome/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 106931 2014-03-10 17:47:47Z bpiotrowski $ +# $Id: PKGBUILD 106980 2014-03-11 09:59:18Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org> # Contributor: Sébastien Luttringer # Contributor: xduugu diff --git a/community/awesome/awesome-3.5.2-naughty-fix-ldoc.patch b/community/awesome/awesome-3.5.2-naughty-fix-ldoc.patch new file mode 100644 index 000000000..ba9a2e7d3 --- /dev/null +++ b/community/awesome/awesome-3.5.2-naughty-fix-ldoc.patch @@ -0,0 +1,27 @@ +From 019f55a1daabb4b15632f3b49aceaa03a2b93c89 Mon Sep 17 00:00:00 2001 +From: Uli Schlachter <psychon@znc.in> +Date: Sat, 22 Feb 2014 16:35:17 +0100 +Subject: [PATCH] naughty: fix ldoc + +lib/naughty.lua:65: ?: 'class' cannot have multiple values; {table,table} + +Signed-off-by: Uli Schlachter <psychon@znc.in> +--- + lib/naughty.lua.in | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/lib/naughty.lua.in b/lib/naughty.lua.in +index 6e77b5f..16dc384 100644 +--- a/lib/naughty.lua.in ++++ b/lib/naughty.lua.in +@@ -61,7 +61,6 @@ naughty.config.notify_callback = nil + -- @field low The preset for notifications with low urgency level + -- @field normal The default preset for every notification without a preset that will also be used for normal urgency level + -- @field critical The preset for notifications with a critical urgency level +--- @class table + naughty.config.presets = { + normal = {}, + low = { +-- +1.9.0 + diff --git a/community/cdcd/PKGBUILD b/community/cdcd/PKGBUILD index 784863a2c..019b71b24 100644 --- a/community/cdcd/PKGBUILD +++ b/community/cdcd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 86149 2013-03-12 09:55:52Z cinelli $ +# $Id: PKGBUILD 107051 2014-03-11 20:45:02Z jelle $ # Maintainer: Federico Cinelli <cinelli@aur.archlinux.org> # Contributor dorphell <dorphell@archlinux.org> # Contributor Sarah Hay <sarahhay@mb.sympatico.ca> pkgname=cdcd pkgver=0.6.6 -pkgrel=6 +pkgrel=7 pkgdesc="A commandline cd-player" arch=('i686' 'x86_64') depends=('libcdaudio' 'readline') @@ -27,6 +27,9 @@ build() { patch -Np1 -i "$srcdir/cdcd-0.6.6-$CARCH.patch" fi + + sed -i 's/(CPPFunction \*)/(rl_completion_func_t \*)/' cmd_cdcd.c + ./configure --prefix=/usr make } diff --git a/community/cinnamon/PKGBUILD b/community/cinnamon/PKGBUILD index edfc21200..4dcb7dff1 100644 --- a/community/cinnamon/PKGBUILD +++ b/community/cinnamon/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 103395 2014-01-05 16:56:22Z bgyorgy $ +# $Id: PKGBUILD 107038 2014-03-11 15:48:30Z andyrtr $ # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com> # Contributor: M0Rf30 # Contributor: unifiedlinux @@ -6,7 +6,7 @@ pkgname=cinnamon pkgver=2.0.14 -pkgrel=2 +pkgrel=3 pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience" arch=('i686' 'x86_64') url="http://cinnamon.linuxmint.com/" diff --git a/community/classpath/PKGBUILD b/community/classpath/PKGBUILD index e5efdd5b7..9fc6f98ab 100644 --- a/community/classpath/PKGBUILD +++ b/community/classpath/PKGBUILD @@ -1,20 +1,21 @@ -# $Id: PKGBUILD 100102 2013-11-01 17:14:29Z spupykin $ +# $Id: PKGBUILD 107053 2014-03-11 21:10:27Z jelle $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: tardo <tardo@nagi-fanboi.net> # Contributor: Sean Gillespie <Sean.D.Gillespie@gmail.com> pkgname=classpath pkgver=0.98 -pkgrel=6 +pkgrel=7 pkgdesc="A free replacement for Sun's proprietary core Java class libraries." arch=('i686' 'x86_64') url="http://www.gnu.org/software/classpath/" license=('GPL') -depends=('gtk2>=2.8' 'libxtst' 'libsm') +depends=('gtk2>=2.8' 'libxtst' 'libsm' 'freetype2') makedepends=('gtk2>=2.8' 'libxtst' 'gconf' 'java-environment') optdepends=('file' 'gconf') -source=(ftp://ftp.gnu.org/gnu/classpath/$pkgname-$pkgver.tar.gz) -md5sums=('90c6571b8b0309e372faa0f9f6255ea9') +source=(ftp://ftp.gnu.org/gnu/classpath/$pkgname-$pkgver.tar.gz freetype2_include.patch) +md5sums=('90c6571b8b0309e372faa0f9f6255ea9' + '55dafc301c5f2e497696d01e9c1dab9c') build() { cd $srcdir/$pkgname-$pkgver @@ -28,6 +29,9 @@ build() { > DIST_SUBDIRS = lib doc external include native resource scripts EOF + # fix freetype2 include path + patch -Np1 -i $srcdir/freetype2_include.patch + ./configure --prefix=/usr --disable-Werror --disable-plugin make EXAMPLESDIR= } diff --git a/community/classpath/freetype2_include.patch b/community/classpath/freetype2_include.patch new file mode 100644 index 000000000..f5379e07e --- /dev/null +++ b/community/classpath/freetype2_include.patch @@ -0,0 +1,34 @@ +diff -aur classpath-0.98/native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c classpath-0.98.new/native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c +--- classpath-0.98/native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c 2008-12-18 01:43:41.000000000 +0100 ++++ classpath-0.98.new/native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c 2014-03-11 22:03:55.888827143 +0100 +@@ -42,8 +42,9 @@ + #include <pango/pango.h> + #include <pango/pangoft2.h> + #include <pango/pangofc-font.h> +-#include <freetype/ftglyph.h> +-#include <freetype/ftoutln.h> ++#include <ft2build.h> ++#include FT_GLYPH_H ++#include FT_OUTLINE_H + #include "jcl.h" + #include "gdkfont.h" + #include "gnu_java_awt_peer_gtk_FreetypeGlyphVector.h" +diff -aur classpath-0.98/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c classpath-0.98.new/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c +--- classpath-0.98/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c 2007-04-25 16:53:04.000000000 +0200 ++++ classpath-0.98.new/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c 2014-03-11 22:03:18.788834707 +0100 +@@ -39,10 +39,11 @@ + #include <pango/pango.h> + #include <pango/pangoft2.h> + #include <pango/pangofc-font.h> +-#include <freetype/ftglyph.h> +-#include <freetype/ftoutln.h> +-#include <freetype/fttypes.h> +-#include <freetype/tttables.h> ++#include <ft2build.h> ++#include FT_GLYPH_H ++#include FT_OUTLINE_H ++#include FT_TYPES_H ++#include FT_TRUETYPE_TABLES_H + #include "gdkfont.h" + #include "gtkpeer.h" + #include "gnu_java_awt_peer_gtk_GdkFontPeer.h" diff --git a/community/cpulimit/PKGBUILD b/community/cpulimit/PKGBUILD index a8973bb03..fb616e541 100644 --- a/community/cpulimit/PKGBUILD +++ b/community/cpulimit/PKGBUILD @@ -1,21 +1,26 @@ -# $Id: PKGBUILD 76442 2012-09-18 16:13:31Z spupykin $ +# $Id: PKGBUILD 107015 2014-03-11 11:33:17Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=cpulimit -pkgver=20120918 +pkgver=20140311 pkgrel=1 pkgdesc="Limit cpu usage in %. Actualy sends SIGSTOP/SIGCONT" arch=('i686' 'x86_64') -url="http://cpulimit.sourceforge.net/" +url="https://github.com/opsengine/cpulimit" license=("GPL") depends=() -source=("$pkgname-$pkgver.tar.gz::https://github.com/opsengine/cpulimit/tarball/master") -md5sums=('a80b8ec21b668d1c15a29ab1f795d1ba') +makedepends=('git') +source=("$pkgname-$pkgver::git://github.com/opsengine/cpulimit.git") +md5sums=('SKIP') build() { - cd $srcdir/opsengine-cpulimit-* + cd $srcdir/$pkgname-$pkgver make +} + +package() { + cd $srcdir/$pkgname-$pkgver install -Dm0755 src/cpulimit $pkgdir/usr/bin/cpulimit install -Dm0644 README $pkgdir/usr/share/doc/$pkgname/README } diff --git a/community/cutter/PKGBUILD b/community/cutter/PKGBUILD index 80c13857f..b6d100938 100644 --- a/community/cutter/PKGBUILD +++ b/community/cutter/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 71088 2012-05-23 18:06:28Z spupykin $ +# $Id: PKGBUILD 107022 2014-03-11 11:37:13Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> @@ -7,15 +7,18 @@ pkgver=1.03 pkgrel=5 pkgdesc="TCP/IP Connection cutting on Linux Firewalls and Routers" arch=('i686' 'x86_64') -url="http://www.lowth.com/cutter/" +url="http://www.digitage.co.uk/digitage/software/linux-security/cutter" license=('GPL') -depends=(glibc) -source=(http://www.lowth.com/cutter/software/cutter-$pkgver.tgz) +depends=() +source=("http://www.digitage.co.uk/digitage/files/cutter/cutter-$pkgver.tgz") md5sums=('50093db9b64277643969ee75b83ebbd1') build() { cd $srcdir/$pkgname-$pkgver - sed -i 's|/proc/net/ip_conntrack|/proc/net/nf_conntrack|g' cutter.c make - install -D -m 0755 ./cutter $pkgdir/usr/bin/tcp-cutter +} + +package() { + cd $srcdir/$pkgname-$pkgver + install -D -m 0755 cutter $pkgdir/usr/bin/tcp-cutter } diff --git a/community/dzen2/PKGBUILD b/community/dzen2/PKGBUILD index c3e8b3a85..221aafc91 100644 --- a/community/dzen2/PKGBUILD +++ b/community/dzen2/PKGBUILD @@ -1,22 +1,21 @@ -# $Id: PKGBUILD 74814 2012-08-06 08:20:11Z spupykin $ +# $Id: PKGBUILD 107017 2014-03-11 11:33:34Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Mark Taylor <skymt0@gmail.com> pkgname=dzen2 pkgver=0.9.5git -pkgrel=1 +pkgrel=2 arch=(i686 x86_64) pkgdesc="X notification utility" url="https://github.com/robm/dzen" license=("MIT") depends=('libx11' 'libxpm' 'libxinerama' 'libxft') -makedepends=('gcc') -source=($pkgname-$pkgver.zip::https://github.com/robm/dzen/zipball/master) -md5sums=('bcaa565ebd8c3c7f3d06f8f20de6340a') +makedepends=('gcc' 'git') +source=("$pkgname-$pkgver::git://github.com/robm/dzen") +md5sums=('SKIP') -build() -{ - cd $srcdir/robm-dzen-* +build() { + cd $srcdir/$pkgname-$pkgver CFLAGS=" -Wall -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XINERAMA -DDZEN_XPM -DDZEN_XFT `pkg-config --cflags xft`" LIBS=" -L/usr/lib -lc -lXft -lXpm -lXinerama -lX11" @@ -30,7 +29,7 @@ build() } package() { - cd $srcdir/robm-dzen-* + cd $srcdir/$pkgname-$pkgver make PREFIX=/usr MANPREFIX=/usr/man DESTDIR=$pkgdir install (cd gadgets && make PREFIX=/usr MANPREFIX=/usr/man DESTDIR=$pkgdir install) install -m644 -D LICENSE $pkgdir/usr/share/licenses/dzen2/COPYING diff --git a/community/hevea/PKGBUILD b/community/hevea/PKGBUILD index 6a2b3397c..a373a780e 100644 --- a/community/hevea/PKGBUILD +++ b/community/hevea/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 83233 2013-01-28 14:16:05Z spupykin $ +# $Id: PKGBUILD 106984 2014-03-11 10:05:09Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Brian Nguyen <bhnguyen@gmail.com> # Original Packager: Tom K <tomk@runbox.com> pkgname=hevea -pkgver=2.02 +pkgver=2.12 pkgrel=1 pkgdesc="A quite complete and fast LATEX to HTML translator" arch=(i686 x86_64) @@ -13,7 +13,7 @@ license=('GPL') url="http://pauillac.inria.fr/~maranget/hevea/" install=hevea.install source=(http://pauillac.inria.fr/~maranget/$pkgname/distri/$pkgname-$pkgver.tar.gz) -md5sums=('b0331fdf123c21ce02f15c890d268306') +md5sums=('8330f7c1c1615242b13a894737ca5992') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/hwinfo/PKGBUILD b/community/hwinfo/PKGBUILD index 0b790dbae..79088553f 100644 --- a/community/hwinfo/PKGBUILD +++ b/community/hwinfo/PKGBUILD @@ -1,43 +1,44 @@ -# $Id: PKGBUILD 103280 2014-01-02 12:43:36Z arodseth $ +# $Id: PKGBUILD 107044 2014-03-11 18:19:44Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Kaiting Chen <kaitocracy@gmail.com> # Contributor: Gergely Imreh <imrehgATgmailDOTcom> -# Contributor: champus -# Contributor: madeye -# Contributor: Ranguvar -# Contributor: ninja_pt +# Contributor: champus, madeye, ranguvar and ninja_pt pkgname=hwinfo -pkgver=21.0 -_subver=1.2 +pkgver=21.0.1.3 pkgrel=1 pkgdesc='Hardware detection tool from openSUSE' arch=('x86_64' 'i686') url='http://download.opensuse.org/source/factory/repo/oss/suse/src/' license=('GPL2') -depends=('perl' 'libx86emu') -makedepends=('sysfsutils' 'rpmextract' 'flex') +depends=('libx86emu' 'bash') +makedepends=('sysfsutils' 'rpmextract' 'flex' 'aria2') options=('!emptydirs') -source=("http://download.opensuse.org/source/factory/repo/oss/suse/src/$pkgname-$pkgver-$_subver.src.rpm" +source=("hwinfo.meta4::http://download.opensuse.org/source/factory/repo/oss/suse/src/$pkgname-${pkgver%.*.*}-${pkgver#*.*.}.src.rpm" 'custom_ioctl.patch') -sha256sums=('4126875621a935a450cf616b69a1f922047f241cedc3ac02ece54cd78b23a9fb' - '6e83b50aa34f31db5fe6de938402e7c4dda6ffa9ffe1346c076e4779018fcf1d') +sha256sums=('SKIP' '6e83b50aa34f31db5fe6de938402e7c4dda6ffa9ffe1346c076e4779018fcf1d') prepare() { - rpmextract.sh "$pkgname-$pkgver-$_subver.src.rpm" - tar jxf $pkgname-$pkgver.tar.bz2 - cd "$pkgname-$pkgver" + # Downloading the source rpm file, using meta4 + aria2c -M "$pkgname.meta4" -V -c --allow-overwrite=true --no-conf=true + + # Wish they would just provide a normal $pkgname-$pkgvar.tar.gz... + rpmextract.sh "$pkgname-${pkgver%.*.*}-${pkgver#*.*.}.src.rpm" + tar jxf "$pkgname-${pkgver%.*.*}.tar.bz2" + + # Patching + cd "$pkgname-${pkgver%.*.*}" patch -p0 -i ../custom_ioctl.patch } build() { - make -C "$pkgname-$pkgver" -j1 \ - CFLAGS+="-fPIC -I$srcdir/$pkgname-$pkgver/src/hd" \ + make -C "$pkgname-${pkgver%.*.*}" -j1 \ + CFLAGS+="-fPIC -I$srcdir/$pkgname-${pkgver%.*.*}/src/hd" \ LIBDIR=/usr/lib } package() { - make -C "$pkgname-$pkgver" LIBDIR=/usr/lib DESTDIR="$pkgdir" install + make -C "$pkgname-${pkgver%.*.*}" LIBDIR=/usr/lib DESTDIR="$pkgdir" install mv "$pkgdir/usr/sbin" "$pkgdir/usr/bin" } diff --git a/community/idesk/PKGBUILD b/community/idesk/PKGBUILD index 027925bcc..b1a0e5c1f 100644 --- a/community/idesk/PKGBUILD +++ b/community/idesk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90753 2013-05-13 15:08:30Z spupykin $ +# $Id: PKGBUILD 107002 2014-03-11 11:04:01Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Claudio Sabattoli <gasherbrum3@alice.it> @@ -13,16 +13,20 @@ depends=('pkgconfig' 'imlib2' 'libpng' 'libxpm' 'libxft' 'gcc-libs') source=("http://downloads.sourceforge.net/sourceforge/idesk/$pkgname-$pkgver.tar.bz2") md5sums=('beb48c97815c7b085e3b3d601297fbb8') -build() { +prepare() { cd $srcdir/$pkgname-$pkgver - sed -i \ -e '1,1i#include <unistd.h>' \ -e '1,1i#include <sys/stat.h>' \ -e '1,1i#include <sys/types.h>' \ src/DesktopConfig.cpp sed -i 's#usr/local#usr#' examples/default.lnk + sed -i 's#IMLIB2_LIBS=.*#IMLIB2_LIBS=-lImlib2#g' configure + sed -i 's#IMLIB_LIBS=.*#IMLIB_LIBS="-L/usr/lib -lImlib -Wl,-O1,--sort-common,--as-needed,-z,relro -ljpeg -ltiff -lgif -lpng -lz -lm -lXext -lXext -lX11 -lImlib2"#g' configure +} +build() { + cd $srcdir/$pkgname-$pkgver ./configure --prefix=/usr make } diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD index 4c3579023..86eaae97c 100644 --- a/community/libvirt/PKGBUILD +++ b/community/libvirt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 105708 2014-02-14 09:37:10Z spupykin $ +# $Id: PKGBUILD 106990 2014-03-11 10:19:09Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jonathan Wiersma <archaur at jonw dot org> pkgname=libvirt -pkgver=1.2.1 -pkgrel=4 +pkgver=1.2.2 +pkgrel=1 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)" arch=('i686' 'x86_64') url="http://libvirt.org/" @@ -60,17 +60,15 @@ install="libvirt.install" source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz" libvirtd.conf.d libvirtd-guests.conf.d - libvirt.tmpfiles.d - "FS#38546.patch::http://libvirt.org/git/?p=libvirt.git;a=commitdiff_plain;h=7f0fd427413fe04963b1bcb158cf70e980ad1842") -md5sums=('cce374220f67895afb6331bd2ddedbfd' + libvirt.tmpfiles.d) +md5sums=('592958ad1ddce7574d8cb0a31e635acd' '3ed0e24f5b5e25bf553f5427d64915e6' '0a96ed876ffb1fcb9dff5a9b3a609c1e' - '020971887442ebbf1b6949e031c8dd3f' - 'f579805e75956d32992c6934346ee740') + '020971887442ebbf1b6949e031c8dd3f') prepare() { cd "$srcdir/$pkgname-$pkgver" - patch -p1 <"$srcdir/FS#38546.patch" +# patch -p1 <"$srcdir/FS#38546.patch" } build() { @@ -107,7 +105,7 @@ package() { # systemd stuff install -D -m644 "$srcdir"/libvirt.tmpfiles.d "$pkgdir"/usr/lib/tmpfiles.d/libvirt.conf - mv "$pkgdir"/lib/* "$pkgdir"/usr/lib/ +# mv "$pkgdir"/lib/* "$pkgdir"/usr/lib/ rm -rf \ "$pkgdir"/var/run \ diff --git a/community/libx86emu/PKGBUILD b/community/libx86emu/PKGBUILD index 63ac2ba2b..9602b8aee 100644 --- a/community/libx86emu/PKGBUILD +++ b/community/libx86emu/PKGBUILD @@ -1,30 +1,33 @@ -# $Id: PKGBUILD 104103 2014-01-15 17:01:05Z arodseth $ +# $Id: PKGBUILD 107049 2014-03-11 19:41:14Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Kaiting Chen <kaitocracy@gmail.com> # Contributor: Gergely Imreh <imrehgATgmailDOTcom> pkgname=libx86emu -pkgver=1.1 -_pkgver=$pkgver-21.4 -pkgrel=30 +pkgver=1.1.21.5 +pkgrel=1 pkgdesc='x86 emulation library' arch=('x86_64' 'i686') url='http://download.opensuse.org/source/factory/repo/oss/suse/src/' license=('BSD') depends=('glibc') makedepends=('rpmextract') -source=("http://download.opensuse.org/source/factory/repo/oss/suse/src/$pkgname-$_pkgver.src.rpm") -sha256sums=('d94a9b2e00e995856bf71a1db8d97ba2a622d3f447248f53cd4e175d491c6a1b') +source=("http://download.opensuse.org/source/factory/repo/oss/suse/src/$pkgname-${pkgver%.*.*}-${pkgver#*.*.}.src.rpm") +sha256sums=('d639b118788e1fb880f96a12548e434b210a3eb47b850b9162f2e682b824c03f') + +prepare() { + # Wish they would just provide a normal $pkgname-$pkgver.tar.gz... + rpmextract.sh "${pkgname}-${pkgver%.*.*}-${pkgver#*.*.}.src.rpm" + tar jxf "$pkgname-${pkgver%.*.*}.tar.bz2" +} build() { - rpmextract.sh "${pkgname}-${_pkgver}.src.rpm" - tar jxvf "$pkgname-$pkgver.tar.bz2" - make -C "$pkgname-$pkgver" LIBDIR=/usr/lib + make -C "$pkgname-${pkgver%.*.*}" LIBDIR=/usr/lib } package() { - make -C "$pkgname-$pkgver" LIBDIR=/usr/lib DESTDIR="$pkgdir" install - install -Dm644 "$pkgname-$pkgver/LICENSE" \ + make -C "$pkgname-${pkgver%.*.*}" LIBDIR=/usr/lib DESTDIR="$pkgdir" install + install -Dm644 "$pkgname-${pkgver%.*.*}/LICENSE" \ "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } diff --git a/community/lxc/PKGBUILD b/community/lxc/PKGBUILD index 28790bbd0..5ebc9f760 100644 --- a/community/lxc/PKGBUILD +++ b/community/lxc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 106149 2014-02-24 08:56:42Z spupykin $ +# $Id: PKGBUILD 106992 2014-03-11 10:19:42Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Andrea Zucchelli <zukka77@gmail.com> # Contributor: Daniel Micay <danielmicay@gmail.com> @@ -6,9 +6,9 @@ # Contributor: Jon Nordby <jononor@gmail.com> pkgname=lxc -pkgver=1.0.0 +pkgver=1.0.1 epoch=1 -pkgrel=2 +pkgrel=1 pkgdesc="Linux Containers" arch=('i686' 'x86_64') url="http://linuxcontainers.org" @@ -21,7 +21,7 @@ options=('emptydirs') source=("http://linuxcontainers.org/downloads/$pkgname-${pkgver}.tar.gz" "lxc.tmpfiles.d" "lxc@.service") -md5sums=('87a9d168a6e55326303cce3b2cb7f82e' +md5sums=('3c7379891e45713817ec873a167070b0' 'df94c9fb8a753011c86ee664e9f521ff' '32db4ef06b27f36e15ff4b67c049dfeb') diff --git a/community/mate-desktop/PKGBUILD b/community/mate-desktop/PKGBUILD index f5b2c8d1e..7ca18c7a4 100644 --- a/community/mate-desktop/PKGBUILD +++ b/community/mate-desktop/PKGBUILD @@ -2,7 +2,7 @@ pkgname=mate-desktop pkgver=1.8.0 -pkgrel=1 +pkgrel=2 pkgdesc="Library with common API for various MATE modules" url="http://mate-desktop.org" arch=('i686' 'x86_64') @@ -11,6 +11,7 @@ depends=('dconf' 'gtk2' 'hicolor-icon-theme' 'libunique' 'python2' 'startup-notification' 'ttf-dejavu') makedepends=('mate-common' 'perl-xml-parser' 'yelp-tools') optdepends=('lightdm-gtk2-greeter: A lightweight display manager' + 'onboard: On-screen keyboard useful for mobility impaired users' 'orca: Screen reader for blind or visually impaired individuals' 'yelp: for reading MATE help documents') options=('!emptydirs') diff --git a/community/mate-sensors-applet/PKGBUILD b/community/mate-sensors-applet/PKGBUILD index 715061ae9..469c31289 100644 --- a/community/mate-sensors-applet/PKGBUILD +++ b/community/mate-sensors-applet/PKGBUILD @@ -2,13 +2,12 @@ pkgname=mate-sensors-applet pkgver=1.8.0 -pkgrel=1 +pkgrel=2 pkgdesc="A MATE Panel applet to display readings from hardware sensors, including CPU temperature, fan speeds and voltage readings." url="http://mate-desktop.org" arch=('i686' 'x86_64') license=('GPL') -depends=('dbus' 'gtk2' 'libatasmart' 'libnotify' 'libxnvctrl' 'lm_sensors' - 'mate-panel' 'yelp') +depends=('dbus' 'gtk2' 'libatasmart' 'libnotify' 'libxnvctrl' 'lm_sensors' 'mate-panel') makedepends=('docbook-xml' 'mate-common' 'perl-xml-parser' 'rarian' 'yelp-tools') optdepends=('yelp: for reading MATE help documents') options=('!emptydirs') diff --git a/community/mate-settings-daemon/PKGBUILD b/community/mate-settings-daemon/PKGBUILD index 813d42fc1..5e1fcc8fd 100644 --- a/community/mate-settings-daemon/PKGBUILD +++ b/community/mate-settings-daemon/PKGBUILD @@ -4,7 +4,6 @@ pkgbase=mate-settings-daemon pkgname=("${pkgbase}-pulseaudio" "${pkgbase}-gstreamer") pkgver=1.8.0 pkgrel=1 -pkgdesc="The MATE Settings daemon" url="http://mate-desktop.org" arch=('i686' 'x86_64') license=('GPL') diff --git a/community/mldonkey/PKGBUILD b/community/mldonkey/PKGBUILD index 2b64d7515..e6caa2fed 100644 --- a/community/mldonkey/PKGBUILD +++ b/community/mldonkey/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 106068 2014-02-21 22:30:45Z anatolik $ +# $Id: PKGBUILD 107047 2014-03-11 19:32:25Z anatolik $ # Maintainer: Anatol Pomozov <anatol.pomozov@gmail.com> pkgname=mldonkey -pkgver=3.1.3 -pkgrel=3 +pkgver=3.1.4 +pkgrel=1 pkgdesc='A multi-network P2P client' arch=(i686 x86_64) url='http://mldonkey.sourceforge.net/' license=(GPL) -depends=(desktop-file-utils file gd) +depends=(file gd) makedepends=(lablgtk2 librsvg ocaml) optdepends=('librsvg: GUI support' 'gtk2: GUI support') @@ -18,16 +18,18 @@ source=(http://downloads.sourceforge.net/sourceforge/mldonkey/$pkgname-$pkgver.t mldonkey.conf mldonkey.service mldonkey.tmpfiles - gd_version.patch) -sha1sums=('424386f277e84df55a2cbab213fae60787e42c8b' - '7e70e5f3c7bf5036debde4dacbed463c0464a1e7' - 'd6886479cf36fbee0a62def0291706973c91dfa5' - 'a454b919fac518ecb32f6262afbef0dfc423401c' - '18c4a0753d338bf24cac28dcbd43abcf59ce4534') + fix_compile_error.patch) +sha256sums=('1e454be51fec346d650a72049e4dc4471036d129a488443a67436af62ef375fe' + 'f1d9401cefd591662d49011c53fdb2788755a6f745a963e46d8037b990edeb6a' + '778cebe8edcffd63db3594054c2daa62ce571644a96ad235b8c95470b55c0415' + '45f45d2a3c064d5bbc0b6b9b70fa3497ed47cfecdd1ec52e175311f48eaa89dc' + '172d1b129a068caafcb1e48c861b4b78b129b4ba50bb5e692b61cf00dcc66215') prepare() { cd mldonkey-$pkgver - patch -p0 < "$srcdir/gd_version.patch" # a fix from upstream http://cvs.savannah.gnu.org/viewvc/mldonkey/config/configure.in?root=mldonkey&r1=1.357&r2=1.358&view=patch + + # http://mldonkey.sourceforge.net/phpBB2/viewtopic.php?p=32462#32462 + patch -p1 < "$srcdir/fix_compile_error.patch" rm config/configure # remove this file to force its regeneration, we've just changed ./config/configure.in } diff --git a/community/mldonkey/fix_compile_error.patch b/community/mldonkey/fix_compile_error.patch new file mode 100644 index 000000000..fe83aee11 --- /dev/null +++ b/community/mldonkey/fix_compile_error.patch @@ -0,0 +1,254 @@ +commit 64cf1e7eabf3087c111b54d7df490c5763d0546b +Author: ygrek <ygrek@autistici.org> +Date: Tue Mar 11 16:15:09 2014 +0800 + + Revert "gettext: reduce complexity, drop unused code" + + This reverts commit 6a094b4381dacdc9043c8348002179eb87846e16. + "Unused" code is actually used in gui + + Conflicts: + src/utils/lib/gettext.ml4 + +diff --git a/src/daemon/common/commonMessages.ml b/src/daemon/common/commonMessages.ml +index ebae333..0cffed2 100644 +--- a/src/daemon/common/commonMessages.ml ++++ b/src/daemon/common/commonMessages.ml +@@ -1399,9 +1399,11 @@ let bad_login = _s "Bad login/password" + + let full_access = _s "Full access enabled" + +-let download_started n = _s (Printf.sprintf "Download of file %d started<br>" n) ++let download_started = message "download_started" ++ (T.boption (T.int T.bformat)) "Download of file %d started<br>" + +-let no_such_command s = _s (Printf.sprintf "No such command %s\n" s) ++let no_such_command = message "no_such_command" ++ (T.boption (T.string T.bformat)) "No such command %s\n" + + let bad_number_of_args cmd help = _s (Printf.sprintf "Bad number of arguments, see help for correct use:\n%s %s" cmd help) + +diff --git a/src/daemon/driver/driverCommands.ml b/src/daemon/driver/driverCommands.ml +index 6085073..c24be04 100644 +--- a/src/daemon/driver/driverCommands.ml ++++ b/src/daemon/driver/driverCommands.ml +@@ -87,7 +87,7 @@ let execute_command arg_list output cmd args = + let rec iter list = + match list with + [] -> +- Buffer.add_string buf (no_such_command cmd) ++ Gettext.buftext buf no_such_command cmd + | (command, _, arg_kind, help) :: tail -> + if command = cmd then begin + if !verbose_user_commands && not (user2_is_admin output.conn_user.ui_user) then +diff --git a/src/daemon/driver/driverControlers.ml b/src/daemon/driver/driverControlers.ml +index e07ba77..69a1751 100644 +--- a/src/daemon/driver/driverControlers.ml ++++ b/src/daemon/driver/driverControlers.ml +@@ -1296,7 +1296,7 @@ let http_handler o t r = + List.iter CommonInteractive.start_download files; + + let module M = CommonMessages in +- Buffer.add_string buf (M.download_started num) ++ Gettext.buftext buf M.download_started num + with e -> + Printf.bprintf buf "Error %s with %s<br>" + (Printexc2.to_string e) value; +diff --git a/src/utils/lib/gettext.ml4 b/src/utils/lib/gettext.ml4 +index 91a9fbb..fcfe50d 100644 +--- a/src/utils/lib/gettext.ml4 ++++ b/src/utils/lib/gettext.ml4 +@@ -29,15 +29,15 @@ let lprintf_n fmt = + lprintf2 log_prefix fmt + + type expected_types = +-| Type_int ++ Type_int + | Type_char + | Type_string +-| Type_float ++| Type_float + | Type_bool + | Type_int32 + | Type_int64 + | Type_nativeint +- ++ + let ty_arrow x y = x :: y + + (* Taken from ocaml-3.04, typing/typecore.ml *) +@@ -135,6 +135,81 @@ let type_format fmt = + bad_format i j + in + scan_format 0 ++ ++type 'a variable ++type 'a arrow ++ ++ ++let arrow_add_variable ++ (x : 'a variable) ++ (y : 'b arrow) = ++ let x = Obj.magic x in ++ let y = Obj.magic y in ++ (Obj.magic (x :: y) : ('a -> 'b) arrow) ++ ++ ++ ++open Options ++ ++let value_to_text (expected_type : 'a arrow) v = ++ let s = value_to_string v in ++ let expected_type = Obj.magic expected_type in ++ let format_type = type_format s in ++ if format_type = expected_type then ++ (Obj.magic s : ('a, unit, string) format) else ++ failwith "Bad format" ++ ++let text_to_value v = ++ let v = Obj.magic v in ++ string_to_value v ++ ++let text_option (expected_type : 'a arrow) ++ = ++ define_option_class "Text" ++ (value_to_text expected_type) ++ text_to_value ++ ++let gettext v = Printf.sprintf !!v ++ ++let buftext buf (v : ('a, Buffer.t, unit) format Options.option_record) = ++ Printf.bprintf buf !!v ++ ++module T = struct ++ let int x = arrow_add_variable (Obj.magic Type_int : int variable) x ++ let char x = arrow_add_variable (Obj.magic Type_char : char variable) x ++ let string x = arrow_add_variable (Obj.magic Type_string : string variable) x ++ let float x = arrow_add_variable (Obj.magic Type_float : float variable) x ++ let bool x = arrow_add_variable (Obj.magic Type_bool : bool variable) x ++ let int32 x = arrow_add_variable (Obj.magic Type_int32 : int32 variable) x ++ let int64 x = arrow_add_variable (Obj.magic Type_int64 : int64 variable) x ++ let nativeint x = arrow_add_variable (Obj.magic Type_nativeint : nativeint variable) x ++ let format = (Obj.magic [] : string arrow) ++ let bformat = (Obj.magic [] : unit arrow) ++ let option = text_option ++ let boption x = (Obj.magic text_option) x ++ end ++ ++ ++(********* Some tests ************) ++ ++(* ++let option_file = create_options_file "test.ini" ++ ++let nshared = define_option option_file ++ ["nshared"] "Text for Nshared option" ++ (text_option ++ (T.int (T.int32 T.format))) ++ "Shared: %d/%ld" ++ ++let _ = ++ try ++ load option_file ++ with Sys_error _ -> ++ save_with_help option_file ++ ++let _ = ++ lprint_string (Printf.sprintf !! nshared 23 (Int32.one)); ++ *) + + type 'a _string = { + name : string; +@@ -208,6 +283,14 @@ let translate modname s t = + save_strings_file := true; + !translation.(m.index) <- t + end ++(* ++ let x = ++ let y = (Obj.magic x : string) in ++ Obj.magic (register y : string message) ++ ++ let s_ x = register x ++*) ++ + + let verify index translated = + let index_type = type_format !default.(index) in +@@ -222,8 +305,8 @@ let verify index translated = + false + end + +-let ss_ : string -> string -> string _string = register +-let _ss : string _string -> string = fun m -> ++let ss_ modname (x : string) = register modname x ++let _ss m = + let index = m.index in + !requests.(index) <- !requests.(index) + 1; + let translation = !translation.(index) in +@@ -251,7 +334,8 @@ let _bb : ('a, 'b, 'c, 'd) format4 _string -> ('a, 'b, 'c, 'd) format4 = fun m - + Obj.magic s + + let _b modname x = _bb (bb_ modname x) +- ++ ++ + let save_strings () = + match !strings_file with + None -> () +diff --git a/src/utils/lib/gettext.mli b/src/utils/lib/gettext.mli +index 6ac31be..2370881 100644 +--- a/src/utils/lib/gettext.mli ++++ b/src/utils/lib/gettext.mli +@@ -17,7 +17,52 @@ + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + *) + ++open Autoconf ++ ++type 'a variable ++type 'a arrow ++ ++val text_option : 'a arrow -> ++ ('a, unit, string) format Options.option_class ++ ++(* ++let nshared = ++ (arrow_variable int_variable int32_variable) ++ "Shared: %d/%ld" ++ *) ++ ++val save_strings : unit -> unit + val set_strings_file : string -> unit + + val _b : string -> ('a, 'b, 'c, 'd) format4 -> ('a, 'b, 'c, 'd) format4 + val _s : string -> string -> string ++ ++type 'a _string ++ ++val bb_ : string -> ('a, 'b, 'c) format -> ('a, 'b, 'c) format _string ++val _bb : ('a, 'b, 'c) format _string -> ('a, 'b, 'c) format ++ ++val ss_ : string -> string -> string _string ++val _ss : string _string -> string ++ ++ ++module T : ++ sig ++ val int : 'b arrow -> (int -> 'b) arrow ++ val char : 'b arrow -> (char -> 'b) arrow ++ val string : 'b arrow -> (string -> 'b) arrow ++ val float : 'b arrow -> (float -> 'b) arrow ++ val bool : 'b arrow -> (bool -> 'b) arrow ++ val int32 : 'b arrow -> (int32 -> 'b) arrow ++ val int64 : 'b arrow -> (int64 -> 'b) arrow ++ val nativeint : 'b arrow -> (nativeint -> 'b) arrow ++ val format : string arrow ++ val bformat : unit arrow ++ val option : 'a arrow -> ++ ('a, unit, string) format Options.option_class ++ val boption : 'a arrow -> ++ ('a, Buffer.t, unit) format Options.option_class ++ end ++ ++val gettext : ('a, unit, string) format Options.option_record -> 'a ++val buftext : Buffer.t -> ('a, Buffer.t, unit) format Options.option_record -> 'a diff --git a/community/mldonkey/gd_version.patch b/community/mldonkey/gd_version.patch deleted file mode 100644 index 666bd2c71..000000000 --- a/community/mldonkey/gd_version.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- config/configure.in 2013/07/07 11:46:34 1.357 -+++ config/configure.in 2013/07/20 10:14:57 1.358 -@@ -932,13 +932,30 @@ - GDMAJORVERSION=`$GDLIBCONFIG --majorversion` - GDMINORVERSION=`$GDLIBCONFIG --minorversion` - GDREVISION=`$GDLIBCONFIG --revision` -- if [ [ $GDMAJORVERSION = 2 ] && [ $GDMINORVERSION = 0 ] && [ $GDREVISION -gt 14 ]]; then -- AC_MSG_RESULT($GDVERSION) -- LIBGD=yes -- else -- AC_MSG_RESULT(no (found $GDVERSION)) -- LIBGD=no -- fi -+ case $GDMAJORVERSION in -+ 1) -+ AC_MSG_RESULT(no (found $GDVERSION)) -+ LIBGD=no -+ ;; -+ 2) -+ if test $GDMINORVERSION -ge 1; then -+ AC_MSG_RESULT($GDVERSION) -+ LIBGD=yes -+ else -+ if test $GDREVISION -gt 14; then -+ AC_MSG_RESULT($GDVERSION) -+ LIBGD=yes -+ else -+ AC_MSG_RESULT(no (found $GDVERSION)) -+ LIBGD=no -+ fi -+ fi -+ ;; -+ *) -+ AC_MSG_RESULT($GDVERSION) -+ LIBGD=yes -+ ;; -+ esac - else - LIBGD=yes - fi diff --git a/community/mldonkey/mldonkey.install b/community/mldonkey/mldonkey.install index 68186f0be..58ae4934c 100644 --- a/community/mldonkey/mldonkey.install +++ b/community/mldonkey/mldonkey.install @@ -8,7 +8,7 @@ post_install() { mkdir -p /var/lib/mldonkey chown mldonkey:mldonkey /var/lib/mldonkey - update-desktop-database -q + type -P update-desktop-database >/dev/null && update-desktop-database -q } post_upgrade() { @@ -23,5 +23,5 @@ post_remove() { groupdel mldonkey fi - update-desktop-database -q + type -P update-desktop-database >/dev/null && update-desktop-database -q } diff --git a/community/muffin/PKGBUILD b/community/muffin/PKGBUILD index 93b0d294e..9c411b3a0 100644 --- a/community/muffin/PKGBUILD +++ b/community/muffin/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 101571 2013-11-28 01:27:47Z faidoc $ +# $Id: PKGBUILD 107039 2014-03-11 15:48:31Z andyrtr $ # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com> # Contributor: Adam Hani Schakaki <adam@schakaki.net> # Contributor: Ner0 pkgname=muffin pkgver=2.0.5 -pkgrel=1 +pkgrel=2 pkgdesc="Cinnamon window manager based on Mutter" arch=('i686' 'x86_64') url="https://github.com/linuxmint/muffin" diff --git a/community/nemo-extensions/PKGBUILD b/community/nemo-extensions/PKGBUILD index 5c312e523..11ca0e100 100644 --- a/community/nemo-extensions/PKGBUILD +++ b/community/nemo-extensions/PKGBUILD @@ -1,4 +1,4 @@ -# $Id$ +# $Id: PKGBUILD 107040 2014-03-11 15:48:32Z andyrtr $ # Maintainer: Alexandre Filgueira <alexfilgueira@antergos.com> pkgbase=nemo-extensions @@ -13,7 +13,7 @@ pkgname=('nemo-fileroller' #'nemo-rabbitvcs' pkgver=2.0.0 _gitver=adeeeb12ea -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') license=('GPL2') url="https://github.com/linuxmint/nemo-extensions" diff --git a/community/percona-server/PKGBUILD b/community/percona-server/PKGBUILD index b5130e6c2..5b1a9fbbf 100644 --- a/community/percona-server/PKGBUILD +++ b/community/percona-server/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 102804 2013-12-20 12:34:07Z mtorromeo $ +# $Id: PKGBUILD 107026 2014-03-11 11:45:43Z mtorromeo $ # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> pkgname=percona-server -pkgver=5.6.15_rel63.0 +pkgver=5.6.16_64.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=('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/_/-rel}/source/tarball/percona-server-${pkgver/_/-}.tar.gz" 'mysqld-post.sh' 'mysqld.service' 'mysqld-tmpfile.conf' @@ -26,9 +26,11 @@ source=("http://www.percona.com/downloads/Percona-Server-${pkgver%.*_*}/Percona- 'mysql56-bison3.patch') prepare() { - cd "$srcdir/Percona-Server-${pkgver/_/-}" + cd "$srcdir/percona-server-${pkgver/_/-}" patch -p0 -i "$srcdir/mysql56-bufsize.patch" patch -p1 -i "$srcdir/mysql56-bison3.patch" + + rm -v sql/sql_yacc.{cc,h} } build() { @@ -37,7 +39,7 @@ build() { mkdir build cd build - cmake "${srcdir}/Percona-Server-${pkgver/_/-}" \ + cmake "${srcdir}/percona-server-${pkgver/_/-}" \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DSYSCONFDIR=/etc/mysql \ @@ -62,9 +64,9 @@ build() { -DWITH_LIBWRAP=OFF \ -DWITH_LIBEDIT=OFF \ -DWITH_UNIT_TESTS=OFF \ - -DWITH_MYSQLD_LDFLAGS="${LDFLAGS}" \ -DWITH_EXTRA_CHARSETS=complex \ -DWITH_EMBEDDED_SERVER=ON \ + -DWITH_INNODB_MEMCACHED=ON \ -DWITH_INNOBASE_STORAGE_ENGINE=ON \ -DWITH_PARTITION_STORAGE_ENGINE=ON \ -DWITH_PERFSCHEMA_STORAGE_ENGINE=ON \ @@ -72,8 +74,9 @@ build() { -DWITH_BLACKHOLE_STORAGE_ENGINE=ON \ -DWITH_FEDERATED_STORAGE_ENGINE=OFF \ -DWITH_EXAMPLE_STORAGE_ENGINE=OFF \ - -DCMAKE_C_FLAGS="-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer" \ - -DCMAKE_CXX_FLAGS="-fPIC ${CXXFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti" + -DCMAKE_C_FLAGS="-fPIC $CFLAGS -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer" \ + -DCMAKE_CXX_FLAGS="-fPIC $CXXFLAGS -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti" \ + -DWITH_MYSQLD_LDFLAGS="$LDFLAGS" make } @@ -102,7 +105,7 @@ package() { rm "${pkgdir}"/usr/share/man/man1/mysql-test-run.pl.1 } -sha256sums=('0d433310c374025e4aae05038b1542a5c90b35d01842c5b9718dcc0ed66ea0cc' +sha256sums=('b2585f37c5451b46a098df1c41ed09f94ce3c3ea7886872c26fe6f779695987d' '82a241d9fa4032187a26597d044e94ba810b209b53a7ce14bb6eb92555993a48' '9bc66470f3f80534c0bb62f9f8325ccf60b164f421f74ad74a963f065d7b1869' 'badf6a701d9dc6ea3b4ddca26cb0f42b6236432ccdbc14c64962147802594a60' diff --git a/community/squid/PKGBUILD b/community/squid/PKGBUILD index 00dad4da2..135f4f29e 100644 --- a/community/squid/PKGBUILD +++ b/community/squid/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 106151 2014-02-24 09:06:12Z spupykin $ +# $Id: PKGBUILD 106994 2014-03-11 10:20:13Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Mark Coolen <mark.coolen@gmail.com> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Contributor: Kevin Piche <kevin@archlinux.org> pkgname=squid -pkgver=3.4.3 -pkgrel=2 +pkgver=3.4.4 +pkgrel=1 pkgdesc='Full-featured Web proxy cache server' arch=('x86_64' 'i686') url='http://www.squid-cache.org' @@ -22,7 +22,7 @@ source=("http://www.squid-cache.org/Versions/v3/3.4/$pkgname-$pkgver.tar.bz2" 'squid.cron' 'squid.service' 'squid.tmpfiles') -md5sums=('4c4c53d2260afd6e7e2dd7c445c92920' +md5sums=('f9c7dd495e45042cc162d89cfbb97cc0' '270977cdd9b47ef44c0c427ab9034777' 'a71425c4951f2e5b640d19e6a5048531' 'ceeb57c69ebb165676219222f109a24e' diff --git a/community/swi-prolog/PKGBUILD b/community/swi-prolog/PKGBUILD index 967ce2907..84e167105 100644 --- a/community/swi-prolog/PKGBUILD +++ b/community/swi-prolog/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 102427 2013-12-10 21:34:55Z arodseth $ +# $Id: PKGBUILD 106968 2014-03-11 09:34:16Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Jachym Barvinek <jachymb@gmail.com> # Contributor: Thomas Dziedzic < gostrc at gmail > @@ -6,7 +6,7 @@ # Contributor: Juergen Hoetzel <juergen@archlinux.org> pkgname=swi-prolog -pkgver=6.6.0 +pkgver=6.6.2 pkgrel=1 pkgdesc='Prolog environment' arch=('x86_64' 'i686') @@ -19,14 +19,17 @@ optdepends=('unixodbc: for using the odbc4pl library' 'libxpm: for using the pl2xpce library' 'libxinerama: for using the pl2xpce library' 'libxft: for using the pl2xpce library') -options=('!makeflags') +#options=('!makeflags') source=("http://www.swi-prolog.org/download/stable/src/pl-$pkgver.tar.gz") -sha256sums=('b85ac27a8afeb29640fe2b98c088e5f9c753adacb20114f8c10ba4835b26f9cd') +sha256sums=('e4996e363a19353f8b4eb1c19284fa73612b0137b32ba3cb066210567260b6cd') build() { cd "pl-$pkgver" ./configure --prefix=/usr --with-world + cd src + ./configure --disable-readline --prefix=/usr + cd .. make } @@ -37,7 +40,7 @@ check() { package() { make -C "pl-$pkgver" DESTDIR="$pkgdir" install - # fix https://bugs.archlinux.org/task/20873 + # Fix for FS#20873 chmod +x "$pkgdir/usr/lib/swipl-$pkgver/library/dialect/sicstus/swipl-lfr.pl" } diff --git a/community/xfe/PKGBUILD b/community/xfe/PKGBUILD index c22a95295..46c034a49 100644 --- a/community/xfe/PKGBUILD +++ b/community/xfe/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 101413 2013-11-25 09:08:58Z spupykin $ +# $Id: PKGBUILD 107007 2014-03-11 11:16:08Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Eric Belanger <belanger@astro.umontreal.ca> # Contributor: Ravi Desai <ravster3@hotmail.com> @@ -17,9 +17,11 @@ md5sums=('ce2a317ab4f7d728878d815afe13c1be') build() { cd $srcdir/$pkgname-$pkgver -# LDFLAGS=-lX11 ./configure --prefix=/usr + sed -i 's|freetype/config/ftheader.h|config/ftheader.h|g' configure.ac + aclocal + automake --add-missing + autoreconf ./configure --prefix=/usr -# sed -i 's|inline||' src/xfeutils.cpp make } diff --git a/community/xmind/PKGBUILD b/community/xmind/PKGBUILD index 26b9502c2..0f2013e88 100644 --- a/community/xmind/PKGBUILD +++ b/community/xmind/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 105001 2014-01-29 18:13:52Z fyan $ +# $Id: PKGBUILD 106967 2014-03-11 07:19:47Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: Christoph Drexler <chrdr at gmx dot at> # Contributor: Jelle van der Waa <jellevdwaa@gmail.com> @@ -6,19 +6,19 @@ pkgname=xmind pkgver=3.4.1 _pkgdate=201401221918 -pkgrel=1 +pkgrel=2 pkgdesc="Brainstorming and Mind Mapping Software" arch=('i686' 'x86_64') [ "${CARCH}" = "i686" ] && _arch="i386" [ "${CARCH}" = "x86_64" ] && _arch="amd64" url="http://www.xmind.net" license=('EPL' 'LGPL') -depends=('desktop-file-utils' 'fontconfig' 'libxrender' 'java-runtime' 'shared-mime-info') +depends=('desktop-file-utils' 'fontconfig' 'libxrender' 'java-runtime' 'shared-mime-info' 'libxext') optdepends=('lame: needed for the feature audio notes') install=xmind.install source=(http://dl2.xmind.net/xmind-downloads/${pkgname}-linux-${pkgver}.${_pkgdate}_${_arch}.deb) -[ "${CARCH}" = "i686" ] && sha512sums=('780fb661d51d68326d4478810d806eab4312b6f21538d4f2dde786f63bd2b9527ec73c25414b83e5aecf496ef78da932697cab2ef099005966a9b13d0f0c5413') -[ "${CARCH}" = "x86_64" ] && sha512sums=('bfa6f4f3b07091c667fb05fcb4a9f22594f474c6dc34d1439f60bb3769c3c62d583366c2ebd61779c152461553537a2422627f8ad7006be5400f59d4553583f6') +[ "${CARCH}" = "i686" ] && sha512sums=('4c020c2eca0646fc18c0066a198e1fb0af1ac18c2e2534968d69d36e78fc1fe6a0b831107d27cd7db642a459d379d4b051f6db1ddaa254de935db4f81e1fa9b8') +[ "${CARCH}" = "x86_64" ] && sha512sums=('a42c1ce8d4d786940c82d438ceeeca40cc4d742a6bb0943a65d7097ac254cb80a40c0c1cc016931d7479720a8b1543a534154c4ed513cb23acdf32b8cacdeefa') build() { ar x "${pkgname}-linux-${pkgver}.${_pkgdate}_${_arch}.deb" diff --git a/community/xxkb/PKGBUILD b/community/xxkb/PKGBUILD index 4bcf2b771..1ce30dd95 100644 --- a/community/xxkb/PKGBUILD +++ b/community/xxkb/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 55567 2011-09-14 10:23:32Z andrea $ +# $Id: PKGBUILD 106999 2014-03-11 10:44:10Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=xxkb @@ -22,7 +22,7 @@ md5sums=('c2e5c7f3285033f0e26b358ef95a7c89' build() { cd "${srcdir}"/${pkgname} xmkmf - make PROJECTROOT=/usr PIXMAPDIR=/usr/share/$pkgname LOCAL_LIBRARIES='-lXext -lXt -lXpm' + make PROJECTROOT=/usr PIXMAPDIR=/usr/share/$pkgname LOCAL_LIBRARIES='-lXext -lXt -lXpm -lX11' } package() { diff --git a/core/dosfstools/PKGBUILD b/core/dosfstools/PKGBUILD index cff6d5dd8..800de9437 100644 --- a/core/dosfstools/PKGBUILD +++ b/core/dosfstools/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 204794 2014-01-27 09:03:20Z tpowa $ +# $Id: PKGBUILD 207499 2014-03-11 15:27:16Z tpowa $ # Maintainer: dorphell <dorphell@archlinux.org> # Committer: Judd Vinet <jvinet@zeroflux.org> pkgname=dosfstools -pkgver=3.0.25 +pkgver=3.0.26 pkgrel=1 pkgdesc="DOS filesystem utilities" arch=(i686 x86_64) @@ -10,7 +10,7 @@ depends=('glibc') source=(http://www.daniel-baumann.ch/files/software/$pkgname/$pkgname-$pkgver.tar.xz{,.sig}) url="http://www.daniel-baumann.ch/software/dosfstools/" license=('GPL2') -md5sums=('6d000d9f68b7766dfe12c88c4aaaa293' +md5sums=('45012f5f56f2aae3afcd62120b9e5a08' 'SKIP') build() { diff --git a/extra/bluez/PKGBUILD b/extra/bluez/PKGBUILD index 14509b07d..f4681e439 100644 --- a/extra/bluez/PKGBUILD +++ b/extra/bluez/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 206240 2014-02-22 16:19:00Z andyrtr $ +# $Id: PKGBUILD 207518 2014-03-11 17:59:19Z andyrtr $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Geoffroy Carrier <geoffroy@archlinux.org> pkgbase=bluez pkgname=('bluez' 'bluez-utils' 'bluez-libs' 'bluez-cups' 'bluez-hid2hci' 'bluez-plugins') -pkgver=5.15 +pkgver=5.16 pkgrel=1 url="http://www.bluez.org/" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ source=(http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.xz 0001-Allow-using-obexd-without-systemd-in-the-user-session.patch bluetooth.modprobe) # see https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc -sha256sums=('487bd75697e565793bf5bc4fbd5fa6a602788313b0c694f7542b81689fc0aa87' +sha256sums=('c8d5094a21a799dca9cdcd99651dc19d521af514b22b8178fc787c454cdbb163' '896a1403d9b7258c4fb0d41f3a6f70fd51eaa1115ab3f4259f3dbbe02b55766b' '46c021be659c9a1c4e55afd04df0c059af1f3d98a96338236412e449bf7477b4') diff --git a/extra/clutter/PKGBUILD b/extra/clutter/PKGBUILD index 9c4766f0a..bc3c1fd2b 100644 --- a/extra/clutter/PKGBUILD +++ b/extra/clutter/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 207401 2014-03-08 16:24:07Z ioni $ +# $Id: PKGBUILD 207501 2014-03-11 15:47:58Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> pkgname=clutter pkgver=1.16.4 -pkgrel=2 +pkgrel=3 pkgdesc="A GObject based library for creating fast, visually rich graphical user interfaces" arch=('i686' 'x86_64') url="http://clutter-project.org/" @@ -13,13 +13,33 @@ license=('LGPL') depends=('cogl' 'mesa' 'json-glib' 'atk' 'libxi' 'libxkbcommon' 'libevdev') makedepends=('gobject-introspection') source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz - fix_buffer_age.patch) + fix_buffer_age.patch + unref_devices_on_removal.diff + fix_a_segfault_on_device_removal.diff + stop_using_deprecated_libevdev_api.diff) sha256sums=('cf50836ec5503577b73f75f984577610881b3e2ff7a327bb5b6918b431b51b65' - 'e254b26663c88dfba756934f011451c0551e52bb70e2de037835aea267ed7bda') + 'e254b26663c88dfba756934f011451c0551e52bb70e2de037835aea267ed7bda' + '70494fe0b46bbe4157196fd855e3fcef0970e543979018df57676fea00dd38af' + 'a9dabecb727f23654ef622aef8bba92e3dd1381ef6257107da7a689766e9917c' + '02768f0032f57939caa3f0695723fd3a6b4ab7bb33908ca50502dfc7f49e6c21') -build() { +prepare() { cd "$pkgname-$pkgver" patch -Np1 -i ../fix_buffer_age.patch + + # fix build with libevdev >= 1.0.x + # https://git.gnome.org/browse/clutter/commit/?h=clutter-1.18&id=7d8f72a60e4087a4d9e48d3f0e38b669b3717243 + patch -Np1 -i ../unref_devices_on_removal.diff + # https://git.gnome.org/browse/clutter/patch/?id=05e6bcc666e345ed4619c1a40a298212d1075b99 + patch -Np1 -i ../fix_a_segfault_on_device_removal.diff + # https://git.gnome.org/browse/clutter/patch/?id=3cd9a70fea1ccf795419a1726c7c279b0aaf237e + patch -Np1 -i ../stop_using_deprecated_libevdev_api.diff + + autoreconf -vfi +} + +build() { + cd "$pkgname-$pkgver" ./configure --prefix=/usr --enable-introspection \ --enable-wayland-backend --enable-egl-backend --enable-evdev-input \ --enable-wayland-compositor diff --git a/extra/clutter/fix_a_segfault_on_device_removal.diff b/extra/clutter/fix_a_segfault_on_device_removal.diff new file mode 100644 index 000000000..46f67dbe5 --- /dev/null +++ b/extra/clutter/fix_a_segfault_on_device_removal.diff @@ -0,0 +1,31 @@ +From 05e6bcc666e345ed4619c1a40a298212d1075b99 Mon Sep 17 00:00:00 2001 +From: Rui Matos <tiagomatos@gmail.com> +Date: Thu, 21 Nov 2013 13:51:26 +0000 +Subject: device-manager-evdev: Fix a segfault on device removal + +Master devices have a NULL sysfs path so use g_strcmp0 to handle them +without crashing. + +https://bugzilla.gnome.org/show_bug.cgi?id=712812 +--- +diff --git a/clutter/evdev/clutter-device-manager-evdev.c b/clutter/evdev/clutter-device-manager-evdev.c +index 256fd0e..38d707f 100644 +--- a/clutter/evdev/clutter-device-manager-evdev.c ++++ b/clutter/evdev/clutter-device-manager-evdev.c +@@ -943,11 +943,8 @@ find_device_by_udev_device (ClutterDeviceManagerEvdev *manager_evdev, + { + ClutterInputDeviceEvdev *device = l->data; + +- if (strcmp (sysfs_path, +- _clutter_input_device_evdev_get_sysfs_path (device)) == 0) +- { +- return device; +- } ++ if (g_strcmp0 (sysfs_path, _clutter_input_device_evdev_get_sysfs_path (device)) == 0) ++ return device; + } + + return NULL; +-- +cgit v0.9.2 + diff --git a/extra/clutter/stop_using_deprecated_libevdev_api.diff b/extra/clutter/stop_using_deprecated_libevdev_api.diff new file mode 100644 index 000000000..cfe56a439 --- /dev/null +++ b/extra/clutter/stop_using_deprecated_libevdev_api.diff @@ -0,0 +1,117 @@ +From 3cd9a70fea1ccf795419a1726c7c279b0aaf237e Mon Sep 17 00:00:00 2001 +From: Rui Matos <tiagomatos@gmail.com> +Date: Tue, 19 Nov 2013 16:02:58 +0000 +Subject: device-manager-evdev: Stop using deprecated libevdev API + +Fixes compiler warnings with libevdev >= 0.4 and makes use of a new +function to set the clock id instead of doing the ioctl directly. + +https://bugzilla.gnome.org/show_bug.cgi?id=712816 +--- +diff --git a/README.in b/README.in +index 0018869..0e73a42 100644 +--- a/README.in ++++ b/README.in +@@ -40,7 +40,7 @@ When building the CEx100 backend, Clutter also depends on: + When building the evdev input backend, Clutter also depends on: + + • xkbcommon +- • libevdev ++ • libevdev ≥ @LIBEVDEV_REQ_VERSION@ + + If you are building the API reference you will also need: + +diff --git a/clutter/evdev/clutter-device-manager-evdev.c b/clutter/evdev/clutter-device-manager-evdev.c +index 38d707f..bc34c39 100644 +--- a/clutter/evdev/clutter-device-manager-evdev.c ++++ b/clutter/evdev/clutter-device-manager-evdev.c +@@ -605,11 +605,11 @@ sync_source (ClutterEventSource *source) + const gchar *device_path; + + /* We read a SYN_DROPPED, ignore it and sync the device */ +- err = libevdev_next_event (source->dev, LIBEVDEV_READ_SYNC, &ev); ++ err = libevdev_next_event (source->dev, LIBEVDEV_READ_FLAG_SYNC, &ev); + while (err == 1) + { + dispatch_one_event (source, &ev); +- err = libevdev_next_event (source->dev, LIBEVDEV_READ_SYNC, &ev); ++ err = libevdev_next_event (source->dev, LIBEVDEV_READ_FLAG_SYNC, &ev); + } + + if (err != -EAGAIN && CLUTTER_HAS_DEBUG (EVENT)) +@@ -664,7 +664,7 @@ clutter_event_dispatch (GSource *g_source, + if (clutter_events_pending ()) + goto queue_event; + +- err = libevdev_next_event (source->dev, LIBEVDEV_READ_NORMAL, &ev); ++ err = libevdev_next_event (source->dev, LIBEVDEV_READ_FLAG_NORMAL, &ev); + while (err != -EAGAIN) + { + if (err == 1) +@@ -677,7 +677,7 @@ clutter_event_dispatch (GSource *g_source, + goto out; + } + +- err = libevdev_next_event (source->dev, LIBEVDEV_READ_NORMAL, &ev); ++ err = libevdev_next_event (source->dev, LIBEVDEV_READ_FLAG_NORMAL, &ev); + } + + queue_event: +@@ -725,7 +725,7 @@ clutter_event_source_new (ClutterInputDeviceEvdev *input_device) + GSource *source = g_source_new (&event_funcs, sizeof (ClutterEventSource)); + ClutterEventSource *event_source = (ClutterEventSource *) source; + const gchar *node_path; +- gint fd, clkid; ++ gint fd; + GError *error; + ClutterInputDeviceType device_type; + +@@ -756,15 +756,13 @@ clutter_event_source_new (ClutterInputDeviceEvdev *input_device) + } + } + +- /* Tell evdev to use the monotonic clock for its timestamps */ +- clkid = CLOCK_MONOTONIC; +- ioctl (fd, EVIOCSCLOCKID, &clkid); +- + /* setup the source */ + event_source->device = input_device; + event_source->event_poll_fd.fd = fd; + event_source->event_poll_fd.events = G_IO_IN; ++ + libevdev_new_from_fd (fd, &event_source->dev); ++ libevdev_set_clock_id (event_source->dev, CLOCK_MONOTONIC); + + device_type = clutter_input_device_get_device_type (CLUTTER_INPUT_DEVICE (input_device)); + if (device_type == CLUTTER_TOUCHPAD_DEVICE) +diff --git a/configure.ac b/configure.ac +index 0448ee4..47fce79 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -146,6 +146,7 @@ m4_define([uprof_req_version], [0.3]) + m4_define([gtk_doc_req_version], [1.15]) + m4_define([xcomposite_req_version], [0.4]) + m4_define([gdk_req_version], [3.3.18]) ++m4_define([libevdev_req_version], [0.4]) + + AC_SUBST([GLIB_REQ_VERSION], [glib_req_version]) + AC_SUBST([COGL_REQ_VERSION], [cogl_req_version]) +@@ -158,6 +159,7 @@ AC_SUBST([UPROF_REQ_VERSION], [uprof_req_version]) + AC_SUBST([GTK_DOC_REQ_VERSION], [gtk_doc_req_version]) + AC_SUBST([XCOMPOSITE_REQ_VERSION], [xcomposite_req_version]) + AC_SUBST([GDK_REQ_VERSION], [gdk_req_version]) ++AC_SUBST([LIBEVDEV_REQ_VERSION], [libevdev_req_version]) + + # Checks for typedefs, structures, and compiler characteristics. + AM_PATH_GLIB_2_0([glib_req_version], +@@ -478,7 +480,7 @@ AS_IF([test "x$enable_evdev" = "xyes"], + AS_IF([test "x$have_evdev" = "xyes"], + [ + CLUTTER_INPUT_BACKENDS="$CLUTTER_INPUT_BACKENDS evdev" +- BACKEND_PC_FILES="$BACKEND_PC_FILES gudev-1.0 libevdev xkbcommon" ++ BACKEND_PC_FILES="$BACKEND_PC_FILES gudev-1.0 libevdev >= $LIBEVDEV_REQ_VERSION xkbcommon" + experimental_input_backend="yes" + AC_DEFINE([HAVE_EVDEV], [1], [Have evdev support for input handling]) + SUPPORT_EVDEV=1 +-- +cgit v0.9.2 diff --git a/extra/clutter/unref_devices_on_removal.diff b/extra/clutter/unref_devices_on_removal.diff new file mode 100644 index 000000000..8ad9aac30 --- /dev/null +++ b/extra/clutter/unref_devices_on_removal.diff @@ -0,0 +1,22 @@ +From 7d8f72a60e4087a4d9e48d3f0e38b669b3717243 Mon Sep 17 00:00:00 2001 +From: Rui Matos <tiagomatos@gmail.com> +Date: Thu, 21 Nov 2013 13:50:40 +0000 +Subject: device-manager-evdev: Unref devices on removal + +https://bugzilla.gnome.org/show_bug.cgi?id=712812 +--- +diff --git a/clutter/evdev/clutter-device-manager-evdev.c b/clutter/evdev/clutter-device-manager-evdev.c +index 9e7be95..256fd0e 100644 +--- a/clutter/evdev/clutter-device-manager-evdev.c ++++ b/clutter/evdev/clutter-device-manager-evdev.c +@@ -1046,6 +1046,8 @@ clutter_device_manager_evdev_remove_device (ClutterDeviceManager *manager, + clutter_event_source_free (source); + priv->event_sources = g_slist_remove (priv->event_sources, source); + } ++ ++ g_object_unref (device); + } + + static const GSList * +-- +cgit v0.9.2 diff --git a/extra/freetype2/PKGBUILD b/extra/freetype2/PKGBUILD index de96c4ac7..3f2d9ecfa 100644 --- a/extra/freetype2/PKGBUILD +++ b/extra/freetype2/PKGBUILD @@ -1,22 +1,25 @@ -# $Id: PKGBUILD 201340 2013-12-09 07:41:57Z heftig $ +# $Id: PKGBUILD 207503 2014-03-11 15:49:00Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=freetype2 -pkgver=2.5.2 +pkgver=2.5.3 pkgrel=1 pkgdesc="TrueType font rendering library" arch=(i686 x86_64) license=('GPL') url="http://freetype.sourceforge.net" -depends=('zlib' 'bzip2' 'sh' 'libpng') -source=(http://downloads.sourceforge.net/sourceforge/freetype/freetype-${pkgver}.tar.bz2 +# adding harfbuzz for improved OpenType features auto-hinting +# introduces a cycle dep to harfbuzz depending on freetype wanted by upstream +depends=('zlib' 'bzip2' 'sh' 'libpng' 'harfbuzz') +source=(http://downloads.sourceforge.net/sourceforge/freetype/freetype-${pkgver}.tar.bz2{,.sig} freetype-2.2.1-enable-valid.patch freetype-2.5.1-enable-spr.patch freetype-2.5.1-enable-sph.patch) -md5sums=('10e8f4d6a019b124088d18bc26123a25' - '214119610444c9b02766ccee5e220680' - '80a14cce234f3f190cd936ca9060c398' - '0636ba2ff074201e2ea5c47ac408bc63') +sha1sums=('d3c26cc17ec7fe6c36f4efc02ef92ab6aa3f4b46' + 'SKIP' + 'f279d922a873d62a8af50bfc873051839d194dca' + '13ee8d558593db991ad29fa090b461f914536104' + 'c31fa3d342ead56f3acfa1f267b474a7686d0014') prepare() { cd "${srcdir}/freetype-${pkgver}" @@ -31,9 +34,7 @@ prepare() { build() { cd "${srcdir}/freetype-${pkgver}" - ./configure --prefix=/usr --disable-static - make } diff --git a/extra/libevdev/0001-Revert-Drop-deprecated-functions.patch b/extra/libevdev/0001-Revert-Drop-deprecated-functions.patch deleted file mode 100644 index e4857e7ad..000000000 --- a/extra/libevdev/0001-Revert-Drop-deprecated-functions.patch +++ /dev/null @@ -1,163 +0,0 @@ -From 51bf0ead89df5c1ddaa22d2f7fc0e04cedbdc590 Mon Sep 17 00:00:00 2001 -From: Adam Williamson <awilliam@redhat.com> -Date: Thu, 26 Dec 2013 18:58:23 -0800 -Subject: [PATCH] Revert "Drop deprecated functions" - -This reverts commit 7a38f4abc3ed1df368d5bad32a1d72559acdc234. It is incorrect and dangerous to drop functions without an soname bump. This broke GNOME. ---- - libevdev/libevdev.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ - libevdev/libevdev.h | 30 ++++++++++++++++++++++++++++++ - 2 files changed, 79 insertions(+) - -diff --git a/libevdev/libevdev.c b/libevdev/libevdev.c -index 8a37204..02e4f78 100644 ---- a/libevdev/libevdev.c -+++ b/libevdev/libevdev.c -@@ -162,6 +162,14 @@ libevdev_free(struct libevdev *dev) - free(dev); - } - -+/* DEPRECATED */ -+LIBEVDEV_EXPORT void -+libevdev_set_log_handler(struct libevdev *dev, libevdev_log_func_t logfunc) -+{ -+ /* Can't be backwards compatible to this yet, so don't even try */ -+ fprintf(stderr, "libevdev: ABI change. Log function will not be honored.\n"); -+} -+ - LIBEVDEV_EXPORT void - libevdev_set_log_function(libevdev_log_func_t logfunc, void *data) - { -@@ -1244,6 +1252,12 @@ libevdev_disable_event_code(struct libevdev *dev, unsigned int type, unsigned in - } - - LIBEVDEV_EXPORT int -+libevdev_kernel_set_abs_value(struct libevdev *dev, unsigned int code, const struct input_absinfo *abs) -+{ -+ return libevdev_kernel_set_abs_info(dev, code, abs); -+} -+ -+LIBEVDEV_EXPORT int - libevdev_kernel_set_abs_info(struct libevdev *dev, unsigned int code, const struct input_absinfo *abs) - { - int rc; -@@ -1296,12 +1310,22 @@ libevdev_grab(struct libevdev *dev, enum libevdev_grab_mode grab) - return rc < 0 ? -errno : 0; - } - -+/* DEPRECATED */ -+LIBEVDEV_EXPORT int -+libevdev_is_event_type(const struct input_event *ev, unsigned int type) -+ALIAS(libevdev_event_is_type); -+ - LIBEVDEV_EXPORT int - libevdev_event_is_type(const struct input_event *ev, unsigned int type) - { - return type < EV_CNT && ev->type == type; - } - -+/* DEPRECATED */ -+LIBEVDEV_EXPORT int -+libevdev_is_event_code(const struct input_event *ev, unsigned int type, unsigned int code) -+ALIAS(libevdev_event_is_code); -+ - LIBEVDEV_EXPORT int - libevdev_event_is_code(const struct input_event *ev, unsigned int type, unsigned int code) - { -@@ -1314,6 +1338,11 @@ libevdev_event_is_code(const struct input_event *ev, unsigned int type, unsigned - return (max > -1 && code <= (unsigned int)max && ev->code == code); - } - -+/* DEPRECATED */ -+LIBEVDEV_EXPORT const char* -+libevdev_get_event_type_name(unsigned int type) -+ALIAS(libevdev_event_type_get_name); -+ - LIBEVDEV_EXPORT const char* - libevdev_event_type_get_name(unsigned int type) - { -@@ -1323,6 +1352,11 @@ libevdev_event_type_get_name(unsigned int type) - return ev_map[type]; - } - -+/* DEPRECATED */ -+LIBEVDEV_EXPORT const char* -+libevdev_get_event_code_name(unsigned int type, unsigned int code) -+ALIAS(libevdev_event_code_get_name); -+ - LIBEVDEV_EXPORT const char* - libevdev_event_code_get_name(unsigned int type, unsigned int code) - { -@@ -1334,6 +1368,16 @@ libevdev_event_code_get_name(unsigned int type, unsigned int code) - return event_type_map[type][code]; - } - -+/* DEPRECATED */ -+LIBEVDEV_EXPORT const char* -+libevdev_get_input_prop_name(unsigned int prop) -+ALIAS(libevdev_property_get_name); -+ -+/* DEPRECATED */ -+LIBEVDEV_EXPORT const char* -+libevdev_get_property_name(unsigned int prop) -+ALIAS(libevdev_property_get_name); -+ - LIBEVDEV_EXPORT const char* - libevdev_property_get_name(unsigned int prop) - { -@@ -1343,6 +1387,11 @@ libevdev_property_get_name(unsigned int prop) - return input_prop_map[prop]; - } - -+/* DEPRECATED */ -+LIBEVDEV_EXPORT int -+libevdev_get_event_type_max(unsigned int type) -+ALIAS(libevdev_event_type_get_max); -+ - LIBEVDEV_EXPORT int - libevdev_event_type_get_max(unsigned int type) - { -diff --git a/libevdev/libevdev.h b/libevdev/libevdev.h -index 37ca2f4..c89f4ad 100644 ---- a/libevdev/libevdev.h -+++ b/libevdev/libevdev.h -@@ -1642,6 +1642,36 @@ int libevdev_get_repeat(const struct libevdev *dev, int *delay, int *period); - #define LIBEVDEV_DEPRECATED - #endif - -+LIBEVDEV_DEPRECATED extern const enum libevdev_read_flag LIBEVDEV_READ_SYNC; -+LIBEVDEV_DEPRECATED extern const enum libevdev_read_flag LIBEVDEV_READ_NORMAL; -+LIBEVDEV_DEPRECATED extern const enum libevdev_read_flag LIBEVDEV_FORCE_SYNC; -+LIBEVDEV_DEPRECATED extern const enum libevdev_read_flag LIBEVDEV_READ_BLOCKING; -+ -+/* replacement: libevdev_kernel_set_abs_info */ -+int libevdev_kernel_set_abs_value(struct libevdev *dev, unsigned int code, const struct input_absinfo *abs) LIBEVDEV_DEPRECATED; -+ -+ -+/* replacement: libevdev_set_log_function */ -+void libevdev_set_log_handler(struct libevdev *dev, libevdev_log_func_t logfunc) LIBEVDEV_DEPRECATED; -+ -+/** replacement: libevdev_event_type_get_max */ -+int libevdev_get_event_type_max(unsigned int type) LIBEVDEV_DEPRECATED; -+ -+/** replacement: libevdev_property_get_name */ -+const char* libevdev_get_property_name(unsigned int prop) LIBEVDEV_DEPRECATED; -+ -+/** replacement: libevdev_event_type_get_name */ -+const char * libevdev_get_event_type_name(unsigned int type) LIBEVDEV_DEPRECATED; -+/** replacement: libevdev_event_code_get_name */ -+const char * libevdev_get_event_code_name(unsigned int type, unsigned int code) LIBEVDEV_DEPRECATED; -+ -+/** replacement: libevdev_event_is_type */ -+int libevdev_is_event_type(const struct input_event *ev, unsigned int type) LIBEVDEV_DEPRECATED; -+ -+/** replacement: libevdev_event_is_code */ -+int libevdev_is_event_code(const struct input_event *ev, unsigned int type, unsigned int code) LIBEVDEV_DEPRECATED; -+/**************************************/ -+ - #ifdef __cplusplus - } - #endif --- -1.8.5.2 - diff --git a/extra/libevdev/0001-Revert-Drop-some-leftover-deprecated-constants.patch b/extra/libevdev/0001-Revert-Drop-some-leftover-deprecated-constants.patch deleted file mode 100644 index 250be8505..000000000 --- a/extra/libevdev/0001-Revert-Drop-some-leftover-deprecated-constants.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 9ee61912a356bb8c1995cf262428196e5e4f179d Mon Sep 17 00:00:00 2001 -From: Peter Hutterer <peter.hutterer@who-t.net> -Date: Fri, 3 Jan 2014 08:30:04 +1000 -Subject: [PATCH libevdev] Revert "Drop some leftover deprecated constants." - -This reverts commit a612ee753e8c40d2d1fff6da516d278064e27d86. ---- - libevdev/libevdev.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/libevdev/libevdev.c b/libevdev/libevdev.c -index 8a37204..432aeff 100644 ---- a/libevdev/libevdev.c -+++ b/libevdev/libevdev.c -@@ -36,6 +36,12 @@ - - #define MAXEVENTS 64 - -+/* DEPRECATED */ -+LIBEVDEV_EXPORT const enum libevdev_read_flag LIBEVDEV_READ_SYNC = LIBEVDEV_READ_FLAG_SYNC; -+LIBEVDEV_EXPORT const enum libevdev_read_flag LIBEVDEV_READ_NORMAL = LIBEVDEV_READ_FLAG_NORMAL; -+LIBEVDEV_EXPORT const enum libevdev_read_flag LIBEVDEV_FORCE_SYNC = LIBEVDEV_READ_FLAG_FORCE_SYNC; -+LIBEVDEV_EXPORT const enum libevdev_read_flag LIBEVDEV_READ_BLOCKING = LIBEVDEV_READ_FLAG_BLOCKING; -+ - static int sync_mt_state(struct libevdev *dev, int create_events); - - static int --- -1.8.4.2 - diff --git a/extra/libevdev/PKGBUILD b/extra/libevdev/PKGBUILD index 8f669ce1a..e417072a7 100644 --- a/extra/libevdev/PKGBUILD +++ b/extra/libevdev/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: $ -# Maintainer: Jan de Groot +# $Id: PKGBUILD 207500 2014-03-11 15:47:57Z andyrtr $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=libevdev -pkgver=0.6 +pkgver=1.0.1 pkgrel=1 pkgdesc="Wrapper library for evdev devices" arch=(i686 x86_64) @@ -10,22 +10,13 @@ url="http://www.freedesktop.org/wiki/Software/libevdev/" license=(custom:X11) depends=('glibc') makedepends=('python') -source=(http://freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz - 0001-Revert-Drop-deprecated-functions.patch - 0001-Revert-Drop-some-leftover-deprecated-constants.patch) -sha256sums=('1c562ed32252ef9c14aa61e03b38acb886cb3edbbdafbb5181762ff16e010d93' - '783ba5edf7c9525e8cac46c8c4c981c98395ff3c68ed7a162190ef9e8f13b149' - '24d52811732b3335eb363416e4862c6152bfe6ebc8c372a298126221f754f041') +source=(http://freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz) +sha256sums=('a2b6f6a5f898099df816e3e30f53f4b23c2f05ab240737cbdc111874a0922913') build() { cd $pkgname-$pkgver - - # Fix libevdev 0.6 missing symbol that breaks clutter, patches from Fedora - # https://bugzilla.redhat.com/show_bug.cgi?id=1046426 - patch -Np1 -i ../0001-Revert-Drop-deprecated-functions.patch - patch -Np1 -i ../0001-Revert-Drop-some-leftover-deprecated-constants.patch - - ./configure --prefix=/usr --disable-static --disable-gcov + ./configure --prefix=/usr \ + --disable-static make } diff --git a/extra/ltrace/PKGBUILD b/extra/ltrace/PKGBUILD index ffb8981c3..dee136132 100644 --- a/extra/ltrace/PKGBUILD +++ b/extra/ltrace/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 194589 2013-09-18 22:47:23Z foutrelis $ +# $Id: PKGBUILD 207507 2014-03-11 16:22:15Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Aaron Griffin <aaron@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> @@ -13,7 +13,7 @@ license=('GPL') depends=('elfutils') makedepends=('dejagnu') backup=('etc/ltrace.conf') -source=(https://alioth.debian.org/frs/download.php/file/3947/$pkgname-$pkgver.tar.bz2) +source=(https://dev.archlinux.org/~foutrelis/sources/$pkgname/$pkgname-$pkgver.tar.bz2) sha256sums=('0e6f8c077471b544c06def7192d983861ad2f8688dd5504beae62f0c5f5b9503') build() { diff --git a/extra/ntp/PKGBUILD b/extra/ntp/PKGBUILD index 34997d0cb..a599fb9c8 100644 --- a/extra/ntp/PKGBUILD +++ b/extra/ntp/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 203483 2014-01-11 16:49:37Z bisson $ +# $Id: PKGBUILD 207491 2014-03-11 04:40:40Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: kevin <kevin@archlinux.org> pkgname=ntp pkgver=4.2.6.p5 _realver=4.2.6p5 -pkgrel=18 +pkgrel=19 pkgdesc='Network Time Protocol reference implementation' url='http://www.ntp.org/' license=('custom') @@ -20,7 +20,7 @@ source=("http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${_realver}.tar.gz" sha1sums=('4a5353a4791b6f4315a66c28d504ec6c7926b192' 'd3496dbeb7d531dd6ab071dbce3262c3c9618d8b' 'dd24216e8333e12d5080965696602591c72537b1' - 'e1c48cba549b7d21501aadf513926e463884c090' + '059b382d1af0c55202e2d17f2ae065a2cbfec9ee' ) install=install diff --git a/extra/ntp/ntpdate.service b/extra/ntp/ntpdate.service index 094dd42c8..e85852e27 100644 --- a/extra/ntp/ntpdate.service +++ b/extra/ntp/ntpdate.service @@ -1,11 +1,12 @@ [Unit] Description=One-Shot Network Time Service After=network.target nss-lookup.target +Before=ntpd.service [Service] Type=oneshot PrivateTmp=true -ExecStart=/usr/bin/ntpd -q -g -u ntp:ntp +ExecStart=/usr/bin/ntpd -q -n -g -u ntp:ntp [Install] WantedBy=multi-user.target diff --git a/extra/sqlite/PKGBUILD b/extra/sqlite/PKGBUILD index 7646b5938..f085b3d75 100644 --- a/extra/sqlite/PKGBUILD +++ b/extra/sqlite/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 207477 2014-03-10 18:59:37Z andyrtr $ +# $Id: PKGBUILD 207516 2014-03-11 17:41:31Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgbase="sqlite" pkgname=('sqlite' 'sqlite-tcl' 'sqlite-doc') -_amalgamationver=3080400 +_amalgamationver=3080401 _docver=${_amalgamationver} #_docver=3080001 -pkgver=3.8.4 +pkgver=3.8.4.1 pkgrel=1 pkgdesc="A C library that implements an SQL database engine" arch=('i686' 'x86_64') @@ -19,8 +19,8 @@ source=( # tarball containing the amalgamation for SQLite >= 3.7.5 together with http://www.sqlite.org/2014/sqlite-doc-${_docver}.zip license.txt) options=('!emptydirs') -sha1sums=('19249a798456f88b3a99ef27fa4119d08d89682f' - 'f3765974a7752901aff58b4c7ade4950383bcb24' +sha1sums=('f8a77b74bd2632eb14cea62cd8b92c45026e248c' + '11c635048ad6378e86e704246c3c2d64568ce09d' 'f34f6daa4ab3073d74e774aad21d66878cf26853') build() { diff --git a/extra/sushi/PKGBUILD b/extra/sushi/PKGBUILD index ea3b761fc..2d681501d 100644 --- a/extra/sushi/PKGBUILD +++ b/extra/sushi/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 198443 2013-10-30 14:54:20Z allan $ +# $Id: PKGBUILD 207502 2014-03-11 15:48:00Z andyrtr $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=sushi pkgver=3.10.0 -pkgrel=1 +pkgrel=2 pkgdesc="A quick previewer for Nautilus" arch=(i686 x86_64) url="http://www.gnome.org" diff --git a/extra/thunar-archive-plugin/PKGBUILD b/extra/thunar-archive-plugin/PKGBUILD index 7b21e0ec2..72994f9e7 100644 --- a/extra/thunar-archive-plugin/PKGBUILD +++ b/extra/thunar-archive-plugin/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 198458 2013-10-30 14:59:45Z allan $ +# $Id: PKGBUILD 207512 2014-03-11 16:41:15Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Tobias Kieslich <tobias (at) archlinux.org> pkgname=thunar-archive-plugin pkgver=0.3.1 -pkgrel=2 +pkgrel=3 pkgdesc="Create and extract archives in Thunar" arch=('i686' 'x86_64') url="http://goodies.xfce.org/projects/thunar-plugins/thunar-archive-plugin" @@ -13,7 +13,8 @@ groups=('xfce4-goodies') depends=('thunar' 'hicolor-icon-theme') makedepends=('intltool') optdepends=('file-roller' - 'kdeutils-ark') + 'kdeutils-ark' + 'xarchiver') install=$pkgname.install source=(http://archive.xfce.org/src/thunar-plugins/$pkgname/0.3/$pkgname-$pkgver.tar.bz2) sha256sums=('9ad559b0c11308f6897ad56604e5a06dc8f369f649eb20120b2d3018ef5da54c') diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD index 334af537c..e1625893a 100644 --- a/kernels/linux-libre-pae/PKGBUILD +++ b/kernels/linux-libre-pae/PKGBUILD @@ -32,7 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn '0001-Bluetooth-allocate-static-minor-for-vhci.patch' 'i8042-fix-aliases.patch') md5sums=('98a8e803e0ed08557f3cdd4d56b0ddc1' - '6e59a1e4b891ca5fa8b03d488fa64e04' + 'bd937981937fd3c7a553fc770236e640' '904835a7af0bc5e88007a94cad7c1d9c' 'f302c931bd85309da9d9792b4cc96467' '44260d2cb1a8b51c119d2ce1f83e457a' diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD index 9e32610fc..719c9aa05 100644 --- a/kernels/linux-libre-xen/PKGBUILD +++ b/kernels/linux-libre-xen/PKGBUILD @@ -32,7 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn '0001-Bluetooth-allocate-static-minor-for-vhci.patch' 'i8042-fix-aliases.patch') md5sums=('98a8e803e0ed08557f3cdd4d56b0ddc1' - '6e59a1e4b891ca5fa8b03d488fa64e04' + 'bd937981937fd3c7a553fc770236e640' 'be059d4c29dfd9ac55183133938e9242' 'b7c2805bb287a644c0a303bf7721e534' '44260d2cb1a8b51c119d2ce1f83e457a' diff --git a/libre/mcomix-libre/PKGBUILD b/libre/mcomix-libre/PKGBUILD index 78104354f..97c3bde0f 100644 --- a/libre/mcomix-libre/PKGBUILD +++ b/libre/mcomix-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 97188 2013-09-15 08:42:21Z schuay $ +# $Id: PKGBUILD 106934 2014-03-10 18:30:38Z schuay $ # Maintainer: schuay <jakob.gruber@gmail.com> # Contributor: Ray Powell <ray_al@xphoniexx.net> # Maintainer (Parabola): André Silva <emulatorman@parabola.nu> @@ -6,7 +6,7 @@ _pkgname=mcomix pkgname=mcomix-libre pkgver=1.00 -pkgrel=5.1 +pkgrel=6 pkgdesc="A user-friendly, customizable image viewer specifically designed to handle comic books, without nonfree unrar recommendation" arch=('any') url="http://sourceforge.net/projects/mcomix/" @@ -18,7 +18,8 @@ conflicts=('mcomix' 'comix') replaces=('mcomix' 'comix') provides=("mcomix=${pkgver}") install='mcomix.install' -source=("http://downloads.sourceforge.net/project/mcomix/MComix-${pkgver}/mcomix-${pkgver}.tar.bz2") +source=("http://downloads.sourceforge.net/project/mcomix/MComix-${pkgver}/mcomix-${pkgver}.tar.bz2" + 'zoom.patch') build() { cd ${srcdir}/${_pkgname}-${pkgver} @@ -31,6 +32,10 @@ build() { do sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file done + + # Fix zoom in, zoom out keyboard shortcuts: + # https://sourceforge.net/p/mcomix/bugs/62/ + patch -Np1 < ${srcdir}/zoom.patch } package() { @@ -47,4 +52,5 @@ package() { install -Dm644 mime/comicbook.schemas ${pkgdir}/usr/share/gconf/schemas/mcomix.schemas } -md5sums=('3a916dd9da17043ab59ccd17e26eb932') +md5sums=('3a916dd9da17043ab59ccd17e26eb932' + 'c80705bf6f132bfba20dcb84b79c9cb7') diff --git a/libre/mcomix-libre/mcomix.install b/libre/mcomix-libre/mcomix.install index c33c1d5a1..82047a202 100644 --- a/libre/mcomix-libre/mcomix.install +++ b/libre/mcomix-libre/mcomix.install @@ -14,6 +14,7 @@ pre_upgrade() { } post_upgrade() { + echo 'In case of any issues with zoom keybindings, delete ~/.config/mcomix/keybindings.conf.' post_install $1 } diff --git a/libre/mcomix-libre/zoom.patch b/libre/mcomix-libre/zoom.patch new file mode 100644 index 000000000..26dc3ba6f --- /dev/null +++ b/libre/mcomix-libre/zoom.patch @@ -0,0 +1,17 @@ +diff --git a/mcomix-1.00/mcomix/event.py b/mcomix-1.00-mod/mcomix/event.py +index bc8cf79..bf80ec2 100644 +--- a/mcomix/event.py ++++ b/mcomix/event.py +@@ -117,8 +117,11 @@ class EventHandler: + + # Zooming commands for manual zoom mode + manager.register('zoom in', +- ['equal'], ++ ['plus', 'KP_Add', 'equal'], + self._window.actiongroup.get_action('zoom_in').activate) ++ manager.register('zoom out', ++ ['minus', 'KP_Subtract'], ++ self._window.actiongroup.get_action('zoom_out').activate) + # Zoom out is already defined as GTK menu hotkey + manager.register('zoom original', + ['KP_0'], diff --git a/libre/xbmc-libre/PKGBUILD b/libre/xbmc-libre/PKGBUILD index 5a2df28db..5b2df88cd 100644 --- a/libre/xbmc-libre/PKGBUILD +++ b/libre/xbmc-libre/PKGBUILD @@ -12,8 +12,8 @@ _pkgname=xbmc pkgname=xbmc-libre pkgver=12.3 _codename=Frodo -pkgrel=11 -pkgdesc="A software media player and entertainment hub for digital media, without unrar support" +pkgrel=11.1 +pkgdesc="A software media player and entertainment hub for digital media, without nonfree addons and unrar support" arch=('i686' 'x86_64') url="http://xbmc.org" license=('GPL' 'custom') @@ -60,6 +60,9 @@ prepare() { # fix lsb_release dependency sed -i -e 's:/usr/bin/lsb_release -d:cat /etc/arch-release:' xbmc/utils/SystemInfo.cpp sed -i -e 's:#include <libsmbclient.h>:#include <samba-4.0/libsmbclient.h>:' xbmc/filesystem/{SmbFile,SMBDirectory}.cpp + + # use addons.xml from Parabola server (without nonfree addons support) + sed -i -e 's|mirrors[.]xbmc[.]org/addons/frodo/addons.xml|repo.parabolagnulinux.org/other/xbmc-libre/addons/frodo/addons.xml|' addons/repository.xbmc.org/addon.xml } build() { |