summaryrefslogtreecommitdiff
path: root/community
diff options
context:
space:
mode:
Diffstat (limited to 'community')
-rw-r--r--community/aircrack-ng/ChangeLog66
-rw-r--r--community/aircrack-ng/PKGBUILD27
-rw-r--r--community/bind/PKGBUILD8
-rw-r--r--community/bmake/PKGBUILD3
-rw-r--r--community/chicken/PKGBUILD10
-rw-r--r--community/cinnamon-screensaver/PKGBUILD4
-rw-r--r--community/cinnamon-settings-daemon/PKGBUILD6
-rw-r--r--community/cinnamon/PKGBUILD13
-rw-r--r--community/cinnamon/upower_power_applet_fix.patch300
-rw-r--r--community/converseen/PKGBUILD6
-rw-r--r--community/fbv/PKGBUILD10
-rw-r--r--community/fbv/giflib-5.0.patch21
-rw-r--r--community/fbv/giflib-5.1.patch62
-rw-r--r--community/fcron/PKGBUILD7
-rw-r--r--community/fossil/PKGBUILD11
-rw-r--r--community/gdal/PKGBUILD12
-rw-r--r--community/gdal/giflib51.patch139
-rw-r--r--community/gimp-plugin-mathmap/PKGBUILD18
-rw-r--r--community/gimp-plugin-mathmap/giflib-5.0.patch12
-rw-r--r--community/gimp-plugin-mathmap/giflib-5.1.patch21
-rw-r--r--community/gmic/PKGBUILD6
-rw-r--r--community/gnustep-gui/PKGBUILD16
-rw-r--r--community/gnustep-gui/giflib-5.0.patch21
-rw-r--r--community/gnustep-gui/giflib-5.1.patch30
-rw-r--r--community/goaccess/PKGBUILD6
-rw-r--r--community/gpsbabel/PKGBUILD10
-rw-r--r--community/gpsdrive/PKGBUILD11
-rw-r--r--community/gpsdrive/gpsdrive-perltovendor.patch28
-rw-r--r--community/i3-wm/PKGBUILD12
-rw-r--r--community/julia/PKGBUILD11
-rw-r--r--community/kmess/PKGBUILD8
-rw-r--r--community/kmess/giflib-5.0.patch30
-rw-r--r--community/leptonica/PKGBUILD15
-rw-r--r--community/leptonica/giflib6.patch111
-rw-r--r--community/lwqq/PKGBUILD13
-rw-r--r--community/lxc/PKGBUILD8
-rw-r--r--community/metapixel/PKGBUILD19
-rw-r--r--community/metapixel/metapixel-giflib-5.1.0-compat.patch23
-rw-r--r--community/minidlna/PKGBUILD9
-rw-r--r--community/minidlna/minidlna.service1
-rw-r--r--community/mpv/PKGBUILD6
-rw-r--r--community/mtpaint/PKGBUILD17
-rw-r--r--community/mtpaint/giflib.patch29
-rw-r--r--community/mumble/PKGBUILD6
-rw-r--r--community/mupdf/PKGBUILD34
-rw-r--r--community/mupdf/mupdf-1.4-system-libcurl.patch26
-rw-r--r--community/mupdf/mupdf.desktop15
-rw-r--r--community/mupdf/mupdf.xpm497
-rw-r--r--community/murmur/PKGBUILD6
-rw-r--r--community/openscenegraph/PKGBUILD15
-rw-r--r--community/openscenegraph/giflib.patch12
-rw-r--r--community/openssh-askpass/PKGBUILD6
-rw-r--r--community/openvswitch/PKGBUILD8
-rw-r--r--community/openvswitch/ovs-vswitchd.service5
-rw-r--r--community/openvswitch/ovsdb-server.service3
-rw-r--r--community/opus-tools/PKGBUILD17
-rw-r--r--community/partclone/PKGBUILD12
-rw-r--r--community/passenger/PKGBUILD6
-rw-r--r--community/percona-server/PKGBUILD6
-rw-r--r--community/pidgin-lwqq/PKGBUILD6
-rw-r--r--community/python-cx_freeze/PKGBUILD8
-rw-r--r--community/rsyslog/PKGBUILD6
-rw-r--r--community/rubinius/PKGBUILD4
-rw-r--r--community/swftools/PKGBUILD10
-rw-r--r--community/swftools/giflib-5.0.patch53
-rw-r--r--community/swftools/giflib-5.1.patch92
-rw-r--r--community/sxiv/PKGBUILD19
-rw-r--r--community/sxiv/giflib-5.1.0.patch15
-rw-r--r--community/sylpheed/PKGBUILD6
-rw-r--r--community/torcs/PKGBUILD6
-rw-r--r--community/volumeicon/PKGBUILD29
-rw-r--r--community/wireshark/PKGBUILD17
-rw-r--r--community/xmms2/PKGBUILD7
-rw-r--r--community/xplanet/PKGBUILD6
-rw-r--r--community/xplanet/giflib6.patch19
-rw-r--r--community/xulrunner/PKGBUILD12
-rw-r--r--community/xulrunner/mozconfig3
-rw-r--r--community/zile/PKGBUILD8
-rw-r--r--community/ziproxy/PKGBUILD6
-rw-r--r--community/ziproxy/build-fix.patch13
80 files changed, 1742 insertions, 473 deletions
diff --git a/community/aircrack-ng/ChangeLog b/community/aircrack-ng/ChangeLog
deleted file mode 100644
index a8feddaab..000000000
--- a/community/aircrack-ng/ChangeLog
+++ /dev/null
@@ -1,66 +0,0 @@
-2011-06-28 Brad Fanella
-
- * Fix FS#24880
-
-2011-06-15 Brad Fanella
-
- * Fix FS#24633
-
-2011-03-16 Brad Fanella
-
- * Fix FS#23295
-
-2011-01-17 Brad Fanella
-
- * Fix #FS20303
- * Split into aircrack-ng and aircrack-ng-scripts
-
-2009-09-18 Biru Ionut <ionut@archlinux.ro>
-
- * Version bump: 1.0-rc4
-
-2009-04.14 Corrado Primier <bardo@aur.archlinux.org>
-
- * Version bump: 1.0-rc3
-
- * PKGBUILD: removed old compilation patch
-
-2009-02-08 Corrado Primier <bardo@aur.archlinux.org>
-
- * Version bump: 1.0-rc2
-
- * sha-compile-fix-64bit.patch: added, fixes compilation on 64bit hosts
-
-2008-06-15 Corrado Primier <bardo@aur.archlinux.org>
-
- * Version bump: 1.0-rc1
-
- * PKGBUILD: moved from $startdir to $srcdir/$pkgdir, added vim tags,
- added sqlite3 dependency for airolib-ng support
-
-2008-05-03 Corrado Primier <bardo@aur.archlinux.org>
-
- * Version bump: 1.0-beta2
-
- * PKGBUILD: adapted make command to the new Makefile, added zlib and
- openssl dependencies
-
-2008-02-25 Corrado Primier <bardo@aur.archlinux.org>
-
- * Version bump: 0.9.3
-
-2008-02-08 Corrado Primier <bardo@aur.archlinux.org>
-
- * PKGBUILD: fixed man page location (thanks Snowman)
-
-2008-02-07 Corrado Primier <bardo@aur.archlinux.org>
-
- * Version bump: 0.9.2
-
- * PKGBUILD: moved man pages to /usr/share/man
-
-2007-12-15 Corrado Primier <bardo@aur.archlinux.org>
-
- * ChangeLog: added
-
- * PKGBUILD: adopted, cleaned up, uploaded to [community]
diff --git a/community/aircrack-ng/PKGBUILD b/community/aircrack-ng/PKGBUILD
index 93bc2fe7b..cd418b56c 100644
--- a/community/aircrack-ng/PKGBUILD
+++ b/community/aircrack-ng/PKGBUILD
@@ -1,12 +1,14 @@
-# $Id: PKGBUILD 96850 2013-09-06 16:26:13Z bgyorgy $
+# $Id: PKGBUILD 113174 2014-06-14 22:00:12Z jsteel $
+# Maintainer: Jonathan Steel <jsteel at aur.archlinux.org>
# Contributor: Brad Fanella <bradfanella@archlinux.us>
-# Contributor: Daenyth <Daenyth+Arch [at] gmail [dot] com>
+# Contributor: Daenyth <Daenyth+Arch [at] gmail [dot] com>
# Contributor: Corrado Primier <bardo@aur.archlinux.org>
# Contributor: ice-man <icemanf@gmail.com>
pkgname=aircrack-ng
-pkgver=1.1
-pkgrel=10
+_pkgver=1.2-beta3
+pkgver=${_pkgver//-/}
+pkgrel=1
pkgdesc="A key cracker for the 802.11 WEP and WPA-PSK protocols"
arch=('i686' 'x86_64')
url="http://www.aircrack-ng.org"
@@ -15,16 +17,19 @@ depends=('openssl' 'sqlite' 'iw' 'net-tools' 'wireless_tools')
conflicts=('aircrack-ng-scripts')
replaces=('aircrack-ng-scripts')
provides=('aircrack-ng-scripts')
-source=("http://download.aircrack-ng.org/$pkgname-$pkgver.tar.gz")
-md5sums=('f7a24ed8fad122c4187d06bfd6f998b4')
+source=(http://download.aircrack-ng.org/$pkgname-$_pkgver.tar.gz)
+md5sums=('ec5492e65ce7e98c6812e84b1d18d811')
build() {
- cd "$srcdir/$pkgname-$pkgver"
- make SQLITE=true UNSTABLE=true
+ cd "$srcdir"/$pkgname-$_pkgver
+
+ make sqlite=true unstable=true
}
package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="$pkgdir" SQLITE=true UNSTABLE=true \
- bindir=/usr/bin sbindir=/usr/bin mandir=/usr/share/man/man1 install
+ cd "$srcdir"/$pkgname-$_pkgver
+
+ make DESTDIR="$pkgdir" sqlite=true unstable=true \
+ bindir=/usr/bin sbindir=/usr/bin mandir=/usr/share/man/man1/ \
+ smandir=/usr/share/man/man8/ install
}
diff --git a/community/bind/PKGBUILD b/community/bind/PKGBUILD
index 51c7de91f..27e21db95 100644
--- a/community/bind/PKGBUILD
+++ b/community/bind/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 111392 2014-05-17 21:38:15Z seblu $
+# $Id: PKGBUILD 113079 2014-06-12 22:25:58Z seblu $
# Maintainer: Sébastien Luttringer
# Contributor: Gaetan Bisson <bisson@archlinux.org>
# Contributor: judd <jvinet@zeroflux.org>
# Contributor: Mario Vazquez <mario_vazq@hotmail.com>
pkgname=bind
-_pkgver=9.10.0-P1
+_pkgver=9.10.0-P2
pkgver=${_pkgver//-/.}
-pkgrel=4
+pkgrel=1
pkgdesc='The ISC BIND nameserver'
url='http://www.isc.org/software/bind/'
license=('custom:ISC')
@@ -27,7 +27,7 @@ source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz"{,.asc}
'named.logrotate'
'localhost.zone'
'127.0.0.zone')
-sha1sums=('2404524f321107d7654e4c64f4174f6c464debb9'
+sha1sums=('c57b5825e36933119e9fd6f43e3f52262e7ff4ed'
'SKIP'
'4d96c9b9ef0aebdad7e79c749536858a344779b5'
'029f89c49550c40ec7a95116b6a33f0e5a041094'
diff --git a/community/bmake/PKGBUILD b/community/bmake/PKGBUILD
index a0c30709c..b75d1be32 100644
--- a/community/bmake/PKGBUILD
+++ b/community/bmake/PKGBUILD
@@ -3,7 +3,7 @@
# Contributor: Imanol Celaya <ilcra1989@gmail.com>
pkgname=bmake
-pkgver=20140214
+pkgver=20140522
pkgrel=1
pkgdesc="Portable version of the NetBSD 'make' build tool"
arch=('i686' 'x86_64')
@@ -13,6 +13,7 @@ source=("http://www.crufty.net/ftp/pub/sjg/bmake-$pkgver.tar.gz")
sha256sums=('0a91ac60b82270c4b4f21a43e66eb51c32b4df55e01ea592e42eb323909a559b')
sha256sums=('0f7ecadb6dcd5e4902a03137daba6fd7756f54e82942b524f3b38d7406b6d83e')
sha256sums=('2ec1771a800431c26361659ab0f96ec5c2536e85b46564eb69fa75a4b12886de')
+sha256sums=('0982d85e933eaa39bd7a5dc834e9b7b93b3b6eda5adfb0fb1a2dacc8878e5860')
prepare() {
cd "$srcdir/$pkgname"
diff --git a/community/chicken/PKGBUILD b/community/chicken/PKGBUILD
index 023e05dfb..cd3e58c9e 100644
--- a/community/chicken/PKGBUILD
+++ b/community/chicken/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 112710 2014-06-05 12:40:44Z arodseth $
+# $Id: PKGBUILD 113116 2014-06-13 20:27:56Z arodseth $
# Maintainer: Alexander Rødseth <rodseth@gmail.com>
# Contributor: Vesa Kaihlavirta <vegai@iki.fi>
# Contributor: <david@pako.st>
# Contributor: Alexander Rødseth <rodseth@gmail.com>
pkgname=chicken
-pkgver=4.9.0
+pkgver=4.9.0.1
pkgrel=1
pkgdesc='Compiler for R5RS scheme, featuring handy extensions'
arch=('x86_64' 'i686')
@@ -13,9 +13,9 @@ url='http://call-cc.org/'
license=('BSD')
makedepends=('inetutils' 'chicken')
options=('staticlibs')
-source=("http://code.call-cc.org/releases/$pkgver/$pkgname-$pkgver.tar.gz")
-#source=("http://code.call-cc.org/releases/${pkgver%.*}/$pkgname-$pkgver.tar.gz")
-sha256sums=('2f2abe1829971c83a6b7e8f58f8aaeb76b3728e2679d99b0f840433af2564a22')
+#source=("http://code.call-cc.org/releases/$pkgver/$pkgname-$pkgver.tar.gz")
+source=("http://code.call-cc.org/releases/${pkgver%.*}/$pkgname-$pkgver.tar.gz")
+sha256sums=('04df7c439c36fc16446bdfa186e7a70258f911d2d826b5216a8e6b1cb2aa2815')
build() {
make -C "$pkgname-$pkgver" -j1 PLATFORM=linux PREFIX=/usr
diff --git a/community/cinnamon-screensaver/PKGBUILD b/community/cinnamon-screensaver/PKGBUILD
index 285cbade6..a851e69f8 100644
--- a/community/cinnamon-screensaver/PKGBUILD
+++ b/community/cinnamon-screensaver/PKGBUILD
@@ -4,7 +4,7 @@
# Jan de Groot <jgc@archlinux.org>
pkgname=cinnamon-screensaver
-pkgver=2.2.3
+pkgver=2.2.4
pkgrel=1
pkgdesc="Screensaver designed to integrate well with the Cinnamon desktop."
arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ depends=('cinnamon-desktop' 'cinnamon-translations' 'dbus-glib' 'libgnomekbd')
makedepends=('intltool' 'gnome-common')
source=($pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-screensaver/archive/$pkgver.tar.gz
cinnamon-screensaver.pam)
-sha256sums=('0893bb4a78dbe0647ffacd38c685da0cbe9d1274cbd40ec063a1615a6b1bf5c8'
+sha256sums=('5fed9a7504856dc362390e3f020b5faa5b4e9a2b4dd09b0e87c04ee18bd40bfa'
'b6ea9e2eb586d94bcabb617a8f1c2958111df87afdbb51f645882bccdc15cbda')
build() {
diff --git a/community/cinnamon-settings-daemon/PKGBUILD b/community/cinnamon-settings-daemon/PKGBUILD
index 53627a0b4..a50b5aa66 100644
--- a/community/cinnamon-settings-daemon/PKGBUILD
+++ b/community/cinnamon-settings-daemon/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 112275 2014-05-30 21:54:37Z faidoc $
+# $Id: PKGBUILD 113154 2014-06-14 15:45:35Z faidoc $
# Maintainer: Alexandre Filgueira (faidoc) <alexfilgueira@antergos.com>
# Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
pkgname=cinnamon-settings-daemon
-pkgver=2.2.3
+pkgver=2.2.4
pkgrel=1
pkgdesc="The Cinnamon Settings daemon"
arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ options=('!emptydirs')
install=cinnamon-settings-daemon.install
url="https://github.com/linuxmint/cinnamon-settings-daemon"
source=("${pkgname}-${pkgver}.tar.gz::https://github.com/linuxmint/cinnamon-settings-daemon/archive/${pkgver}.tar.gz")
-sha256sums=('c8776481e9b544662edb7c340805030d1331d70381c1a1b65db681f03e47be0e')
+sha256sums=('5ee1f3d3af20fdadd5a6b948be667a0968c94f99f7b5a1992f03be0e876ff414')
prepare() {
cd $pkgname-$pkgver
diff --git a/community/cinnamon/PKGBUILD b/community/cinnamon/PKGBUILD
index bb46f1acf..c6edd8018 100644
--- a/community/cinnamon/PKGBUILD
+++ b/community/cinnamon/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 112283 2014-05-30 22:24:47Z faidoc $
+# $Id: PKGBUILD 113158 2014-06-14 16:06:43Z faidoc $
# Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com>
# Contributor: M0Rf30
# Contributor: unifiedlinux
@@ -6,7 +6,7 @@
pkgname=cinnamon
pkgver=2.2.13
-pkgrel=1
+pkgrel=2
pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience"
arch=('i686' 'x86_64')
url="http://cinnamon.linuxmint.com/"
@@ -23,10 +23,12 @@ options=('!emptydirs')
install=${pkgname}.install
source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/archive/$pkgver.tar.gz"
"upower_calender_fix.patch"
- "set_wheel.patch")
+ "set_wheel.patch"
+ "upower_power_applet_fix.patch")
sha256sums=('123261a6a90954adc13f251489d708bc1b611808c63ae87c5189bf717f42483a'
'2edb96f42fb4da07eee635b1159e3ae869c64d7ac80f600bc509190648abcf3e'
- 'dafb2b7b275053aa77d15f2ffab62ad1567aa9d93ed7a82077feeef86b81c7f7')
+ 'dafb2b7b275053aa77d15f2ffab62ad1567aa9d93ed7a82077feeef86b81c7f7'
+ 'da6594cd05f5f9c242cdc179e5af1bd5afb79506e77ac457d2a7e8930692c45c')
prepare() {
cd ${srcdir}/Cinnamon*
@@ -35,6 +37,9 @@ prepare() {
sed -i 's:/usr/bin/python :/usr/bin/python2 :' files/usr/bin/cinnamon-menu-editor
find -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
+ # Fix power applet to work with upower 0.99
+ patch -Np1 -i ../upower_power_applet_fix.patch
+
# Fix calendar applet with upower 0.99
patch -Np1 -i ../upower_calender_fix.patch
diff --git a/community/cinnamon/upower_power_applet_fix.patch b/community/cinnamon/upower_power_applet_fix.patch
new file mode 100644
index 000000000..50652710a
--- /dev/null
+++ b/community/cinnamon/upower_power_applet_fix.patch
@@ -0,0 +1,300 @@
+diff -Naur Cinnamon-2.2.13.orig/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js Cinnamon-2.2.13/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js
+--- Cinnamon-2.2.13.orig/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js 2014-05-25 15:10:49.000000000 -0500
++++ Cinnamon-2.2.13/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js 2014-05-01 14:58:17.000000000 -0500
+@@ -36,21 +36,6 @@
+ PENDING_DISCHARGE: 6
+ };
+
+-const PowerManagerInterface = {
+- name: 'org.cinnamon.SettingsDaemon.Power',
+- methods: [
+- { name: 'GetDevices', inSignature: '', outSignature: 'a(susdut)' },
+- { name: 'GetPrimaryDevice', inSignature: '', outSignature: '(susdut)' },
+- ],
+- signals: [
+- { name: 'PropertiesChanged', inSignature: 's,a{sv},a[s]' },
+- ],
+- properties: [
+- { name: 'Icon', signature: 's', access: 'read' },
+- ]
+-};
+-let PowerManagerProxy = DBus.makeProxyClass(PowerManagerInterface);
+-
+ const SettingsManagerInterface = {
+ name: 'org.freedesktop.DBus.Properties',
+ methods: [
+@@ -63,6 +48,17 @@
+
+ let SettingsManagerProxy = DBus.makeProxyClass(SettingsManagerInterface);
+
++const DisplayDeviceInterface = <interface name="org.freedesktop.UPower.Device">
++ <property name="Type" type="u" access="read"/>
++ <property name="State" type="u" access="read"/>
++ <property name="Percentage" type="d" access="read"/>
++ <property name="TimeToEmpty" type="x" access="read"/>
++ <property name="TimeToFull" type="x" access="read"/>
++ <property name="IsPresent" type="b" access="read"/>
++ <property name="IconName" type="s" access="read"/>
++ </interface>;
++let DisplayDeviceProxy = Gio.DBusProxy.makeProxyWrapper(DisplayDeviceInterface);
++
+ function DeviceItem() {
+ this._init.apply(this, arguments);
+ }
+@@ -145,7 +141,13 @@
+ this.menuManager.addMenu(this.menu);
+
+ //this.set_applet_icon_symbolic_name('battery-missing');
+- this._proxy = new PowerManagerProxy(DBus.session, BUS_NAME, OBJECT_PATH);
++ this._proxy = new DisplayDeviceProxy(Gio.DBus.system,
++ 'org.freedesktop.UPower',
++ '/org/freedesktop/UPower/devices/DisplayDevice',
++ Lang.bind(this, function (proxy, error) {
++ this._proxy.connect('g-properties-changed', Lang.bind(this, this._sync));
++ this._sync();
++ }));
+ this._smProxy = new SettingsManagerProxy(DBus.session, BUS_NAME, OBJECT_PATH);
+
+ let icon = this.actor.get_children()[0];
+@@ -175,153 +177,121 @@
+ this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
+ this.menu.addSettingsAction(_("Power Settings"), 'power');
+
+- this._smProxy.connect('PropertiesChanged', Lang.bind(this, this._devicesChanged));
+- this._devicesChanged();
++ this._smProxy.connect('PropertiesChanged', Lang.bind(this, this._devicesChanged));
+ }
+ catch (e) {
+ global.logError(e);
+ }
+ },
+
++ _getDevice: function () {
++ // FIXME: don't know how to access device_id now, it works like a charm with this magic number
++ return [1, this._proxy.Type, this._proxy.IconName, this._proxy.Percentage, this._proxy.State, this._getSeconds()]
++ },
++
++ _getSeconds: function () {
++ var sec = 0;
++ if (this._proxy.State == UPDeviceState.DISCHARGING) {
++ return this._proxy.TimeToEmpty;
++ } else if (this._proxy.State == UPDeviceState.CHARGING) {
++ return this._proxy.TimeToFull;
++ }
++
++ return sec;
++ },
++
++ _sync: function () {
++ this._devicesChanged();
++ },
++
+ on_applet_clicked: function(event) {
+ this.menu.toggle();
+ },
+
+ _readPrimaryDevice: function() {
+- this._proxy.GetPrimaryDeviceRemote(Lang.bind(this, function(device, error) {
+- if (error) {
+- this._hasPrimary = false;
+- this._primaryDeviceId = null;
+- this._batteryItem.actor.hide();
+- return;
++ var device = this._getDevice();
++ global.logError(device);
++
++ let [device_id, device_type, icon, percentage, state, seconds] = device;
++ if (device_type == UPDeviceType.BATTERY) {
++ this._hasPrimary = true;
++ let time = Math.round(seconds / 60);
++ if (time == 0) {
++ // 0 is reported when UPower does not have enough data
++ // to estimate battery life
++ this._batteryItem.label.text = _("Estimating...");
++ } else {
++ let minutes = time % 60;
++ let hours = Math.floor(time / 60);
++ let timestring;
++ if (time > 60) {
++ if (minutes == 0) {
++ timestring = ngettext("%d hour remaining", "%d hours remaining", hours).format(hours);
++ } else {
++ let template = _("%d %s %d %s remaining");
++ timestring = template.format (hours, ngettext("hour", "hours", hours), minutes, ngettext("minute", "minutes", minutes));
++ }
++ } else timestring = ngettext("%d minute remaining", "%d minutes remaining", minutes).format(minutes);
++ this._batteryItem.label.text = timestring;
++ this.set_applet_tooltip(timestring);
+ }
+- let [device_id, device_type, icon, percentage, state, seconds] = device;
+- if (device_type == UPDeviceType.BATTERY) {
+- this._hasPrimary = true;
+- let time = Math.round(seconds / 60);
+- if (time == 0) {
+- // 0 is reported when UPower does not have enough data
+- // to estimate battery life
+- this._batteryItem.label.text = _("Estimating...");
+- } else {
+- let minutes = time % 60;
+- let hours = Math.floor(time / 60);
+- let timestring;
+- if (time > 60) {
+- if (minutes == 0) {
+- timestring = ngettext("%d hour remaining", "%d hours remaining", hours).format(hours);
+- } else {
+- /* TRANSLATORS: this is a time string, as in "%d hours %d minutes remaining" */
+- let template = _("%d %s %d %s remaining");
+-
+- timestring = template.format (hours, ngettext("hour", "hours", hours), minutes, ngettext("minute", "minutes", minutes));
+- }
+- } else
+- timestring = ngettext("%d minute remaining", "%d minutes remaining", minutes).format(minutes);
+- this._batteryItem.label.text = timestring;
+- this.set_applet_tooltip(timestring);
+- }
+ this._primaryPercentage.text = C_("percent of battery remaining", "%d%%").format(Math.round(percentage));
+ this._batteryItem.actor.show();
+- } else {
+- this._hasPrimary = false;
+- this._batteryItem.actor.hide();
+- }
+-
+- this._primaryDeviceId = device_id;
+- }));
+- },
+-
+- _readOtherDevices: function() {
+- this._proxy.GetDevicesRemote(Lang.bind(this, function(devices, error) {
+- this._deviceItems.forEach(function(i) { i.destroy(); });
+- this._deviceItems = [];
+-
+- if (error) {
+- return;
+- }
+-
+- let position = 0;
+- for (let i = 0; i < devices.length; i++) {
+- let [device_id, device_type] = devices[i];
+-
+- if (this._hasPrimary == false) {
+- if (device_type == UPDeviceType.AC_POWER) {
+- this.set_applet_tooltip(_("AC adapter"));
+- }
+- else if (device_type == UPDeviceType.BATTERY) {
+- this.set_applet_tooltip(_("Laptop battery"));
+- }
+- }
+-
+- if (device_type == UPDeviceType.AC_POWER || (this._hasPrimary && device_id == this._primaryDeviceId))
+- continue;
+-
+- let item = new DeviceItem (devices[i]);
+- this._deviceItems.push(item);
+- this.menu.addMenuItem(item, this._otherDevicePosition + position);
+- position++;
+- }
+- }));
++ } else {
++ this._hasPrimary = false;
++ this._batteryItem.actor.hide();
++ }
++ this._primaryDeviceId = device_id;
+ },
+
+ on_panel_height_changed: function() {
+ this._devicesChanged();
+ },
+
+- _devicesChanged: function() {
+- this._proxy.GetRemote('Icon', Lang.bind(this, function(icon, error) {
+- if (icon) {
+- this.set_applet_icon_symbolic_name('battery-missing');
+- let gicon = Gio.icon_new_for_string(icon);
+- this._applet_icon.gicon = gicon;
+- this.actor.show();
+- } else {
+- this.menu.close();
+- this.actor.hide();
+- }
+- }));
++ _devicesChanged: function() {
++ let icon = this._proxy.IconName;
++ if (icon) {
++ this.set_applet_icon_symbolic_name('battery-missing');
++ let gicon = Gio.icon_new_for_string(icon);
++ this._applet_icon.gicon = gicon;
++ this.actor.show();
++ } else {
++ this.menu.close();
++ this.actor.hide();
++ }
++
+ this._readPrimaryDevice();
+- this._readOtherDevices();
+ this._updateLabel();
+ },
+
+ _updateLabel: function() {
+- this._proxy.GetDevicesRemote(Lang.bind(this, function(devices, error) {
+- if (error) {
+- this._mainLabel.set_text("");
+- return;
++ var device = this._getDevice();
++ if (this.labelinfo != "nothing") {
++ let [device_id, device_type, icon, percentage, state, time] = device;
++ let labelText = "";
++
++ if (this.labelinfo == "percentage" || time == 0) {
++ labelText = C_("percent of battery remaining", "%d%%").format(Math.round(percentage));
++ }
++ else if (this.labelinfo == "time") {
++ let seconds = Math.round(time / 60);
++ let minutes = Math.floor(seconds % 60);
++ let hours = Math.floor(seconds / 60);
++ labelText = C_("time of battery remaining", "%d:%02d").format(hours,minutes);
+ }
+- if (this.labelinfo != "nothing") {
+- for (let i = 0; i < devices.length; i++) {
+- let [device_id, device_type, icon, percentage, state, time] = devices[i];
+- if (device_type == UPDeviceType.BATTERY || device_id == this._primaryDeviceId) {
+- let labelText = "";
+-
+- if (this.labelinfo == "percentage" || time == 0) {
+- labelText = C_("percent of battery remaining", "%d%%").format(Math.round(percentage));
+- }
+- else if (this.labelinfo == "time") {
+- let seconds = Math.round(time / 60);
+- let minutes = Math.floor(seconds % 60);
+- let hours = Math.floor(seconds / 60);
+- labelText = C_("time of battery remaining", "%d:%02d").format(hours,minutes);
+- }
+- else if (this.labelinfo == "percentage_time") {
+- let seconds = Math.round(time / 60);
+- let minutes = Math.floor(seconds % 60);
+- let hours = Math.floor(seconds / 60);
+- labelText = C_("percent of battery remaining", "%d%%").format(Math.round(percentage)) + " (" +
+- C_("time of battery remaining", "%d:%02d").format(hours,minutes) + ")";
+- }
+- this._mainLabel.set_text(labelText);
+- if (device_id == this._primaryDeviceId) {
+- return;
+- }
+- }
+- }
++ else if (this.labelinfo == "percentage_time") {
++ let seconds = Math.round(time / 60);
++ let minutes = Math.floor(seconds % 60);
++ let hours = Math.floor(seconds / 60);
++ labelText = C_("percent of battery remaining", "%d%%").format(Math.round(percentage)) + " (" +
++ C_("time of battery remaining", "%d:%02d").format(hours,minutes) + ")";
+ }
+- }));
++
++ this._mainLabel.set_text(labelText);
++ return;
++ }
++ // Display disabled or no battery found... hot-unplugged?
++ this._mainLabel.set_text("");
+ },
+
+ on_applet_removed_from_panel: function() {
diff --git a/community/converseen/PKGBUILD b/community/converseen/PKGBUILD
index b0d24353b..6bbd18cc4 100644
--- a/community/converseen/PKGBUILD
+++ b/community/converseen/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 110955 2014-05-10 15:28:56Z giovanni $
+# $Id: PKGBUILD 113094 2014-06-13 13:49:10Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: archtux <antonio.arias99999 at gmail.com>
pkgname=converseen
-pkgver=0.7.1
+pkgver=0.7.2
pkgrel=1
pkgdesc="The batch image converter and resizer"
arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ depends=('imagemagick' 'qt4' 'libwmf' 'openexr' 'libwebp')
makedepends=('cmake')
install=converseen.install
source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('bf2f1c71d8faf7e7c913680e24284858')
+md5sums=('bf64fc74758be272f7a91e9480a7175e')
build() {
cd "${srcdir}"
diff --git a/community/fbv/PKGBUILD b/community/fbv/PKGBUILD
index aef9871e8..a9535a81f 100644
--- a/community/fbv/PKGBUILD
+++ b/community/fbv/PKGBUILD
@@ -1,26 +1,26 @@
-# $Id: PKGBUILD 98028 2013-10-04 09:54:24Z spupykin $
+# $Id: PKGBUILD 113159 2014-06-14 19:22:12Z andyrtr $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Aectann <aectann@infoline.su>
pkgname=fbv
pkgver=1.0b
-pkgrel=8
+pkgrel=9
pkgdesc="FrameBuffer image viewer"
arch=('i686' 'x86_64')
url="http://s-tech.elsat.net.pl/fbv/"
license=('GPL')
depends=('libpng' 'giflib' 'libjpeg')
source=(http://s-tech.elsat.net.pl/fbv/$pkgname-$pkgver.tar.gz
- giflib-5.0.patch)
+ giflib-5.1.patch)
md5sums=('3e466375b930ec22be44f1041e77b55d'
- '6310899c97c4226352ad409c1c7fefb3')
+ 'f91404fb82f0b6b9fc0e0716f0c182c0')
build() {
cd $srcdir/$pkgname-$pkgver
./configure --prefix=/usr --mandir=/usr/share/man
sed -i 's|LIBS.*|LIBS=-lpng -ljpeg -lgif|' Make.conf
sed -i 's|setjmp(png_ptr->jmpbuf)|setjmp(png_jmpbuf(png_ptr))|' png.c
- patch -Np1 -i ../giflib-5.0.patch
+ patch -Np1 -i ../giflib-5.1.patch
make
}
diff --git a/community/fbv/giflib-5.0.patch b/community/fbv/giflib-5.0.patch
deleted file mode 100644
index 462e2fb04..000000000
--- a/community/fbv/giflib-5.0.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -rupN a/gif.c b/gif.c
---- a/gif.c 2003-08-24 22:23:02.000000000 +0200
-+++ b/gif.c 2013-07-30 10:27:55.851099159 +0200
-@@ -81,7 +81,7 @@ int fh_gif_load(char *name,unsigned char
- ColorMapObject *cmap;
- int cmaps;
-
-- gft=DGifOpenFileName(name);
-+ gft=DGifOpenFileName(name, NULL);
- if(gft==NULL){printf("err5\n"); gflush;} //////////
- do
- {
-@@ -184,7 +184,7 @@ int fh_gif_getsize(char *name,int *x,int
- int extcode;
- GifRecordType rt;
-
-- gft=DGifOpenFileName(name);
-+ gft=DGifOpenFileName(name, NULL);
- if(gft==NULL) gflush;
- do
- {
diff --git a/community/fbv/giflib-5.1.patch b/community/fbv/giflib-5.1.patch
new file mode 100644
index 000000000..1d819124f
--- /dev/null
+++ b/community/fbv/giflib-5.1.patch
@@ -0,0 +1,62 @@
+diff -wbBur fbv-1.0b/gif.c fbv-1.0b.my/gif.c
+--- fbv-1.0b/gif.c 2003-08-25 00:23:02.000000000 +0400
++++ fbv-1.0b.my/gif.c 2014-05-29 18:39:41.337332872 +0400
+@@ -31,10 +31,10 @@
+ #include <string.h>
+ #define min(a,b) ((a) < (b) ? (a) : (b))
+ #define gflush return(FH_ERROR_FILE);
+-#define grflush { DGifCloseFile(gft); return(FH_ERROR_FORMAT); }
+-#define mgrflush { free(lb); free(slb); DGifCloseFile(gft); return(FH_ERROR_FORMAT); }
++#define grflush { DGifCloseFile(gft, NULL); return(FH_ERROR_FORMAT); }
++#define mgrflush { free(lb); free(slb); DGifCloseFile(gft, NULL); return(FH_ERROR_FORMAT); }
+ #define agflush return(FH_ERROR_FORMAT);
+-#define agrflush { DGifCloseFile(gft); return(FH_ERROR_FORMAT); }
++#define agrflush { DGifCloseFile(gft, NULL); return(FH_ERROR_FORMAT); }
+
+
+ int fh_gif_id(char *name)
+@@ -81,7 +81,7 @@
+ ColorMapObject *cmap;
+ int cmaps;
+
+- gft=DGifOpenFileName(name);
++ gft=DGifOpenFileName(name, NULL);
+ if(gft==NULL){printf("err5\n"); gflush;} //////////
+ do
+ {
+@@ -170,7 +170,7 @@
+ }
+ }
+ while( rt!= TERMINATE_RECORD_TYPE );
+- DGifCloseFile(gft);
++ DGifCloseFile(gft, NULL);
+ return(FH_ERROR_OK);
+ }
+
+@@ -184,7 +184,7 @@
+ int extcode;
+ GifRecordType rt;
+
+- gft=DGifOpenFileName(name);
++ gft=DGifOpenFileName(name, NULL);
+ if(gft==NULL) gflush;
+ do
+ {
+@@ -197,7 +197,7 @@
+ px=gft->Image.Width;
+ py=gft->Image.Height;
+ *x=px; *y=py;
+- DGifCloseFile(gft);
++ DGifCloseFile(gft, NULL);
+ return(FH_ERROR_OK);
+ break;
+ case EXTENSION_RECORD_TYPE:
+@@ -210,7 +210,7 @@
+ }
+ }
+ while( rt!= TERMINATE_RECORD_TYPE );
+- DGifCloseFile(gft);
++ DGifCloseFile(gft, NULL);
+ return(FH_ERROR_FORMAT);
+ }
+ #endif
diff --git a/community/fcron/PKGBUILD b/community/fcron/PKGBUILD
index c13927264..35c27c108 100644
--- a/community/fcron/PKGBUILD
+++ b/community/fcron/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 111045 2014-05-12 10:09:29Z seblu $
+# $Id: PKGBUILD 113140 2014-06-14 11:13:18Z ttoepper $
# Contributor: Giorgio Lando <lando at imap dot cc>
# Contributor: Sergej Pupykin
# Contributor: Thomas Bächler
@@ -7,7 +7,7 @@
pkgname=fcron
pkgver=3.1.3
-pkgrel=1
+pkgrel=2
pkgdesc='Feature-rich cron implementation'
arch=(i686 x86_64)
url='http://fcron.free.fr'
@@ -24,7 +24,8 @@ provides=('cron')
conflicts=('dcron')
backup=('etc/fcron/fcron.conf'
'etc/fcron/fcron.allow'
- 'etc/fcron/fcron.deny')
+ 'etc/fcron/fcron.deny'
+ 'var/spool/fcron/systab.orig')
options=('emptydirs' '!makeflags')
install=$pkgname.install
source=("http://fcron.free.fr/archives/$pkgname-$pkgver.src.tar.gz"
diff --git a/community/fossil/PKGBUILD b/community/fossil/PKGBUILD
index 1c105dbdb..d1a6bb089 100644
--- a/community/fossil/PKGBUILD
+++ b/community/fossil/PKGBUILD
@@ -1,18 +1,19 @@
-# $Id: PKGBUILD 107210 2014-03-14 15:09:48Z anatolik $
+# $Id: PKGBUILD 113102 2014-06-13 15:40:40Z anatolik $
# Maintainer: Anatol Pomozov <anatol pomozov at gmail>
# Contributor: Daniel YC Lin <dlin.tw at gmail>
# Contributor: Konstantin Plotnikov <kostyapl at gmail dot com>
pkgname=fossil
-pkgver=1.28
-_date_pkgver=20140127173344
+pkgver=1.29
+_date_pkgver=20140612172556
# NOTE: update _date_pkgver from http://www.fossil-scm.org/download.html
-pkgrel=3
+pkgrel=1
pkgdesc='Simple, high-reliability, distributed software configuration management'
arch=(i686 x86_64)
license=(BSD)
url='http://www.fossil-scm.org'
depends=(openssl zlib)
+backup=(etc/xinetd.d/fossil)
source=(
fossil.socket
fossil.service
@@ -24,7 +25,7 @@ sha256sums=('f885e17998dc1eece1688a75e516663462fe72a7f4f132def4132055777c7ff8'
'c4973079facf209d3757db81df08f8d0843ede242f2a0c12281720da65e3b166'
'2f9a141fadfb7cb5225f0d65a308949bbc592bff9d567b5c472edb413c81f5aa'
'e22e19dba1a4be6a62af0b77ff0267c2a0f19edf2f6a9133ee64246fae5d87da'
- 'aca7c5a7c39ae2880712020e089c9c12543ba656c71d8cf8ac50e3c8871baa80')
+ 'c9882f9beb95695db7402dbd03d8fbf082e1109429175af4d57e089bcd2db387')
build() {
cd fossil-src-$_date_pkgver
diff --git a/community/gdal/PKGBUILD b/community/gdal/PKGBUILD
index 23d749363..68c68b7c3 100644
--- a/community/gdal/PKGBUILD
+++ b/community/gdal/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 112475 2014-06-02 16:15:40Z anatolik $
+# $Id: PKGBUILD 113160 2014-06-14 19:22:13Z andyrtr $
# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
# Contributor: William Rea <sillywilly@gmail.com>
pkgname=gdal
pkgver=1.11.0
-pkgrel=2
+pkgrel=3
pkgdesc="A translator library for raster geospatial data formats"
arch=('i686' 'x86_64')
url="http://www.gdal.org/"
@@ -19,10 +19,12 @@ optdepends=('postgresql: postgresql database support'
changelog=$pkgname.changelog
source=(http://download.osgeo.org/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz
fix_json_012.patch
- gdal-1.5.1-python-install.patch)
+ gdal-1.5.1-python-install.patch
+ giflib51.patch)
sha256sums=('989db33ff411e2c888348e71edec5ad06c74ed68781ebfbc4e85179b9d65aafe'
'0ef2a20e9a0e86f85eab9a4a1e5caf7364f1d547deed6f2249fe542d4d2881f4'
- '55a0a961b2d1caddf80f18b6763a96690b0b6443fbd5a0c89e29503ded3bcea6')
+ '55a0a961b2d1caddf80f18b6763a96690b0b6443fbd5a0c89e29503ded3bcea6'
+ '99bb57b514101a53fda4f163efffb0d9859423c9bd51766bbf99313f1eb0cafc')
prepare() {
cd "${srcdir}/$pkgname-$pkgver"
@@ -31,6 +33,8 @@ prepare() {
# Fix compilation failure related to recent json-c changes. FS#40584
patch -Np0 -i "${srcdir}/fix_json_012.patch"
+ patch -Np0 -i ../giflib51.patch
+
# python2 fixes
sed -i 's_python python1.5_python2 python python1.5_' configure
for file in swig/python/{,osgeo/,samples/,scripts/}*.py; do
diff --git a/community/gdal/giflib51.patch b/community/gdal/giflib51.patch
new file mode 100644
index 000000000..7c18ed590
--- /dev/null
+++ b/community/gdal/giflib51.patch
@@ -0,0 +1,139 @@
+diff -ruN frmts/gif.orig/biggifdataset.cpp frmts/gif/biggifdataset.cpp
+--- frmts/gif.orig/biggifdataset.cpp 2014-04-16 20:04:33.000000000 +0000
++++ frmts/gif/biggifdataset.cpp 2014-06-11 12:39:28.420405033 +0000
+@@ -339,7 +339,11 @@
+ /* If the file is already open, close it so we can restart. */
+ /* -------------------------------------------------------------------- */
+ if( hGifFile != NULL )
++#if defined(GIFLIB_MAJOR) && GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1
++ DGifCloseFile( hGifFile, NULL );
++#else
+ DGifCloseFile( hGifFile );
++#endif
+
+ /* -------------------------------------------------------------------- */
+ /* If we are actually reopening, then we assume that access to */
+@@ -413,7 +417,11 @@
+
+ if( RecordType != IMAGE_DESC_RECORD_TYPE )
+ {
++#if defined(GIFLIB_MAJOR) && GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1
++ DGifCloseFile( hGifFile, NULL );
++#else
+ DGifCloseFile( hGifFile );
++#endif
+ hGifFile = NULL;
+
+ CPLError( CE_Failure, CPLE_OpenFailed,
+@@ -423,7 +431,11 @@
+
+ if (DGifGetImageDesc(hGifFile) == GIF_ERROR)
+ {
++#if defined(GIFLIB_MAJOR) && GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1
++ DGifCloseFile( hGifFile, NULL );
++#else
+ DGifCloseFile( hGifFile );
++#endif
+ hGifFile = NULL;
+
+ CPLError( CE_Failure, CPLE_OpenFailed,
+diff -ruN frmts/gif.orig/gifabstractdataset.cpp frmts/gif/gifabstractdataset.cpp
+--- frmts/gif.orig/gifabstractdataset.cpp 2014-04-16 20:04:33.000000000 +0000
++++ frmts/gif/gifabstractdataset.cpp 2014-06-11 12:54:25.609072106 +0000
+@@ -82,7 +82,11 @@
+ }
+
+ if( hGifFile )
++#if defined(GIFLIB_MAJOR) && GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1
++ DGifCloseFile( hGifFile, NULL );
++#else
+ DGifCloseFile( hGifFile );
++#endif
+
+ if( fp != NULL )
+ VSIFCloseL( fp );
+diff -ruN frmts/gif.orig/gifdataset.cpp frmts/gif/gifdataset.cpp
+--- frmts/gif.orig/gifdataset.cpp 2014-04-16 20:04:33.000000000 +0000
++++ frmts/gif/gifdataset.cpp 2014-06-11 12:45:37.318469917 +0000
+@@ -386,13 +386,21 @@
+ CPLDebug( "GIF",
+ "Due to limitations of the GDAL GIF driver we deliberately avoid\n"
+ "opening large GIF files (larger than 100 megapixels).");
++#if defined(GIFLIB_MAJOR) && GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1
++ DGifCloseFile( hGifFile, NULL );
++#else
+ DGifCloseFile( hGifFile );
++#endif
+ VSIFCloseL( fp );
+ return NULL;
+ }
+ }
+
++#if defined(GIFLIB_MAJOR) && GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1
++ DGifCloseFile( hGifFile, NULL );
++#else
+ DGifCloseFile( hGifFile );
++#endif
+
+ VSIFSeekL( fp, 0, SEEK_SET);
+
+@@ -417,7 +425,11 @@
+ if( nGifErr != GIF_OK || hGifFile->SavedImages == NULL )
+ {
+ VSIFCloseL( fp );
++#if defined(GIFLIB_MAJOR) && GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1
++ DGifCloseFile(hGifFile, NULL);
++#else
+ DGifCloseFile(hGifFile);
++#endif
+
+ if( nGifErr == D_GIF_ERR_DATA_TOO_BIG )
+ {
+@@ -649,7 +661,11 @@
+ {
+ GifFreeMapObject(psGifCT);
+ GDALPrintGifError(hGifFile, "Error writing gif file.");
++#if defined(GIFLIB_MAJOR) && GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1
++ EGifCloseFile(hGifFile, NULL);
++#else
+ EGifCloseFile(hGifFile);
++#endif
+ VSIFCloseL( fp );
+ return NULL;
+ }
+@@ -673,7 +689,11 @@
+ if (EGifPutImageDesc(hGifFile, 0, 0, nXSize, nYSize, bInterlace, NULL) == GIF_ERROR )
+ {
+ GDALPrintGifError(hGifFile, "Error writing gif file.");
++#if defined(GIFLIB_MAJOR) && GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1
++ EGifCloseFile(hGifFile, NULL);
++#else
+ EGifCloseFile(hGifFile);
++#endif
+ VSIFCloseL( fp );
+ return NULL;
+ }
+@@ -756,7 +776,11 @@
+ /* -------------------------------------------------------------------- */
+ /* cleanup */
+ /* -------------------------------------------------------------------- */
++#if defined(GIFLIB_MAJOR) && GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1
++ if (EGifCloseFile(hGifFile, NULL) == GIF_ERROR)
++#else
+ if (EGifCloseFile(hGifFile) == GIF_ERROR)
++#endif
+ {
+ CPLError( CE_Failure, CPLE_AppDefined,
+ "EGifCloseFile() failed.\n" );
+@@ -807,7 +831,11 @@
+
+ error:
+ if (hGifFile)
++#if defined(GIFLIB_MAJOR) && GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1
++ EGifCloseFile(hGifFile, NULL);
++#else
+ EGifCloseFile(hGifFile);
++#endif
+ if (fp)
+ VSIFCloseL( fp );
+ if (pabyScanline)
diff --git a/community/gimp-plugin-mathmap/PKGBUILD b/community/gimp-plugin-mathmap/PKGBUILD
index d99fc7806..6038f39f7 100644
--- a/community/gimp-plugin-mathmap/PKGBUILD
+++ b/community/gimp-plugin-mathmap/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 94923 2013-08-01 07:01:15Z bpiotrowski $
+# $Id: PKGBUILD 113161 2014-06-14 19:22:14Z andyrtr $
# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
# Contributor: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org>
# Contributor: Serge Gielkens <gielkens.serge@mumeli.org>
pkgname=gimp-plugin-mathmap
pkgver=1.3.5
-pkgrel=4
+pkgrel=5
pkgdesc="A GIMP plug-in which allows distortion of images specified by mathematical formulae"
arch=('i686' 'x86_64')
url="http://www.complang.tuwien.ac.at/schani/mathmap/"
@@ -14,21 +14,25 @@ makedepends=('doxygen' 'unzip')
provides=('gimp-mathmap')
replaces=('gimp-mathmap')
source=(http://www.complang.tuwien.ac.at/schani/mathmap/files/mathmap-${pkgver}.tar.gz \
- fix_libnoise_build.patch libpng15.patch giflib-5.0.patch)
+ fix_libnoise_build.patch libpng15.patch giflib-5.1.patch)
md5sums=('6ff66d070ea410dee1a27283d05b8beb'
'eca40de0ba0e6b8d34b7d1f904bc3d18'
'9780d6354b7380b772c4616253ecee54'
- '9cc8eb13526056d8f3d06cc3e984a719')
+ 'a4dae904ede98ee8d3104bcfd285cec5')
-build() {
+prepare() {
cd "$srcdir/mathmap-$pkgver"
# fix problem with building libnoise
patch -Np1 < "$srcdir"/fix_libnoise_build.patch
# fix for libpng 1.5
patch -Np1 < "$srcdir"/libpng15.patch
- # fix for giflib 5.0
- patch -Np1 < "$srcdir"/giflib-5.0.patch
+ # fix for giflib 5.1
+ patch -Np1 < "$srcdir"/giflib-5.1.patch
+}
+
+build() {
+ cd "$srcdir/mathmap-$pkgver"
make
}
diff --git a/community/gimp-plugin-mathmap/giflib-5.0.patch b/community/gimp-plugin-mathmap/giflib-5.0.patch
deleted file mode 100644
index d9036a451..000000000
--- a/community/gimp-plugin-mathmap/giflib-5.0.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -rupN a/rwimg/rwgif.c b/rwimg/rwgif.c
---- a/rwimg/rwgif.c 2009-08-23 13:56:14.000000000 +0200
-+++ b/rwimg/rwgif.c 2013-07-30 10:59:45.391015754 +0200
-@@ -54,7 +54,7 @@ open_gif_file (const char *filename, int
-
- assert(data != 0);
-
-- data->file = DGifOpenFileName(filename);
-+ data->file = DGifOpenFileName(filename, NULL);
-
- assert(data->file !=0);
-
diff --git a/community/gimp-plugin-mathmap/giflib-5.1.patch b/community/gimp-plugin-mathmap/giflib-5.1.patch
new file mode 100644
index 000000000..22b75145a
--- /dev/null
+++ b/community/gimp-plugin-mathmap/giflib-5.1.patch
@@ -0,0 +1,21 @@
+diff -rup mathmap-1.3.5/rwimg/rwgif.c mathmap-1.3.5.new/rwimg/rwgif.c
+--- mathmap-1.3.5/rwimg/rwgif.c 2009-08-23 13:56:14.000000000 +0200
++++ mathmap-1.3.5.new/rwimg/rwgif.c 2014-05-29 11:31:51.388388393 +0200
+@@ -54,7 +54,7 @@ open_gif_file (const char *filename, int
+
+ assert(data != 0);
+
+- data->file = DGifOpenFileName(filename);
++ data->file = DGifOpenFileName(filename, NULL);
+
+ assert(data->file !=0);
+
+@@ -137,7 +137,7 @@ open_gif_file (const char *filename, int
+ }
+ free(buffer);
+
+- assert(DGifCloseFile(data->file) == GIF_OK);
++ assert(DGifCloseFile(data->file, NULL) == GIF_OK);
+
+ return data;
+ }
diff --git a/community/gmic/PKGBUILD b/community/gmic/PKGBUILD
index 6f470a993..2f63c9e15 100644
--- a/community/gmic/PKGBUILD
+++ b/community/gmic/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 112721 2014-06-05 14:18:22Z spupykin $
+# $Id: PKGBUILD 113204 2014-06-16 10:29:35Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
# Contributor: farid <farid at archlinuc-br.org>
@@ -6,14 +6,14 @@
pkgbase=gmic
pkgname=("gmic" "gimp-plugin-gmic" "zart")
-pkgver=1.5.9.1
+pkgver=1.5.9.2
pkgrel=1
arch=("i686" "x86_64")
url="http://gmic.sourceforge.net"
license=("custom:CeCILL")
makedepends=('gimp' 'qt4' 'fftw' 'openexr' 'opencv' 'mesa' 'gtk2')
source=("http://downloads.sourceforge.net/sourceforge/gmic/gmic_${pkgver}.tar.gz")
-md5sums=('1bf0cbaaaa013b6d363d413e70649515')
+md5sums=('5cdd5d4aeedcb7943c32104d1adfb682')
prepare() {
cd "${srcdir}/gmic-${pkgver}"
diff --git a/community/gnustep-gui/PKGBUILD b/community/gnustep-gui/PKGBUILD
index a5fbb6ce3..d07fdea0a 100644
--- a/community/gnustep-gui/PKGBUILD
+++ b/community/gnustep-gui/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 111472 2014-05-19 09:49:08Z spupykin $
+# $Id: PKGBUILD 113162 2014-06-14 19:22:15Z andyrtr $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
# Contributor: Sebastian Sareyko <public@nooms.de>
pkgname=gnustep-gui
pkgver=0.24.0
-pkgrel=1
+pkgrel=2
pkgdesc="The GNUstep GUI class library"
arch=('i686' 'x86_64')
url="http://www.gnustep.org/"
@@ -16,17 +16,19 @@ conflicts=('gnustep-gui-svn')
groups=('gnustep-core')
options=('!makeflags')
source=(ftp://ftp.gnustep.org/pub/gnustep/core/$pkgname-$pkgver.tar.gz
- giflib-5.0.patch)
+ giflib-5.1.patch)
md5sums=('bd289f0c7b2626d093ad92364069b9a7'
- 'b998c0bc3e2bc260c2779d7a50ce6407')
+ '78b6470b9a43ac7025621fef07d2faef')
+
+prepare() {
+ cd $srcdir/$pkgname-$pkgver
+ patch -Np1 -i ../giflib-5.1.patch
+}
build() {
cd $srcdir/$pkgname-$pkgver
. /etc/profile.d/GNUstep.sh
./configure --prefix=/usr --sysconfdir=/etc/GNUstep
-# sed -i 's|#include "GNUstepBase/preface.h"|//#include "GNUstepBase/preface.h" |' Source/GSGuiPrivate.h
-# sed -i 's|png_sizeof|sizeof|g' Source/NSBitmapImageRep+PNG.m
-# patch -Np1 -i ../giflib-5.0.patch
make
}
diff --git a/community/gnustep-gui/giflib-5.0.patch b/community/gnustep-gui/giflib-5.0.patch
deleted file mode 100644
index 3d8a32d27..000000000
--- a/community/gnustep-gui/giflib-5.0.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -rupN a/Source/NSBitmapImageRep+GIF.m b/Source/NSBitmapImageRep+GIF.m
---- a/Source/NSBitmapImageRep+GIF.m 2013-01-13 14:57:37.000000000 +0100
-+++ b/Source/NSBitmapImageRep+GIF.m 2013-07-30 11:30:19.630935640 +0200
-@@ -142,7 +142,7 @@ static int gs_gif_output(GifFileType *fi
- }
-
- gs_gif_init_input_source(&src, imageData);
-- file = DGifOpen(&src, gs_gif_input);
-+ file = DGifOpen(&src, gs_gif_input, NULL);
- if (file == NULL)
- {
- /* we do not use giferror here because it doesn't
-@@ -216,7 +216,7 @@ static int gs_gif_output(GifFileType *fi
-
- /* open the image */
- gs_gif_init_input_source(&src, imageData);
-- file = DGifOpen(&src, gs_gif_input);
-+ file = DGifOpen(&src, gs_gif_input, NULL);
- if (file == NULL)
- {
- /* we do not use giferror here because it doesn't
diff --git a/community/gnustep-gui/giflib-5.1.patch b/community/gnustep-gui/giflib-5.1.patch
new file mode 100644
index 000000000..61b2aef80
--- /dev/null
+++ b/community/gnustep-gui/giflib-5.1.patch
@@ -0,0 +1,30 @@
+diff -wbBur gnustep-gui-0.24.0/Source/NSBitmapImageRep+GIF.m gnustep-gui-0.24.0.my/Source/NSBitmapImageRep+GIF.m
+--- gnustep-gui-0.24.0/Source/NSBitmapImageRep+GIF.m 2013-11-24 15:56:33.000000000 +0400
++++ gnustep-gui-0.24.0.my/Source/NSBitmapImageRep+GIF.m 2014-05-29 18:48:13.333993653 +0400
+@@ -161,7 +161,7 @@
+ return NO;
+ }
+
+- DGifCloseFile(file);
++ DGifCloseFile(file, NULL);
+ return YES;
+ }
+
+@@ -180,7 +180,7 @@
+ SET_ERROR_MSG(msg); \
+ if (file != NULL) \
+ {\
+- DGifCloseFile(file); \
++ DGifCloseFile(file, NULL); \
+ }\
+ if (imgBuffer != NULL) \
+ {\
+@@ -392,7 +392,7 @@
+ withValue: [NSNumber numberWithInt: 0]];
+
+ /* don't forget to close the gif */
+- DGifCloseFile(file);
++ DGifCloseFile(file, NULL);
+
+ return self;
+ }
diff --git a/community/goaccess/PKGBUILD b/community/goaccess/PKGBUILD
index 8d524d698..072f24bed 100644
--- a/community/goaccess/PKGBUILD
+++ b/community/goaccess/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 111676 2014-05-22 14:14:12Z fyan $
+# $Id: PKGBUILD 113241 2014-06-16 12:52:06Z fyan $
# Maintainer: Felix Yan <felixonmars@gmail.com>
# Contributor: Josh VanderLinden <arch@cloudlery.com>
# Contributor: Nicolas Storme <nicolas@atelier-web.com>
pkgname=goaccess
-pkgver=0.8
+pkgver=0.8.1
pkgrel=1
pkgdesc="An open source real-time web log analyzer and interactive viewer"
arch=('i686' 'x86_64')
@@ -25,4 +25,4 @@ package() {
make prefix="$pkgdir/usr" sysconfdir="$pkgdir/etc" install
}
-sha512sums=('3e738c02c5836e8b20a6c91c4a410440e0aa1821cb39a7f5b3be3baa8263f5ef442ca9e86fcc3a95c1274187ca986ce6129ec67477cebaf1e9449dcfdb852545')
+sha512sums=('91399abc97bd64d0a7174e9ebde54a7b621aca660375d1571354941e5334e7a04cf7acd33d6f8610a4affe20dfc22399e20450813d2aaf33e858e4b64b893f7f')
diff --git a/community/gpsbabel/PKGBUILD b/community/gpsbabel/PKGBUILD
index a7aad9ec6..f5c5214fc 100644
--- a/community/gpsbabel/PKGBUILD
+++ b/community/gpsbabel/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 111627 2014-05-21 14:04:04Z spupykin $
+# $Id: PKGBUILD 113232 2014-06-16 11:33:16Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
# Contributor: William Rea <sillywilly@gmail.com>
pkgname=gpsbabel
pkgver=1.5.1
-pkgrel=1
+pkgrel=2
pkgdesc="Reads, writes, and manipulates GPS waypoints in a variety of formats"
arch=('i686' 'x86_64')
url="http://www.gpsbabel.org"
license=('GPL')
-depends=('libusb-compat' 'expat')
-makedepends=('fop' 'qt4' 'libxml2' 'libxslt' 'gtk2' 'lcms2' 'qtwebkit' 'java-environment' 'docbook-xsl')
-optdepends=('qt4' 'qtwebkit')
+depends=('libusb-compat' 'expat' 'qt4')
+makedepends=('fop' 'libxml2' 'libxslt' 'gtk2' 'lcms2' 'qtwebkit' 'java-environment' 'docbook-xsl')
+optdepends=('qtwebkit')
options=('docs')
source=("http://arch.p5n.pp.ru/~sergej/dl/2014/gpsbabel-$pkgver.tar.gz")
md5sums=('0016c6313b3a5b97afd8d1d8f23abbe1')
diff --git a/community/gpsdrive/PKGBUILD b/community/gpsdrive/PKGBUILD
index 5d9ecf85b..e27a1049b 100644
--- a/community/gpsdrive/PKGBUILD
+++ b/community/gpsdrive/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 102253 2013-12-07 10:36:38Z bpiotrowski $
+# $Id: PKGBUILD 113222 2014-06-16 10:34:52Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
# Maintainer: damir <damir@archlinux.org>
@@ -6,7 +6,7 @@
pkgname=gpsdrive
pkgver=2.11
_pkgver=20120928
-pkgrel=20
+pkgrel=21
pkgdesc="A car (bike, ship, plane) navigation system"
arch=("i686" "x86_64")
url="http://www.gpsdrive.de/"
@@ -17,8 +17,10 @@ depends=('gtk2' 'gpsd' 'libxml2' 'curl' 'python2' 'boost-libs' 'gdal' 'mapnik' '
makedepends=('cmake>=2.4.4' 'boost' 'cfitsio')
install="gpsdrive.install"
#source=("http://www.gpsdrive.de/packages/${pkgname}-${pkgver}.tar.gz")
-source=("http://arch.p5n.pp.ru/~sergej/dl/2012/${pkgname}-${_pkgver}.tar.gz")
-md5sums=('bc53792529788b81c291a32d628a4850')
+source=("http://arch.p5n.pp.ru/~sergej/dl/2012/${pkgname}-${_pkgver}.tar.gz"
+ "gpsdrive-perltovendor.patch")
+md5sums=('bc53792529788b81c291a32d628a4850'
+ 'c28bc2dc51a76a39161bf540aebfab6c')
prepare() {
cd "$srcdir"
@@ -30,6 +32,7 @@ prepare() {
sed -i 's|GdkGC \*kontext_map;|extern GdkGC *kontext_map;|' $srcdir/gpsdrive-${_pkgver}/src/gpsdrive.c
sed -i '22,1i#include <mapnik/graphics.hpp>' $srcdir/gpsdrive-${_pkgver}/src/mapnik.cpp
sed -i 's|datasource_cache::instance()->|datasource_cache::instance().|' $srcdir/gpsdrive-${_pkgver}/src/mapnik.cpp
+ (cd gpsdrive-${_pkgver} && patch -p1 <$srcdir/gpsdrive-perltovendor.patch)
}
build() {
diff --git a/community/gpsdrive/gpsdrive-perltovendor.patch b/community/gpsdrive/gpsdrive-perltovendor.patch
new file mode 100644
index 000000000..c89226761
--- /dev/null
+++ b/community/gpsdrive/gpsdrive-perltovendor.patch
@@ -0,0 +1,28 @@
+diff -ru gpsdrive-2.11/scripts/osm/perl_lib/CMakeLists.txt gpsdrive-2.11-patched/scripts/osm/perl_lib/CMakeLists.txt
+--- gpsdrive-2.11/scripts/osm/perl_lib/CMakeLists.txt 2010-06-24 15:53:32.000000000 -0400
++++ gpsdrive-2.11-patched/scripts/osm/perl_lib/CMakeLists.txt 2014-06-11 18:50:59.000000000 -0400
+@@ -5,10 +5,10 @@
+ MACRO_OPTIONAL_FIND_PACKAGE(Perl)
+
+ if (PERL_FOUND)
+- if (NOT PERL_SITELIB)
++ if (NOT PERL_VENDORLIB)
+ MACRO_OPTIONAL_FIND_PACKAGE(PerlLibs)
+- endif (NOT PERL_SITELIB)
+- #MESSAGE("DEBUG: > PERL_SITELIB: ${PERL_SITELIB}")
++ endif (NOT PERL_VENDORLIB)
++ #MESSAGE("DEBUG: > PERL_VENDORLIB: ${PERL_VENDORLIB}")
+
+ file(GLOB_RECURSE perl_modules ${CMAKE_CURRENT_SOURCE_DIR}/*.pm)
+
+@@ -16,8 +16,8 @@
+ foreach(perl_module ${perl_modules})
+ file(RELATIVE_PATH relative_module_path ${CMAKE_CURRENT_SOURCE_DIR} ${perl_module})
+ get_filename_component(relative_module_path ${relative_module_path} PATH)
+- install(FILES ${perl_module} DESTINATION ${PERL_SITELIB}/${relative_module_path})
+- #message("DEBUG: install ${perl_module} to ${PERL_SITELIB}/${relative_module_path}")
++ install(FILES ${perl_module} DESTINATION ${PERL_VENDORLIB}/${relative_module_path})
++ #message("DEBUG: install ${perl_module} to ${PERL_VENDORLIB}/${relative_module_path}")
+ endforeach(perl_module ${perl_modules})
+ endif (perl_modules)
+ endif (PERL_FOUND)
diff --git a/community/i3-wm/PKGBUILD b/community/i3-wm/PKGBUILD
index 17fb5a034..5efdf577c 100644
--- a/community/i3-wm/PKGBUILD
+++ b/community/i3-wm/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 104713 2014-01-24 20:05:37Z ttoepper $
+# $Id: PKGBUILD 113261 2014-06-16 19:17:35Z ttoepper $
# Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
pkgname=i3-wm
_pkgsourcename=i3
-pkgver=4.7.2
-pkgrel=1
+pkgver=4.8
+pkgrel=2
pkgdesc='An improved dynamic tiling window manager'
arch=('i686' 'x86_64')
url='http://i3wm.org/'
@@ -16,11 +16,13 @@ depends=('xcb-util-cursor' 'xcb-util-keysyms' 'xcb-util-wm' 'libev' 'yajl'
makedepends=('bison' 'flex')
optdepends=('dmenu: As menu.'
'i3lock: For locking your screen.'
- 'i3status: To display systeminformation with a bar.')
+ 'i3status: To display systeminformation with a bar.'
+ 'perl-anyevent-i3: Features like saving the layout.'
+ 'perl-json-xs: Features like saving the layout.')
options=('docs' '!strip')
source=("http://i3wm.org/downloads/${_pkgsourcename}-${pkgver}.tar.bz2"
"http://i3wm.org/downloads/${_pkgsourcename}-${pkgver}.tar.bz2.asc")
-md5sums=('64141f7c23f97cd1e52c52918476c1c8'
+md5sums=('4151e8e81fdc78b32a7cb953f67e3bef'
'SKIP')
build() {
diff --git a/community/julia/PKGBUILD b/community/julia/PKGBUILD
index ebb9e558e..a1d909c53 100644
--- a/community/julia/PKGBUILD
+++ b/community/julia/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 111098 2014-05-13 18:30:47Z arodseth $
+# $Id: PKGBUILD 113118 2014-06-13 20:59:12Z arodseth $
# Maintainer: Alexander Rødseth <rodseth@gmail.com>
# Contributor: Lex Black <autumn-wind at web dot de>
# Contributor: Michael Jakl <jakl.michael@gmail.com>
@@ -6,18 +6,23 @@
pkgname=julia
pkgver=0.3.0_prerelease
-pkgrel=5
+pkgrel=6
pkgdesc='High-level, high-performance, dynamic programming language'
arch=('x86_64' 'i686')
url='http://julialang.org'
license=('GPL')
depends=('arpack' 'fftw' 'git' 'gmp' 'libunwind' 'mpfr' 'pcre' 'readline' 'zlib')
-makedepends=('gcc-fortran' 'python2' 'libuv')
+makedepends=('gcc-fortran' 'python2' 'libuv' 'setconf')
optdepends=('gnuplot: If using the Gaston Package from julia')
options=('!emptydirs' 'staticlibs')
source=("git://github.com/JuliaLang/julia.git#commit=3985890")
sha256sums=('SKIP')
+prepare() {
+ # Fix for FS#40736
+ [ $CARCH = x86_64 ] && (setconf "$pkgname/Make.inc" JULIA_CPU_TARGET core2) || true
+}
+
build() {
make -C "$pkgname" prefix=/usr sysconfdir=/etc \
USE_SYSTEM_LLVM=0 \
diff --git a/community/kmess/PKGBUILD b/community/kmess/PKGBUILD
index d200ca743..76a72d14b 100644
--- a/community/kmess/PKGBUILD
+++ b/community/kmess/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 103917 2014-01-13 17:16:49Z andyrtr $
+# $Id: PKGBUILD 113163 2014-06-14 19:22:17Z andyrtr $
# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
# Contributor: Mateusz Herych <heniekk@gmail.com>
# Contributor: Stefano Zamprogno <stefano.zamprogno@gmail.com>
pkgname=kmess
pkgver=2.0.6.2
-pkgrel=5
+pkgrel=6
pkgdesc="A MSN Messenger client for Linux"
arch=('i686' 'x86_64')
url='http://kmess.sourceforge.net/'
@@ -18,7 +18,7 @@ source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-$pkgver.tar.bz2"
giflib-5.0.patch
fix-crash-in-contactlistmodel.patch)
md5sums=('a2e57911713308bef81b9347135cc5dd'
- '97734b073bf4a45ed3612d7626541cee'
+ '29f7a0c0e27d6b5cafbc3ad498e3e30f'
'fdfe837f4bd64a5123edc63019bd5cf2')
prepare() {
@@ -27,7 +27,7 @@ prepare() {
# Fix invalid PNG images to work with libpng 1.6
find -name '*.png' -exec optipng -quiet -force -fix {} +
- patch -Np1 -i ../giflib-5.0.patch
+ patch -Np0 -i ../giflib-5.0.patch
# Fix crash in ContactListModel (FS#32402)
patch -Np1 -i ../fix-crash-in-contactlistmodel.patch
diff --git a/community/kmess/giflib-5.0.patch b/community/kmess/giflib-5.0.patch
index 9b959b175..cc568fdf8 100644
--- a/community/kmess/giflib-5.0.patch
+++ b/community/kmess/giflib-5.0.patch
@@ -1,7 +1,15 @@
-diff -rupN a/contrib/isf-qt/src/isfqt.cpp b/contrib/isf-qt/src/isfqt.cpp
---- a/contrib/isf-qt/src/isfqt.cpp 2012-02-18 16:28:01.000000000 +0000
-+++ b/contrib/isf-qt/src/isfqt.cpp 2013-07-30 20:51:06.705394145 +0000
-@@ -484,12 +484,13 @@ QByteArray Stream::writerGif( const Draw
+--- contrib/isf-qt/src/isfqt.cpp.orig 2014-06-11 13:10:43.137321400 +0000
++++ contrib/isf-qt/src/isfqt.cpp 2014-06-11 13:12:23.123474616 +0000
+@@ -249,7 +249,7 @@
+ qWarning() << "Couldn't initialize GIF library!";
+ }
+
+- DGifCloseFile( gifImage );
++ DGifCloseFile( gifImage, NULL );
+ gifData.close();
+ */
+
+@@ -484,12 +484,13 @@
int width = isfImage.width();
int numColors = 0;
bool gifError = true;
@@ -16,7 +24,7 @@ diff -rupN a/contrib/isf-qt/src/isfqt.cpp b/contrib/isf-qt/src/isfqt.cpp
if( gifImage == 0 )
{
qWarning() << "Couldn't initialize gif library!";
-@@ -503,7 +504,7 @@ QByteArray Stream::writerGif( const Draw
+@@ -503,7 +504,7 @@
numColors = 256;
}
@@ -25,7 +33,7 @@ diff -rupN a/contrib/isf-qt/src/isfqt.cpp b/contrib/isf-qt/src/isfqt.cpp
if( cmap == 0 && isfImage.numColors() > 1 )
{
qWarning() << "Couldn't create map object for gif conversion (colors:" << isfImage.numColors() << ")!";
-@@ -576,7 +577,7 @@ QByteArray Stream::writerGif( const Draw
+@@ -576,7 +577,7 @@
else
{
// Write the extension
@@ -34,7 +42,7 @@ diff -rupN a/contrib/isf-qt/src/isfqt.cpp b/contrib/isf-qt/src/isfqt.cpp
{
qWarning() << "EGifPutExtensionFirst failed!";
goto writeError;
-@@ -590,9 +591,9 @@ QByteArray Stream::writerGif( const Draw
+@@ -590,9 +591,9 @@
// Write all the full data blocks
while( length >= MAX_GIF_BYTE )
{
@@ -46,7 +54,7 @@ diff -rupN a/contrib/isf-qt/src/isfqt.cpp b/contrib/isf-qt/src/isfqt.cpp
goto writeError;
}
-@@ -603,17 +604,17 @@ QByteArray Stream::writerGif( const Draw
+@@ -603,17 +604,17 @@
// Write the last block
if( length > 0 )
{
@@ -68,11 +76,13 @@ diff -rupN a/contrib/isf-qt/src/isfqt.cpp b/contrib/isf-qt/src/isfqt.cpp
goto writeError;
}
}
-@@ -624,12 +625,12 @@ QByteArray Stream::writerGif( const Draw
+@@ -623,13 +624,13 @@
+
writeError:
// Clean up the GIF converter etc
- EGifCloseFile( gifImage );
+- EGifCloseFile( gifImage );
- FreeMapObject( cmap );
++ EGifCloseFile( gifImage, NULL );
+ GifFreeMapObject( cmap );
gifData.close();
diff --git a/community/leptonica/PKGBUILD b/community/leptonica/PKGBUILD
index df18994ee..cc7f1edae 100644
--- a/community/leptonica/PKGBUILD
+++ b/community/leptonica/PKGBUILD
@@ -1,17 +1,24 @@
-# $Id: PKGBUILD 112869 2014-06-09 10:01:06Z spupykin $
+# $Id: PKGBUILD 113164 2014-06-14 19:22:18Z andyrtr $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: Christoph Drexler <chrdr at gmx dot at>
pkgname=leptonica
pkgver=1.70
-pkgrel=1
+pkgrel=2
pkgdesc="Software that is broadly useful for image processing and image analysis applications"
arch=('i686' 'x86_64')
url="http://www.leptonica.com/"
license=('custom')
depends=('giflib' 'libjpeg' 'libpng' 'libtiff' 'zlib' 'libwebp')
-source=(http://www.leptonica.com/source/leptonica-${pkgver}.tar.gz)
-md5sums=('5ac2a31cf5b4f0e8f5a853a5266c42ef')
+source=(http://www.leptonica.com/source/leptonica-${pkgver}.tar.gz
+ giflib6.patch)
+md5sums=('5ac2a31cf5b4f0e8f5a853a5266c42ef'
+ 'deeea9d5dccd9a0fb4e0e4433db49086')
+
+prepare() {
+ cd ${srcdir}/leptonica-${pkgver}
+ patch -p1 <$srcdir/giflib6.patch
+}
build() {
cd ${srcdir}/leptonica-${pkgver}
diff --git a/community/leptonica/giflib6.patch b/community/leptonica/giflib6.patch
new file mode 100644
index 000000000..1069cc8a0
--- /dev/null
+++ b/community/leptonica/giflib6.patch
@@ -0,0 +1,111 @@
+diff -wbBur leptonica-1.70/src/gifio.c leptonica-1.70.my/src/gifio.c
+--- leptonica-1.70/src/gifio.c 2013-11-24 01:57:40.000000000 +0400
++++ leptonica-1.70.my/src/gifio.c 2014-06-09 14:07:31.031928421 +0400
+@@ -121,12 +121,12 @@
+
+ /* Read all the data, but use only the first image found */
+ if (DGifSlurp(gif) != GIF_OK) {
+- DGifCloseFile(gif);
++ DGifCloseFile(gif, NULL);
+ return (PIX *)ERROR_PTR("failed to read GIF data", procName, NULL);
+ }
+
+ if (gif->SavedImages == NULL) {
+- DGifCloseFile(gif);
++ DGifCloseFile(gif, NULL);
+ return (PIX *)ERROR_PTR("no images found in GIF", procName, NULL);
+ }
+
+@@ -134,12 +134,12 @@
+ w = si.ImageDesc.Width;
+ h = si.ImageDesc.Height;
+ if (w <= 0 || h <= 0) {
+- DGifCloseFile(gif);
++ DGifCloseFile(gif, NULL);
+ return (PIX *)ERROR_PTR("invalid image dimensions", procName, NULL);
+ }
+
+ if (si.RasterBits == NULL) {
+- DGifCloseFile(gif);
++ DGifCloseFile(gif, NULL);
+ return (PIX *)ERROR_PTR("no raster data in GIF", procName, NULL);
+ }
+
+@@ -151,7 +151,7 @@
+ gif_cmap = gif->SColorMap;
+ } else {
+ /* don't know where to take cmap from */
+- DGifCloseFile(gif);
++ DGifCloseFile(gif, NULL);
+ return (PIX *)ERROR_PTR("color map is missing", procName, NULL);
+ }
+
+@@ -175,7 +175,7 @@
+ }
+
+ if ((pixd = pixCreate(w, h, d)) == NULL) {
+- DGifCloseFile(gif);
++ DGifCloseFile(gif, NULL);
+ pixcmapDestroy(&cmap);
+ return (PIX *)ERROR_PTR("failed to allocate pixd", procName, NULL);
+ }
+@@ -207,7 +207,7 @@
+ pixTransferAllData(pixd, &pixdi, 0, 0);
+ }
+
+- DGifCloseFile(gif);
++ DGifCloseFile(gif, NULL);
+ return pixd;
+ }
+
+@@ -356,14 +356,14 @@
+ != GIF_OK) {
+ pixDestroy(&pixd);
+ GifFreeMapObject(gif_cmap);
+- EGifCloseFile(gif);
++ EGifCloseFile(gif, NULL);
+ return ERROR_INT("failed to write screen description", procName, 1);
+ }
+ GifFreeMapObject(gif_cmap); /* not needed after this point */
+
+ if (EGifPutImageDesc(gif, 0, 0, w, h, FALSE, NULL) != GIF_OK) {
+ pixDestroy(&pixd);
+- EGifCloseFile(gif);
++ EGifCloseFile(gif, NULL);
+ return ERROR_INT("failed to image screen description", procName, 1);
+ }
+
+@@ -371,13 +371,13 @@
+ wpl = pixGetWpl(pixd);
+ if (d != 1 && d != 2 && d != 4 && d != 8) {
+ pixDestroy(&pixd);
+- EGifCloseFile(gif);
++ EGifCloseFile(gif, NULL);
+ return ERROR_INT("image depth is not in {1, 2, 4, 8}", procName, 1);
+ }
+
+ if ((gif_line = (GifByteType *)CALLOC(sizeof(GifByteType), w)) == NULL) {
+ pixDestroy(&pixd);
+- EGifCloseFile(gif);
++ EGifCloseFile(gif, NULL);
+ return ERROR_INT("mem alloc fail for data line", procName, 1);
+ }
+
+@@ -406,7 +406,7 @@
+ if (EGifPutLine(gif, gif_line, w) != GIF_OK) {
+ FREE(gif_line);
+ pixDestroy(&pixd);
+- EGifCloseFile(gif);
++ EGifCloseFile(gif, NULL);
+ return ERROR_INT("failed to write data line into GIF", procName, 1);
+ }
+ }
+@@ -422,7 +422,7 @@
+
+ FREE(gif_line);
+ pixDestroy(&pixd);
+- EGifCloseFile(gif);
++ EGifCloseFile(gif, NULL);
+ return 0;
+ }
+
diff --git a/community/lwqq/PKGBUILD b/community/lwqq/PKGBUILD
index 1d259f865..1b5630053 100644
--- a/community/lwqq/PKGBUILD
+++ b/community/lwqq/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 110768 2014-05-06 17:17:11Z fyan $
+# $Id: PKGBUILD 113108 2014-06-13 16:55:14Z fyan $
# Maintainer: Felix Yan <felixonmars@gmail.com>
pkgname=lwqq
-pkgver=0.3.0
-_gitver="tag=v$pkgver"
-#_gitver='commit=afe08eef972aaabff5c043a72af0b63e2bb23f2d'
-pkgrel=1
+pkgver=0.3.1
+#_gitver="tag=v$pkgver"
+_gitver='commit=472881c1b122bad32089c1488a43414e1f85e077'
+pkgrel=2
pkgdesc="A library for webqq protocol"
arch=('i686' 'x86_64')
url="https://github.com/xiehuc/lwqq"
@@ -17,6 +17,9 @@ source=("git://github.com/xiehuc/lwqq.git#$_gitver")
build() {
cd $pkgname
+ sed -e 's/set(LIBSUFFIX "64")/set(LIBSUFFIX "")/' \
+ -i CMakeLists.txt
+
cmake -DCMAKE_INSTALL_PREFIX=/usr .
make
}
diff --git a/community/lxc/PKGBUILD b/community/lxc/PKGBUILD
index 8795f8c5e..d049cc468 100644
--- a/community/lxc/PKGBUILD
+++ b/community/lxc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 110133 2014-04-24 14:32:09Z spupykin $
+# $Id: PKGBUILD 113234 2014-06-16 11:42:44Z 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.3
+pkgver=1.0.4
epoch=1
-pkgrel=5
+pkgrel=1
pkgdesc="Linux Containers"
arch=('i686' 'x86_64')
url="http://linuxcontainers.org"
@@ -25,7 +25,7 @@ backup=('etc/lxc/default.conf')
source=("http://linuxcontainers.org/downloads/$pkgname-${pkgver}.tar.gz"
"lxc.tmpfiles.d"
"lxc.service")
-md5sums=('55873b1411a606397309aa6c4c4263b3'
+md5sums=('2689080af03a8ac1f1ce577728dd3619'
'df94c9fb8a753011c86ee664e9f521ff'
'32db4ef06b27f36e15ff4b67c049dfeb')
diff --git a/community/metapixel/PKGBUILD b/community/metapixel/PKGBUILD
index 6a9d0880b..dec101c23 100644
--- a/community/metapixel/PKGBUILD
+++ b/community/metapixel/PKGBUILD
@@ -1,25 +1,34 @@
-# $Id: PKGBUILD 106408 2014-03-02 18:09:48Z schuay $
+# $Id: PKGBUILD 113165 2014-06-14 19:22:19Z andyrtr $
# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
# Contributor: Daniel Isenmann <daniel.isenmann [at] gmx [dot] de>
pkgname=metapixel
pkgver=1.0.2
-pkgrel=6
+pkgrel=7
pkgdesc='A program for generating photomosaics.'
arch=('i686' 'x86_64')
url='http://www.complang.tuwien.ac.at/schani/metapixel/'
license=('GPL')
depends=('giflib' 'libjpeg' 'libpng' 'perl' 'glib2')
makedepends=('git' 'docbook-xsl')
-source=("git://github.com/schani/metapixel.git#commit=4ad7be9e82")
-md5sums=('SKIP')
+source=("git://github.com/schani/metapixel.git#commit=4ad7be9e82"
+ "metapixel-giflib-5.1.0-compat.patch")
+md5sums=('SKIP'
+ 'b959c6d1b14064aee3a73ae568a82555')
-build() {
+prepare() {
cd "${srcdir}/${pkgname}"
git submodule init
git submodule update
+ cd rwimg
+ patch -p1 -i ../../metapixel-giflib-5.1.0-compat.patch
+}
+
+build() {
+ cd "${srcdir}/${pkgname}"
+
# Build librwimg first, make dependencies seem to be bugged.
make librwimg
make MANPAGE_XSL="/usr/share/xml/docbook/xsl-stylesheets-1.78.1/manpages/docbook.xsl"
diff --git a/community/metapixel/metapixel-giflib-5.1.0-compat.patch b/community/metapixel/metapixel-giflib-5.1.0-compat.patch
new file mode 100644
index 000000000..1c948f35b
--- /dev/null
+++ b/community/metapixel/metapixel-giflib-5.1.0-compat.patch
@@ -0,0 +1,23 @@
+diff --git a/rwgif.c b/rwgif.c
+index e67ac3c..6b19a28 100644
+--- a/rwgif.c
++++ b/rwgif.c
+@@ -54,8 +54,7 @@ open_gif_file (const char *filename, int *width, int *height)
+
+ assert(data != 0);
+
+- int error;
+- data->file = DGifOpenFileName(filename, &error);
++ data->file = DGifOpenFileName(filename, NULL);
+
+ assert(data->file !=0);
+
+@@ -138,7 +137,7 @@ open_gif_file (const char *filename, int *width, int *height)
+ }
+ free(buffer);
+
+- assert(DGifCloseFile(data->file) == GIF_OK);
++ assert(DGifCloseFile(data->file, NULL) == GIF_OK);
+
+ return data;
+ }
diff --git a/community/minidlna/PKGBUILD b/community/minidlna/PKGBUILD
index 684110970..5d7ee9d52 100644
--- a/community/minidlna/PKGBUILD
+++ b/community/minidlna/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 112754 2014-06-06 09:25:10Z spupykin $
+# $Id: PKGBUILD 113224 2014-06-16 10:53:58Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer:Biginoz < biginoz AT free point fr>
# Contributor: Ignacio Galmarino <igalmarino@gmail.com>
@@ -7,21 +7,20 @@
pkgname=minidlna
pkgver=1.1.3
-pkgrel=1
+pkgrel=2
pkgdesc="A DLNA/UPnP-AV Media server (aka ReadyDLNA)"
arch=('i686' 'x86_64')
url="http://sourceforge.net/projects/minidlna/"
license=('GPL')
depends=('libexif' 'libjpeg' 'libid3tag' 'flac' 'libvorbis' 'ffmpeg' 'sqlite')
-backup=('etc/minidlna.conf'
- 'etc/conf.d/minidlna')
+backup=('etc/minidlna.conf')
install=minidlna.install
changelog=changelog
source=(http://downloads.sourceforge.net/project/minidlna/minidlna/$pkgver/minidlna-$pkgver.tar.gz
minidlna.service
minidlna.tmpfiles)
md5sums=('879027192c89e5376cdd2ae2d1aa33b4'
- '7e3890ee50aa4dfa4d1754261e6cc965'
+ 'd419b84f0ceda0adae27019a06df5065'
'26de27b12d6a37c47d9714107d07aac9')
build() {
diff --git a/community/minidlna/minidlna.service b/community/minidlna/minidlna.service
index bc79e96ef..7845056b9 100644
--- a/community/minidlna/minidlna.service
+++ b/community/minidlna/minidlna.service
@@ -4,7 +4,6 @@ After=network.target
[Service]
Type=forking
-User=nobody
ExecStart=/usr/bin/minidlnad -P /run/minidlna/minidlna.pid
PIDFile=/run/minidlna/minidlna.pid
diff --git a/community/mpv/PKGBUILD b/community/mpv/PKGBUILD
index faad2e446..64254bcea 100644
--- a/community/mpv/PKGBUILD
+++ b/community/mpv/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 111788 2014-05-24 15:22:04Z bpiotrowski $
+# $Id: PKGBUILD 113142 2014-06-14 13:14:41Z bpiotrowski $
# Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
# Contributor: Eivind Uggedal <eivind@uggedal.com>
pkgname=mpv
-pkgver=0.3.10
+pkgver=0.3.11
pkgrel=1
pkgdesc='Video player based on MPlayer/mplayer2'
arch=('i686' 'x86_64')
@@ -18,7 +18,7 @@ makedepends=('mesa' 'python-docutils' 'ladspa')
options=('!emptydirs' '!buildflags')
install=mpv.install
source=(https://github.com/mpv-player/$pkgname/archive/v$pkgver.tar.gz)
-md5sums=('9cfd0a4118b260bff4a3bc21cac7d1ab')
+md5sums=('c2ab93033ce55e3e0ee596576db88e74')
prepare() {
cd $pkgname-$pkgver
diff --git a/community/mtpaint/PKGBUILD b/community/mtpaint/PKGBUILD
index c8e766304..43f3dd79a 100644
--- a/community/mtpaint/PKGBUILD
+++ b/community/mtpaint/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 96840 2013-09-06 11:15:47Z arodseth $
+# $Id: PKGBUILD 113166 2014-06-14 19:22:20Z andyrtr $
# Maintainer: Alexander Rødseth <rodseth@gmail.com>
# Contributor: Roman Kyrylych <roman@archlinux.org>
# Contributor: yosh64 <yosh64.at.gmail.dot.com>
pkgname=mtpaint
pkgver=3.40
-pkgrel=13
+pkgrel=14
pkgdesc='Simple paint program for creating icons and pixel based artwork'
arch=('x86_64' 'i686')
url='http://mtpaint.sourceforge.net/'
@@ -15,12 +15,17 @@ depends=('gtk2' 'giflib' 'libjpeg' 'openjpeg' 'desktop-file-utils' 'lcms2'
makedepends=('gtk2' 'giflib' 'libjpeg' 'openjpeg' 'lcms2' 'libtiff' 'libpng'
'freetype2')
install='mtpaint.install'
-source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2")
-sha256sums=('ef321d2b404839c7b909bdf5283eb22a37fbdd35b4cc9e380ddc400573d7c890')
+source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2"
+ 'giflib.patch')
+sha256sums=('ef321d2b404839c7b909bdf5283eb22a37fbdd35b4cc9e380ddc400573d7c890'
+ '38b3a50d7275e9dc3fe8c78e774b51fa55fc7bf11a490c13b4974455c7db830c')
prepare() {
cd "$pkgname-$pkgver"
+ # GIFLIB patch for the file close function
+ patch -p0 -i "$srcdir/giflib.patch"
+
# Recommended by Mark Tyler himself
sed -i 's:$LIBS $LDFLAGS:$LDFLAGS $LIBS:' configure
@@ -40,9 +45,7 @@ build() {
}
package() {
- cd "$pkgname-$pkgver"
-
- make DESTDIR="$pkgdir" install
+ make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
}
# vim:set ts=2 sw=2 et:
diff --git a/community/mtpaint/giflib.patch b/community/mtpaint/giflib.patch
new file mode 100644
index 000000000..24c4403c7
--- /dev/null
+++ b/community/mtpaint/giflib.patch
@@ -0,0 +1,29 @@
+--- src/png.c 2014-05-28 12:02:50.000000000 +0200
++++ src2/png.c 2014-05-28 12:02:43.569815883 +0200
+@@ -1608,7 +1608,7 @@
+ }
+ res = 1;
+ fail: mem_free_chanlist(w_set.img);
+- DGifCloseFile(giffy);
++ DGifCloseFile(giffy, NULL);
+ return (res);
+ }
+
+@@ -1659,7 +1659,7 @@
+ }
+ }
+ res = 1;
+-fail: DGifCloseFile(giffy);
++fail: DGifCloseFile(giffy, NULL);
+ return (res);
+ }
+
+@@ -1725,7 +1725,7 @@
+ if (!settings->silent) progress_end();
+ msg = 0;
+
+-fail: EGifCloseFile(giffy);
++fail: EGifCloseFile(giffy, NULL);
+ #ifndef WIN32
+ /* giflib creates files with 0600 permissions, which is nasty - WJ */
+ mode = umask(0022);
diff --git a/community/mumble/PKGBUILD b/community/mumble/PKGBUILD
index 2dcb6aae9..2242098c3 100644
--- a/community/mumble/PKGBUILD
+++ b/community/mumble/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 111165 2014-05-15 02:14:15Z svenstaro $
+# $Id: PKGBUILD 113189 2014-06-15 21:52:27Z svenstaro $
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
# Contributor: Lauri Niskanen <ape@ape3000.com>
# Contributor: Sebastian.Salich@gmx.de
@@ -8,7 +8,7 @@
# to the depends and delete "no-g15" in the configure line below
pkgname=mumble
-pkgver=1.2.6
+pkgver=1.2.7
pkgrel=1
arch=('i686' 'x86_64')
pkgdesc="A voice chat application similar to TeamSpeak"
@@ -20,7 +20,7 @@ install=mumble.install
url="http://mumble.sourceforge.net/"
source=("http://downloads.sourceforge.net/mumble/$pkgname-$pkgver.tar.gz"
"gcc49.patch::https://github.com/mumble-voip/mumble/commit/349436284b5f1baa61836c98ff0d518392140c5d.patch")
-md5sums=('32b37ff426863d7abeb1b7c1938652ff'
+md5sums=('7f87f57859902b0ea8385a49f34d126d'
'ca344e0c4a33f1cbff2de94c60112a45')
prepare() {
diff --git a/community/mupdf/PKGBUILD b/community/mupdf/PKGBUILD
index 2659d2270..415b62325 100644
--- a/community/mupdf/PKGBUILD
+++ b/community/mupdf/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 109645 2014-04-17 10:54:08Z spupykin $
-# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
+# $Id: PKGBUILD 113110 2014-06-13 18:26:05Z bpiotrowski $
+# Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
# Contributor: Brad Fanella <bradfanella@archlinux.us>
# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
# Contributor: Pierre-Paul Paquin <pierrepaulpaquin@gmail.com>
# Contributor: xduugu
pkgname=mupdf
-pkgver=1.4
-pkgrel=2
+pkgver=1.5
+pkgrel=1
pkgdesc='Lightweight PDF and XPS viewer'
arch=('i686' 'x86_64')
url='http://mupdf.com'
@@ -17,21 +17,15 @@ depends=('curl' 'desktop-file-utils' 'freetype2' 'jbig2dec' 'libjpeg' 'libxext'
install=mupdf.install
options=('staticlibs')
source=(http://mupdf.com/downloads/mupdf-$pkgver-source.tar.gz
- mupdf-1.4-system-libcurl.patch)
-md5sums=('0f6840a7020db0c833b0c090ca1864ec'
- 'b9fa68f059cfcd0b95c1166c83fd2ec5')
+ mupdf.desktop
+ mupdf.xpm)
+md5sums=('89bd4ddc74c266062ebf2702741bb173'
+ '39b54f82a763aac54e352315a0ee9037'
+ 'f3f35e7320bafde331250de1c99186a1')
prepare() {
cd $pkgname-$pkgver-source
rm -rf thirdparty/{curl,freetype,jpeg,zlib,jbig2dec}
- patch -p1 -i ../mupdf-1.4-system-libcurl.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() {
@@ -50,11 +44,9 @@ package() {
mv "$pkgdir"/usr/bin/mupdf-x11-curl "$pkgdir"/usr/bin/mupdf
rm "$pkgdir"/usr/bin/mupdf-x11
- cd platform/debian
- install -Dm644 mupdf.desktop "$pkgdir"/usr/share/applications/mupdf.desktop
- install -Dm644 mupdf.xpm "$pkgdir"/usr/share/pixmaps/mupdf.xpm
+ install -Dm644 ../mupdf.desktop "$pkgdir"/usr/share/applications/mupdf.desktop
+ install -Dm644 ../mupdf.xpm "$pkgdir"/usr/share/pixmaps/mupdf.xpm
- find "$pkgdir"/usr/include \
- "$pkgdir"/usr/share \
- "$pkgdir"/usr/lib -type f | xargs chmod -v 0644
+ find "$pkgdir"/usr/include "$pkgdir"/usr/share "$pkgdir"/usr/lib \
+ -type f -exec chmod -v 0644 {} +
}
diff --git a/community/mupdf/mupdf-1.4-system-libcurl.patch b/community/mupdf/mupdf-1.4-system-libcurl.patch
deleted file mode 100644
index bbee9b076..000000000
--- a/community/mupdf/mupdf-1.4-system-libcurl.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -rupN a/Makerules b/Makerules
---- a/Makerules 2014-04-11 15:10:41.000000000 +0000
-+++ b/Makerules 2014-04-15 05:35:34.430028127 +0000
-@@ -47,6 +47,8 @@ SYS_OPENJPEG_LIBS = -lopenjpeg
- SYS_JBIG2DEC_LIBS = -ljbig2dec
- SYS_JPEG_LIBS = -ljpeg
- SYS_ZLIB_LIBS = -lz
-+SYS_CURL_CFLAGS = $(shell pkg-config --cflags libcurl) -I/usr/include/curl
-+SYS_CURL_LIBS = $(shell pkg-config --libs libcurl)
-
- CC = xcrun cc
- AR = xcrun ar
-diff -rupN a/Makethird b/Makethird
---- a/Makethird 2014-04-11 15:10:41.000000000 +0000
-+++ b/Makethird 2014-04-15 05:37:06.712810863 +0000
-@@ -454,6 +454,10 @@ CURL_CFLAGS := -I$(CURL_DIR)/include
- CURL_LIBS := $(SYS_CURL_DEPS)
-
- HAVE_CURL := yes
-+else
-+HAVE_CURL := yes
-+CURL_CFLAGS := $(SYS_CURL_CFLAGS)
-+CURL_LIBS := $(SYS_CURL_LIBS) $(SYS_CURL_DEPS)
- endif
-
- # --- X11 ---
diff --git a/community/mupdf/mupdf.desktop b/community/mupdf/mupdf.desktop
new file mode 100644
index 000000000..177324772
--- /dev/null
+++ b/community/mupdf/mupdf.desktop
@@ -0,0 +1,15 @@
+[Desktop Entry]
+Name=MuPDF
+GenericName=PDF file viewer
+Exec=mupdf %f
+TryExec=mupdf
+Icon=mupdf
+Terminal=false
+Type=Application
+MimeType=application/pdf;application/x-pdf;application/x-cbz;application/oxps;application/vnd.ms-xpsdocument;image/jpeg;image/pjpeg;image/png;image/tiff;image/x-tiff
+Categories=Viewer;Graphics;
+Actions=View
+NoDisplay=true
+[Desktop Action View]
+Name=View with mupdf
+Exec=mupdf %f
diff --git a/community/mupdf/mupdf.xpm b/community/mupdf/mupdf.xpm
new file mode 100644
index 000000000..2c042f4ea
--- /dev/null
+++ b/community/mupdf/mupdf.xpm
@@ -0,0 +1,497 @@
+/* XPM */
+static char *mupdf[] = {
+/* width height ncolors chars_per_pixel */
+"48 48 442 2",
+/* colors */
+" c #000000",
+" . c #2E4558",
+" X c #252121",
+" o c #AFAFAF",
+" O c #28313B",
+" + c #231F1F",
+" @ c #686666",
+" # c #98BDD7",
+" $ c #201B1C",
+" % c #7CABCC",
+" & c #4487B6",
+" * c #DFDEDE",
+" = c #4285B4",
+" - c #615E5F",
+" ; c #605E5E",
+" : c #23262C",
+" > c #D9D8D8",
+" , c #F7FAFC",
+" < c #D7D6D6",
+" 1 c #BFD6E6",
+" 2 c #6BA0C5",
+" 3 c #232122",
+" 4 c #555253",
+" 5 c #CDCCCC",
+" 6 c #E7EFF6",
+" 7 c #4786B2",
+" 8 c #CADDEA",
+" 9 c #4085B5",
+" 0 c #AECBDF",
+" q c #CBCACA",
+" w c #92B9D4",
+" e c #365F7D",
+" r c #5A95BE",
+" t c #3E83B3",
+" y c #304B60",
+" u c #C7C6C6",
+" i c #4D8EBB",
+" p c #F1F6F9",
+" a c #C1C0C0",
+" s c #454243",
+" d c #669CC3",
+" f c #81AECD",
+" g c #7A7777",
+" h c #434041",
+" j c #3E779F",
+" k c #272E36",
+" l c #413E3F",
+" z c #3F3C3D",
+" x c #5895BF",
+" c c #3D3A3B",
+" v c #C6DBE9",
+" b c #B8B6B7",
+" n c #4282B0",
+" m c #FDFDFE",
+" M c #B7B6B6",
+" N c #8DB5D2",
+" B c #242529",
+" V c #B3B2B2",
+" C c #222327",
+" Z c #B0AEAF",
+" A c #EDF4F8",
+" S c #686565",
+" D c #488AB9",
+" F c #9ABED8",
+" G c #7EACCD",
+" H c #ECF2F7",
+" J c #211C1C",
+" K c #666363",
+" L c #F1F1F2",
+" P c #ABAAAA",
+" I c #4588B6",
+" U c #A9A8A8",
+" Y c #2D2A2B",
+" T c #A7A6A6",
+" R c #615D5E",
+" E c #2B2829",
+" W c #8DB7D5",
+" Q c #F9FBFD",
+" ! c #DDE9F2",
+" ~ c #F8FBFC",
+" ^ c #DCE9F1",
+" / c #A5C5DC",
+" ( c #89B3D1",
+" ) c #5C5959",
+" _ c #A4C5DB",
+" ` c #335A76",
+" ' c #518FBB",
+" ] c #E6E7E7",
+" [ c #5A5757",
+" { c #232021",
+" } c #33536C",
+" | c #98BED9",
+". c #E0E1E1",
+".. c #7CACCE",
+".X c #4488B8",
+".o c #2D3F4F",
+".O c #999898",
+".+ c #4388B7",
+".@ c #5E98C1",
+".# c #CDCDCB",
+".$ c #524F4F",
+".% c #B0CCE0",
+".& c #979696",
+".* c #78A8CA",
+".= c #5C96BF",
+".- c #969495",
+".; c #4084B4",
+".: c #252930",
+".> c #949293",
+"., c #929091",
+".< c #417FAB",
+".1 c #4F8FBC",
+".2 c #F3F7FA",
+".3 c #D3D3D4",
+".4 c #D7E5EF",
+".5 c #222023",
+".6 c #9FC1D9",
+".7 c #679DC3",
+".8 c #37678A",
+".9 c #4B8BB8",
+".0 c #3E769E",
+".q c #3C749C",
+".w c #403D3D",
+".e c #92BAD6",
+".r c #C8DCEA",
+".t c #FEFEFE",
+".y c #3D393A",
+".u c #3B3738",
+".i c #355974",
+".p c #353132",
+".a c #7A7879",
+".s c #498BB9",
+".d c #9BBFD8",
+".f c #4E8AB4",
+".g c #787677",
+".h c #F2F2F2",
+".j c #F0F0F0",
+".k c #2F2B2C",
+".l c #EEEEEE",
+".z c #727071",
+".x c #26282D",
+".c c #ECECEC",
+".v c #2B2728",
+".b c #FAFCFD",
+".n c #EAEAEA",
+".m c #DEEAF2",
+".M c #E9EAE9",
+".N c #C2D8E7",
+".B c #6E6C6D",
+".V c #5390BC",
+".C c #E8E8E8",
+".Z c #6EA2C6",
+".A c #272324",
+".S c #E7E6E7",
+".D c #E6E6E6",
+".F c #252122",
+".G c #29333D",
+".H c #E4E4E4",
+".J c #3F7AA5",
+".K c #231F20",
+".L c #E2E2E2",
+".P c #211D1E",
+".I c #E0E0E0",
+".U c #EAF1F7",
+".Y c #6099C2",
+".T c #1F1B1C",
+".R c #E9F1F6",
+".E c #CDDFEB",
+".W c #4387B6",
+".Q c #96BBD6",
+".! c #B1CDE0",
+".~ c #DEDEDE",
+".^ c #79A9CA",
+"./ c #4285B5",
+".( c #272A31",
+".) c #5D97BF",
+"._ c #4185B4",
+".` c #DCDCDC",
+".' c #959393",
+".] c #DADADA",
+".[ c #314B5F",
+".{ c #D8D8D8",
+".} c #D7D8D7",
+".| c #D6D6D6",
+"X c #F5F8FB",
+"X. c #D4D4D4",
+"XX c #6AA0C5",
+"Xo c #BDD4E5",
+"XO c #3A6A8C",
+"X+ c #232123",
+"X@ c #D3D4D3",
+"X# c #D2D2D2",
+"X$ c #D0D0D0",
+"X% c #CECECE",
+"X& c #CCCCCC",
+"X* c #CADDEB",
+"X= c #37617F",
+"X- c #242A31",
+"X; c #CACACA",
+"X: c #C8DBE9",
+"X> c #90B7D3",
+"X, c #817F7F",
+"X< c #3F7EAB",
+"X1 c #548FB9",
+"X2 c #355873",
+"X3 c #7D7B7B",
+"X4 c #C2C2C2",
+"X5 c #4B8CBA",
+"X6 c #C0C0C0",
+"X7 c #D4E4EE",
+"X8 c #81AECE",
+"X9 c #659CC3",
+"X0 c #787576",
+"Xq c #4788B6",
+"Xw c #252C35",
+"Xe c #757373",
+"Xr c #BABABA",
+"Xt c #FCFDFE",
+"Xy c #B6B6B6",
+"Xu c #C4D9E8",
+"Xi c #706D6E",
+"Xp c #8CB5D2",
+"Xa c #70A3C7",
+"Xs c #8BB5D1",
+"Xd c #5491BC",
+"Xf c #5391BB",
+"Xg c #282424",
+"Xh c #272223",
+"Xj c #6C696A",
+"Xk c #2F4659",
+"Xl c #6B6969",
+"Xz c #407BA5",
+"Xx c #6A6768",
+"Xc c #E4E3E3",
+"Xv c #3E79A3",
+"Xb c #231E1F",
+"Xn c #221E1E",
+"Xm c #E2E1E1",
+"XM c #211C1D",
+"XN c #EBF2F7",
+"XB c #201C1C",
+"XV c #CFE0EC",
+"XC c #4588B7",
+"XZ c #B3CEE1",
+"XA c #366384",
+"XS c #5F98C0",
+"XD c #4386B5",
+"XF c #DEDDDD",
+"XG c #2B3D4B",
+"XH c #615F5F",
+"XJ c #5F5D5D",
+"XK c #5E5B5C",
+"XL c #DCE9F2",
+"XP c #407DA8",
+"XI c #86B1CF",
+"XU c #D4D3D3",
+"XY c #3A698B",
+"XT c #3E7BA6",
+"XR c #232022",
+"XE c #545152",
+"XW c #999899",
+"XQ c #79AACC",
+"X! c #524F50",
+"X~ c #CCCDCB",
+"X^ c #3D749B",
+"X/ c #93BAD5",
+"X( c #77A8CA",
+"X) c #37607E",
+"X_ c #5B96BF",
+"X` c #3F84B4",
+"X' c #CAC9C9",
+"X] c #C6C5C5",
+"X[ c #3F7DAA",
+"X{ c #F2F7FA",
+"X} c #C2C1C1",
+"X| c #212023",
+"o c #9EC1D9",
+"o. c #444142",
+"oX c #3F78A0",
+"oo c #90B8D5",
+"oO c #FEFEFF",
+"o+ c #E2ECF4",
+"o@ c #2B3A47",
+"o# c #25262A",
+"o$ c #B1AFB0",
+"o% c #28313A",
+"o& c #221D1D",
+"o* c #262F38",
+"o= c #629BC2",
+"o- c #302D2E",
+"o; c #6199C1",
+"o: c #201B1B",
+"o> c #4587B6",
+"o, c #F0F0F1",
+"o< c #2D3E4C",
+"o1 c #2E2B2C",
+"o2 c #4385B4",
+"o3 c #A8A7A7",
+"o4 c #A7A5A6",
+"o5 c #3D7197",
+"o6 c #4183B2",
+"o7 c #4083B1",
+"o8 c #A5A3A4",
+"o9 c #3B6F95",
+"o0 c #5290BC",
+"oq c #A4C4DB",
+"ow c #E9F1F7",
+"oe c #4387B7",
+"or c #E7EFF5",
+"ot c #CBDDEA",
+"oy c #4185B5",
+"ou c #5B95BE",
+"oi c #3F83B3",
+"op c #939192",
+"oa c #929191",
+"os c #2B3743",
+"od c #4C4849",
+"of c #2A3742",
+"og c #F4F8FB",
+"oh c #D8E6F0",
+"oj c #4C8CB9",
+"ok c #211F22",
+"ol c #CFD0D0",
+"oz c #444041",
+"ox c #262C34",
+"oc c #413E3E",
+"ov c #403C3D",
+"ob c #3B739B",
+"on c #858384",
+"om c #FFFFFF",
+"oM c #E3EDF4",
+"oN c #5995BF",
+"oB c #3E3A3B",
+"oV c #C7DBE9",
+"oC c #2F4B61",
+"oZ c #5793BD",
+"oA c #3C3839",
+"oS c #2A3945",
+"oD c #7E7D7D",
+"oF c #345873",
+"oG c #363233",
+"oH c #7B797A",
+"oJ c #EFF4F9",
+"oK c #EEF4F8",
+"oL c #F3F3F3",
+"oP c #9ABED7",
+"oI c #4788B7",
+"oU c #629AC1",
+"oY c #ACAAAA",
+"oT c #F1F1F1",
+"oR c #EFEFEF",
+"oE c #737172",
+"oW c #EDEDED",
+"oQ c #A9C9DF",
+"o! c #FBFDFE",
+"o~ c #EBEBEB",
+"o^ c #DFEBF3",
+"o/ c #4581AB",
+"o( c #6F6D6E",
+"o) c #EAE9EA",
+"o_ c #E9E9E9",
+"o` c #C1D7E6",
+"o' c #E7E7E7",
+"o] c #E6E7E6",
+"o[ c #E5E5E5",
+"o{ c #3F7BA5",
+"o} c #242021",
+"o| c #E3E3E3",
+"O c #3E79A4",
+"O. c #221E1F",
+"OX c #26303A",
+"Oo c #9C9A9A",
+"OO c #E1E1E1",
+"O+ c #201C1D",
+"O@ c #4488B7",
+"O# c #DFDFDF",
+"O$ c #7BAACC",
+"O% c #356384",
+"O& c #1E1A1B",
+"O* c #4386B6",
+"O= c #4286B5",
+"O- c #95BAD5",
+"O; c #DDDDDD",
+"O: c #1C1819",
+"O> c #DBDBDB",
+"O, c #D9D9D9",
+"O< c #D7D7D7",
+"O1 c #417FAA",
+"O2 c #DAE7F1",
+"O3 c #F5F9FB",
+"O4 c #D5D5D5",
+"O5 c #242224",
+"O6 c #D4D3D4",
+"O7 c #85B1CF",
+"O8 c #D3D3D3",
+"O9 c #699FC4",
+"O0 c #4D8DB9",
+"Oq c #222022",
+"Ow c #34556F",
+"Oe c #D1D1D1",
+"Or c #D0CFD0",
+"Ot c #8A8888",
+"Oy c #CFCFCF",
+"Ou c #CDCDCD",
+"Oi c #CCCDCC",
+"Op c #CADEEB",
+"Oa c #E5EEF5",
+"Os c #C9DCEA",
+"Od c #ADCADF",
+"Of c #C8DCE9",
+"Og c #91B8D4",
+"Oh c #5994BE",
+"Oj c #3D82B3",
+"Ok c #5894BD",
+"Ol c #3C82B2",
+"Oz c #4181AD",
+"Ox c #3B3737",
+"Oc c #C5C5C5",
+"Ov c #293643",
+"Ob c #3E7DAA",
+"On c #C1C1C1",
+"Om c #353131",
+"OM c #D4E3EE",
+"ON c #B8D1E3",
+"OB c #BFBFBF",
+"OV c #9CBFD8",
+"OC c #80ADCD",
+"OZ c #649BC2",
+"OA c #4889B7",
+"OS c #BDBDBD",
+"OD c #2E292A",
+"OF c #4283B1",
+"OG c #B7B7B7",
+"OH c #4183B0",
+"OJ c #5794BF",
+"OK c #A7C6DC",
+"OL c #365B77",
+"OP c #8BB4D1",
+"OI c #282324",
+"OU c #272323",
+"OY c #6C6A6A",
+"OT c None",
+/* pixels */
+" oToToToT L.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h LoToToToT ",
+"o,.joToToToToToToToToToToToToToToToToToToToT.h.h.h.hoToToToToToToToToToToToToToToToToToToToT.j.j",
+".j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.joToLoLoR.D.~ > >.~.DoRoLoLoT.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j",
+"oRoRoRoRoRoRoRoRoRoRoRoRoRoRoRoT.hXcOBoaXjX!oz c cozX!XjoaOBXc.hoToRoRoRoRoRoRoRoRoRoRoRoRoRoRoR",
+".l.l.l.l.l.l.l.l.l.l.l.l.loR.j <.'X! Y.P.To: $ J J $o:.T.P YX!.' <.joR.l.l.l.l.l.l.l.l.l.l.l.l.l",
+".l.l.l.l.l.l.l.l.l.l.l.l.jXm.&oz + $o& 3.x OoSXGXGoS O.x 3o& $ +oz.&Xm.j.l.l.l.l.l.l.l.l.l.l.l.l",
+"oWoWoWoWoWoWoWoWoWoWoWoR uXK X $XRo% yXA.qo/.fX1X1.fo/.qXA yo%XR $ XXK uoRoWoWoWoWoWoWoWoWoWoWoW",
+".c.c.c.c.c.c.c.c.c.coW Z z $ {os eXTo0..oQX*XLoMoMXLOpoQ..o0XT eos { $ z ZoW.c.c.c.c.c.c.c.c.c.c",
+"o~o~o~o~o~o~o~o~o~.co3.p $.(X2X[OJ FOM !Of 0.d wOg.d 0Os.mOM FOJObX2.( $.po3.co~o~o~o~o~o~o~o~o~",
+".n.n.n.n.n.n.n.noW VoGXMoso9XC G.N.!.^XfXD tOjOlOlOj tXDXd.^.% 1O$O@o9osXMoG VoW.n.n.n.n.n.n.n.n",
+".n.n.n.n.n.n.n.c qo.XBo<XvX5 No oUO0 fOPXpXpXpXpXpXpXpXpOP ( NOdo^OV.sXvo<XBo. q.c.n.n.n.n.n.n.n",
+"o_o_o_o_o_o_.M.L @ $o@o{.s.^.Z & t.* ~omomomomomomomomomomomom.toO.b _ D.Jo@ $ @.Lo)o_o_o_o_o_o_",
+".C.C.C.C.C.Co~o8Xg kX^oeoZXf._XDXD 0omomomomomomomomomomomomomomomom.b #XCX^ kXgo8o~.C.C.C.C.C.C",
+"o'o'o'o'o'.CO>.$okX=oeXDo>O=XD./Xd.momomomomomomomomomomomomomom pX7.NOK 'oeX=ok.$O>.Co'o'o'o'o'",
+" ]o'o'o'.So_ TXh.o nXDXDXDXDXD.; %.bomomomomomomomomomomomomoOo`O9ojo>XDXDXD n.oXh To_ ]o'o'o'.S",
+".D.D.D.D.Do| SX|XY.+XDXDXDXDXDXDXZomomomomomomomomomomomomom.4Xd.;O=XDXDXDXD.+XYX| So|.D.D.D.D.D",
+"o[o[o[o[.D 5OxOvOzO*XDXDXDXD =oZo+omomomomomomomomomomomomomoP.;XDXDXDXDXDXDO*OzOvOx 5o]o[o[o[o[",
+".H.H.H.Ho' POU }oeXDXDXDXDXD.;X8o!omomomomomomomomomomomom.bX(.;XDXDXDXDXDXDXDoe }OU Po'.H.H.H.H",
+"o|o|o|o|.DOt.5XO.+XDXDXDXDXD &ONomomomomomomomomomomomomom.2.7._XDXDXDXDXDXDXD.+XO.5Ot.Do|o|o|o|",
+"o|o|o|o|o|Xi : j.WXDXDXDXD = rOaomomomomomomomomomomomomom AXS._XDXDXDXDXDXDXD.W j :Xio|o|o|o|o|",
+".L.L.L.L.I RXwXP.WXDXDXDXD.;XI momomomomomomomomomomomomomXN.=._XDXDXDXDXDXDXD.WXPXw R.I.L.L.L.L",
+"OOOOOOOOO; [OX.<O*XDXDXDXD IXoomomomomomomomomomomomomomom.UX_._XDXDXDXDXDXDXDO*.<OX [O;OOOOOOOO",
+".I.I.I.IO; )o*O1O*XDXDXD._.).Romomomomomog ~omomomomomomom.UX_._XDXDXDXDXDXDXDO*O1o* )O;.I.I.I.I",
+"O#O#O#O#O# KX-Xz.WXDXDXD.;XsoOomomomomom vowomomomomomomom.UX_._XDXDXDXDXDXDXD.WXzX- KO#O#O#O#O#",
+"O#O#O#O#. g Co5oeXDXDXDXq.Nomomomomom ,X>oromomomomomomom.UX_._XDXDXDXDXDXDXDoeo5 C gOOO#O#O#O#",
+".~.~.~.~OO.- {X).XXDXD._o; HomomomomomohO9.Romomomomomomom.UX_._XDXDXDXDXDXDXD.XX) {.-OO.~.~.~.~",
+"O;O;O;O;O#XyOD .o2XDXD.;Ogomomomomomom / r.Uomomomomomomom.UX_._XDXDXDXDXDXDXDo2 .ODXyO#O;O;O;O;",
+".`.`.`.`O;Oeod.:oX.WXDOAoVomomomomomO3XaOk.Uomomomomomomom.UX_._XDXDXDXDXDXD.WoX.:odOeO;.`.`.`.`",
+"O>O>O>O>O>O;X,.POw.W._ doJomomomomomOMoj r.Uomomomomomomom.UX_._XDXDXDXDXDXD.WOw.PX,O;O>O>O>O>O>",
+"O>O>O>O>O>O;XrOmox.0 9X8Xtomomomomom.6X`ou.Uomomomomomomom.UX_._XDXDXDXDXDoe.0oxOmXrO;O>O>O>O>O>",
+".].].].].].]O,.z JXkOH.VotomomomomX{ 2oiou.Uomomomomomomom.UX_._XDO= &O0 &OFXk J.zO,.].].].].].]",
+"O,O,O,O,O,O,O>OS.yOq.i._OZ ^omomom.E.9._ou.Uomomomomomomom.UX_._._.9.ZXdO=.iOq.yOSO>O,O,O,O,O,O,",
+".{.{.{.{.{.{.{.].,.A BX)oyXXO2omom.Q.;._ou.Uomomomomomomom.UOh._ dO-X9O=X) BOI.,.].{.{.{.{.{.{.{",
+"O<O<O<O<O<O<O<.{O8o(Xno#OLo7.YXuX O7oIoiOk.Romomomomomomom HOCoqOdo=o6OLo#Xno(O8.{O<O<O<O<O<O<O<",
+"O<O<O<O<O<O<O<O<.{X'XJ.PO5.[O iOgXVX:OVXsoKomomomomomomom.bOMX/.1O .[O5.PXJX'.{O<O<O<O<O<O<O<O<",
+".|.|.|.|.|.|.|.|.|.}X]XH.KXn.G eX<oN.e 8 6 Qomomomom.bXN.roo xX< e.GXn.KXHX].}.|.|.|.|.|.|.|.|.|",
+"O4O4O4O4O4O4O4O4O4O4O<X;Xe.vXBX+ofoFob 7.@XQ W | | WXQ.@ 7oboFofX+XB.vXeX;O<O4O4O4O4O4O4O4O4O4O4",
+"X.X.X.X.X.X.X.X.X.X.X.O4X#XW sO. J.K.xo@oC `O%.8.8O% `oCo@.x.K JO. sXWX#O4X.X.X.X.X.X.X.X.X.X.X.",
+"O8O8O8O6O8XUXUO8O8XUXUO8X..|OnX,oc.F $ Jo&XbXRO5O5XRXbo& J $.FocX,On.|X.O8XUX@X@O8.3O8O8O8O8O8X@",
+"O8O8O8O8O8O8O8O8O8O8O8O8O8O8X.X. aop ; c Eo}.PXMXM.Po} E c ;op aX.X.O8O8O8O8O8O8O8O8O8O8O8O8O8O8",
+"X#X#X#X#X#X#X#X#X#X#X#X#X#X#X#X#O8O4X$X6 P.-onX3X3on.- PX6X$O4O8X#X#X#X#X#X#X#X#X#X#X#X#X#X#X#X#",
+"OeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOeO8X4OGOnOcOcX} MOSX#OeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOe",
+"X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$O8ono-oAov.w.u.koEX#X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$",
+"X$X$X$X$X$X$X$X$X$olX$X$X$X$X$X$X$X$X$X#oD l.>o1O+.P.T.BOeX$X$X$X$X$X$X$OrOrX$X$X$X$X$X$X$X$X$X$",
+"OyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOyX#oHXEXFoBO&.TO:OYX$OyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOy",
+"X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%Oy POo.CX0 -Xx.g TOyX%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%",
+"X%X%OuOuOuOuOuOuOuOuOuOuOuOuOuOuOuOuOuX% oo$.h boYo4.O UX%OuOuOuOuOuOuOuOuOuOuOuOuOuOuOuOuOuX%X%",
+" Ou.#OuOuOiX&X&X&X&X&X&X&X&X&X&X&X&X&Oy.a 4 * h.K.KO&XlX%X&X&X&X&X&X&X&X&X&X&X&X&X&X&OuOuX~Ou "
+};
diff --git a/community/murmur/PKGBUILD b/community/murmur/PKGBUILD
index a564fc101..e99021395 100644
--- a/community/murmur/PKGBUILD
+++ b/community/murmur/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 111408 2014-05-18 11:46:04Z svenstaro $
+# $Id: PKGBUILD 113191 2014-06-15 21:55:33Z svenstaro $
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
# Contributor: Otto Allmendinger <otto.allmendinger@googlemail.com>
# Contributor: Malte Rabenseifner <malte@zearan.de>
pkgname=murmur
-pkgver=1.2.6
+pkgver=1.2.7
pkgrel=1
pkgdesc="The voice chat application server for Mumble"
arch=('i686' 'x86_64')
@@ -17,7 +17,7 @@ install="murmur.install"
source=("http://downloads.sourceforge.net/mumble/mumble-$pkgver.tar.gz"
"murmur.dbus.conf"
"murmur.service")
-md5sums=('32b37ff426863d7abeb1b7c1938652ff'
+md5sums=('7f87f57859902b0ea8385a49f34d126d'
'eddea4cdbd0bde4b960a67e16b5d5478'
'd27a9adcd7561859e7b033046729bc0e')
diff --git a/community/openscenegraph/PKGBUILD b/community/openscenegraph/PKGBUILD
index e5e1734b6..390f135fb 100644
--- a/community/openscenegraph/PKGBUILD
+++ b/community/openscenegraph/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 94900 2013-08-01 06:55:23Z bpiotrowski $
+# $Id: PKGBUILD 113167 2014-06-14 19:22:21Z andyrtr $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: Hans Janssen <janserv@gmail.com>
# Contributor: my64 <packages@obordes.com>
@@ -6,7 +6,7 @@
pkgname=openscenegraph
pkgver=3.2.0
-pkgrel=3
+pkgrel=4
pkgdesc="An Open Source, high performance real-time graphics toolkit"
arch=('i686' 'x86_64')
license=('custom:OSGPL')
@@ -17,8 +17,15 @@ optdepends=('libvncserver' 'gdal' 'openexr' 'poppler-glib' 'qt4')
conflicts=('openthreads')
provides=('openthreads')
#source=(http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-$pkgver/source/OpenSceneGraph-$pkgver.zip
-source=(http://www.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-$pkgver.zip)
-md5sums=('4980f8692712a24d4c99f363f80c6814')
+source=(http://www.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-$pkgver.zip
+ giflib.patch)
+md5sums=('4980f8692712a24d4c99f363f80c6814'
+ '8c06c8410e8840e83c242b8b401cdad7')
+
+prepare() {
+ cd OpenSceneGraph-$pkgver
+ patch -p1 <$srcdir/giflib.patch
+}
build() {
cd OpenSceneGraph-$pkgver
diff --git a/community/openscenegraph/giflib.patch b/community/openscenegraph/giflib.patch
new file mode 100644
index 000000000..8bb72a8d3
--- /dev/null
+++ b/community/openscenegraph/giflib.patch
@@ -0,0 +1,12 @@
+diff -wbBur OpenSceneGraph-3.2.0/src/osgPlugins/gif/ReaderWriterGIF.cpp OpenSceneGraph-3.2.0.q/src/osgPlugins/gif/ReaderWriterGIF.cpp
+--- OpenSceneGraph-3.2.0/src/osgPlugins/gif/ReaderWriterGIF.cpp 2013-06-03 18:04:02.000000000 +0400
++++ OpenSceneGraph-3.2.0.q/src/osgPlugins/gif/ReaderWriterGIF.cpp 2014-05-29 19:00:40.163985068 +0400
+@@ -561,7 +561,7 @@
+ *width_ret = giffile->SWidth;
+ *height_ret = giffile->SHeight;
+ *numComponents_ret = 4;
+- DGifCloseFile(giffile);
++ DGifCloseFile(giffile, NULL);
+ return buffer;
+ }
+
diff --git a/community/openssh-askpass/PKGBUILD b/community/openssh-askpass/PKGBUILD
index 2a6124ade..9a798729d 100644
--- a/community/openssh-askpass/PKGBUILD
+++ b/community/openssh-askpass/PKGBUILD
@@ -3,13 +3,13 @@
# Contributor: Massimiliano Torromeo <Massimiliano.Torromeo AT gmail DOT com>
pkgname=openssh-askpass
-pkgver=2.0.1
+pkgver=2.0.2
pkgrel=1
pkgdesc='A plasma-like passphrase dialog for ssh'
arch=('i686' 'x86_64')
url='http://hugo.pereira.free.fr/software/index.php?page=package&package_list=software_list_qt4&package=openssh-askpass&full=0'
license=('GPL')
-depends=('openssh' 'qt4')
+depends=('openssh' 'qt4' 'xcb-util-keysyms')
makedepends=('cmake')
provides=('x11-ssh-askpass')
conflicts=('x11-ssh-askpass')
@@ -32,5 +32,5 @@ package() {
install -Dm755 "$srcdir/$pkgname.sh" "$pkgdir/etc/profile.d/$pkgname.sh"
}
-md5sums=('c196971941ff3773d9f977b52015b214'
+md5sums=('b8237a47f9145d63cd70694e3889e057'
'baec3f0499b851aca6705968fa9e0df7')
diff --git a/community/openvswitch/PKGBUILD b/community/openvswitch/PKGBUILD
index 0744a8164..90839dbb7 100644
--- a/community/openvswitch/PKGBUILD
+++ b/community/openvswitch/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 111252 2014-05-15 14:55:44Z spupykin $
+# $Id: PKGBUILD 113226 2014-06-16 11:06:53Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Pedro Martinez-Julia (pedromj@um.es)
# Contributor: Matt Monaco <net 0x01b dgbaley27>
pkgname=openvswitch
pkgver=2.1.2
-pkgrel=2
+pkgrel=3
pkgdesc="Production Quality, Multilayer Open Virtual Switch"
url="http://openvswitch.org"
license=('APACHE')
@@ -20,8 +20,8 @@ makedepends=('python2')
optdepends=('python2')
md5sums=('430ff6d1e1fc81e9c5ebc2e641cfc953'
'0534c19ed27d2ff8c6b32d87c07bc76f'
- '69b29d231bcc3002528fd29f1f78a37f'
- 'c5338742b6667f7be611176afe209230')
+ '3a1b706c1adfb1166b58bc9d65ea396f'
+ '4ec9c05448d6910c5fd581e964518ef7')
build() {
cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/openvswitch/ovs-vswitchd.service b/community/openvswitch/ovs-vswitchd.service
index 602b7472f..f845e04cf 100644
--- a/community/openvswitch/ovs-vswitchd.service
+++ b/community/openvswitch/ovs-vswitchd.service
@@ -7,8 +7,9 @@ Requires = ovsdb-server.service
After = ovsdb-server.service
[Service]
-ExecStartPre = /sbin/modprobe openvswitch
-ExecStart = /usr/sbin/ovs-vswitchd
+ExecStartPre = /sbin/modprobe openvswitch
+PIDFile = /run/openvswitch/ovs-vswitchd.pid
+ExecStart = /usr/sbin/ovs-vswitchd --pidfile=/run/openvswitch/ovs-vswitchd.pid
[Install]
WantedBy = multi-user.target
diff --git a/community/openvswitch/ovsdb-server.service b/community/openvswitch/ovsdb-server.service
index b0badc6b9..6bcb76bb2 100644
--- a/community/openvswitch/ovsdb-server.service
+++ b/community/openvswitch/ovsdb-server.service
@@ -3,4 +3,5 @@ Description = Open vSwitch Database Server
Documentation = man:ovsdb-server
[Service]
-ExecStart = /usr/sbin/ovsdb-server --remote=punix:/var/run/openvswitch/db.sock
+PIDFile=/run/openvswitch/ovsdb-server.pid
+ExecStart=/usr/sbin/ovsdb-server --remote=punix:/var/run/openvswitch/db.sock --pidfile=/run/openvswitch/ovsdb-server.pid
diff --git a/community/opus-tools/PKGBUILD b/community/opus-tools/PKGBUILD
index be421d277..72292b03c 100644
--- a/community/opus-tools/PKGBUILD
+++ b/community/opus-tools/PKGBUILD
@@ -1,10 +1,11 @@
-# $Id: PKGBUILD 102289 2013-12-07 11:00:38Z bpiotrowski $
-# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
+# $Id: PKGBUILD 113181 2014-06-15 17:58:24Z kkeen $
+# Maintainer: Kyle Keen <keenerd@gmail.com>
+# Contributor: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
# Contributor: Michael Düll <mail@akurei.me>
# Contributor: pumbur
pkgname=opus-tools
-pkgver=0.1.8
+pkgver=0.1.9
pkgrel=1
pkgdesc='Collection of tools for Opus audio codec'
arch=('i686' 'x86_64')
@@ -12,17 +13,17 @@ url='http://wiki.xiph.org/Opus-tools'
license=('BSD')
depends=('flac' 'libogg' 'opus')
source=(http://downloads.xiph.org/releases/opus/$pkgname-$pkgver.tar.gz)
-md5sums=('b424790eda9357a4df394e2d7ca19eac')
+md5sums=('20682e4d8d1ae9ec5af3cf43e808b8cb')
build(){
- cd $pkgname-$pkgver
+ cd "$pkgname-$pkgver"
./configure --prefix=/usr
make
}
package() {
- cd $pkgname-$pkgver
+ cd "$pkgname-$pkgver"
make DESTDIR="$pkgdir" install
- install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-}
+ install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
diff --git a/community/partclone/PKGBUILD b/community/partclone/PKGBUILD
index e18989c70..2ed0f9f43 100644
--- a/community/partclone/PKGBUILD
+++ b/community/partclone/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 106463 2014-03-04 02:29:43Z bisson $
-# Maintainer: Jonathan Steel <jsteel@aur.archlinux.org>
+# $Id: PKGBUILD 113136 2014-06-14 07:24:37Z jsteel $
+# Maintainer: Jonathan Steel <jsteel at aur.archlinux.org>
# Contrinutor: Dan Serban
# Contributor: Franz Burgmann
# Contributor: Todd Partridge (Gen2ly)
# Contributor: Ivan Sichmann Freitas
pkgname=partclone
-pkgver=0.2.69
-pkgrel=2
+pkgver=0.2.70
+pkgrel=1
pkgdesc="Utilities to save and restore used blocks on a partition"
arch=('i686' 'x86_64')
url="http://partclone.org"
license=('GPL')
depends=('progsreiserfs' 'ntfs-3g')
-source=(https://downloads.sourceforge.net/project/$pkgname/stable/$pkgver/${pkgname}_$pkgver.orig.tar.gz)
-md5sums=('2cc3b4e49819da32adcf63ef9246dca0')
+source=(https://downloads.sourceforge.net/project/$pkgname/stable/$pkgver/src/$pkgname-$pkgver.tar.gz)
+md5sums=('92708a46e13f96544539f0073a162a67')
build() {
cd "$srcdir"/$pkgname-$pkgver
diff --git a/community/passenger/PKGBUILD b/community/passenger/PKGBUILD
index 0354da8c7..7774303eb 100644
--- a/community/passenger/PKGBUILD
+++ b/community/passenger/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 110409 2014-04-29 11:37:12Z spupykin $
+# $Id: PKGBUILD 113206 2014-06-16 10:29:54Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
pkgname=passenger
-pkgver=4.0.41
+pkgver=4.0.45
pkgrel=1
pkgdesc="mod_rails passenger"
arch=('i686' 'x86_64')
@@ -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=('ce2b669c498457cf385d250eea43b055')
+md5sums=('ce85ed506a084112eaa015a3642007d9')
prepare() {
cd $srcdir/passenger-release-$pkgver
diff --git a/community/percona-server/PKGBUILD b/community/percona-server/PKGBUILD
index cd9c8f0df..201f86fce 100644
--- a/community/percona-server/PKGBUILD
+++ b/community/percona-server/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 111530 2014-05-19 16:34:14Z mtorromeo $
+# $Id: PKGBUILD 113245 2014-06-16 15:50:59Z mtorromeo $
# Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
pkgbase=percona-server
pkgname=('libperconaserverclient' 'percona-server-clients' 'percona-server')
-pkgver=5.6.17_65.0
+pkgver=5.6.17_66.0
_pkgver=${pkgver/_/-}
_myver=${pkgver/_rel*}
pkgrel=2
@@ -137,7 +137,7 @@ package_percona-server() {
rm usr/share/man/man1/mysql-test-run.pl.1
}
-sha256sums=('e4246f6773330376e0548bc5d6d590e822e7be9d6fc8ceeece8f4feeafd2b9a3'
+sha256sums=('645bb6f59d0478ac315a2a0a4e64fa3fc5a240547d464b274b2026643111fe98'
'82a241d9fa4032187a26597d044e94ba810b209b53a7ce14bb6eb92555993a48'
'9bc66470f3f80534c0bb62f9f8325ccf60b164f421f74ad74a963f065d7b1869'
'badf6a701d9dc6ea3b4ddca26cb0f42b6236432ccdbc14c64962147802594a60'
diff --git a/community/pidgin-lwqq/PKGBUILD b/community/pidgin-lwqq/PKGBUILD
index c146b7301..7f41fef28 100644
--- a/community/pidgin-lwqq/PKGBUILD
+++ b/community/pidgin-lwqq/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 110770 2014-05-06 17:34:41Z fyan $
+# $Id: PKGBUILD 113107 2014-06-13 16:51:24Z fyan $
# Maintainer: Felix Yan <felixonmars@gmail.com>
pkgname=pidgin-lwqq
-pkgver=0.3.0
+pkgver=0.3.1
_gitver="tag=v$pkgver"
#_gitver='commit=9537d7053a91d2813e15f834075688097818c7c8'
pkgrel=1
@@ -19,7 +19,7 @@ source=("git://github.com/xiehuc/pidgin-lwqq.git#$_gitver")
build() {
cd $pkgname
-
+
cmake -DCMAKE_INSTALL_PREFIX=/usr .
make
}
diff --git a/community/python-cx_freeze/PKGBUILD b/community/python-cx_freeze/PKGBUILD
index 293580679..573b0cf10 100644
--- a/community/python-cx_freeze/PKGBUILD
+++ b/community/python-cx_freeze/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 108438 2014-03-27 14:47:41Z fyan $
+# $Id: PKGBUILD 113126 2014-06-13 22:04:49Z arodseth $
# Maintainer: Alexander Rødseth <rodseth@gmail.com>
# Contributor: Ray Rashif <schiv@archlinux.org>
# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
@@ -7,15 +7,15 @@
pkgbase=python-cx_freeze
pkgname=('python-cx_freeze' 'python2-cx_freeze')
-pkgver=4.3.2
-pkgrel=2
+pkgver=4.3.3
+pkgrel=1
pkgdesc='Set of utilities for freezing Python scripts into executables'
arch=('x86_64' 'i686')
url='http://cx-freeze.sourceforge.net/'
license=('PSF')
makedepends=('python' 'python2')
source=("http://prdownloads.sourceforge.net/cx-freeze/cx_Freeze-$pkgver.tar.gz")
-sha256sums=('d634aae1e1d20b660d24245450b8a5ea3ad9c443cd735d8fbe17c1d93b8b23df')
+sha256sums=('eaac9ab61117c64371384766e0b9c6603d3bdb23cf306b257f31b8a3a5740729')
package_python-cx_freeze() {
depends=('python')
diff --git a/community/rsyslog/PKGBUILD b/community/rsyslog/PKGBUILD
index 5a0fff4f6..bb4131bb7 100644
--- a/community/rsyslog/PKGBUILD
+++ b/community/rsyslog/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 109747 2014-04-18 13:05:22Z spupykin $
+# $Id: PKGBUILD 113218 2014-06-16 10:31:30Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
pkgname=rsyslog
-pkgver=8.2.1
+pkgver=8.2.2
pkgrel=1
pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability"
url="http://www.rsyslog.com/"
@@ -21,7 +21,7 @@ options=('strip' 'zipman')
source=("http://www.rsyslog.com/files/download/rsyslog/rsyslog-$pkgver.tar.gz"
'rsyslog.logrotate'
'rsyslog.conf')
-md5sums=('be8c0117e29b6a0313a3b8148f562e07'
+md5sums=('87f15fc5710af292fd1690a53541ccb5'
'0d990373f5c70ddee989296007b4df5b'
'd61dd424e660eb16401121eed20d98bc')
diff --git a/community/rubinius/PKGBUILD b/community/rubinius/PKGBUILD
index 9ecb047ac..fccc61828 100644
--- a/community/rubinius/PKGBUILD
+++ b/community/rubinius/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 113041 2014-06-11 21:16:34Z heftig $
+# $Id: PKGBUILD 113258 2014-06-16 18:49:59Z foutrelis $
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
pkgbase=rubinius
pkgname=(rubinius rubinius-ruby)
pkgver=2.2.9
-pkgrel=1
+pkgrel=2
pkgdesc="Ruby runtime written in Ruby, designed for concurrency"
arch=(i686 x86_64)
url="http://rubini.us"
diff --git a/community/swftools/PKGBUILD b/community/swftools/PKGBUILD
index 727b3c02d..08fdccf98 100644
--- a/community/swftools/PKGBUILD
+++ b/community/swftools/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 94930 2013-08-01 07:01:25Z bpiotrowski $
+# $Id: PKGBUILD 113168 2014-06-14 19:22:22Z andyrtr $
# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
# Contributor: Vinay S Shastry <vinayshastry@gmail.com>
pkgname=swftools
pkgver=0.9.2
-pkgrel=3
+pkgrel=4
pkgdesc="A collection of SWF manipulation and creation utilities"
arch=('i686' 'x86_64')
url="http://www.swftools.org/"
@@ -14,15 +14,15 @@ makedepends=('bison' 'flex' 'zlib' 'patch')
changelog=$pkgname.changelog
source=(http://www.swftools.org/$pkgname-$pkgver.tar.gz
$pkgname-$pkgver.patch
- giflib-5.0.patch)
+ giflib-5.1.patch)
sha256sums=('bf6891bfc6bf535a1a99a485478f7896ebacbe3bbf545ba551298080a26f01f1'
'80f69c86ed06b315f576a733fd1e24145b88aef9934085f3790179a119b7923d'
- 'd163438fe736fb6d1ddbecaa5099a2edac35044c9fc697a8b7167e57f0d513e0')
+ '6a995dfd674c5954f5b967e3d45d6845a186872fcaa4223d725902fd4d679f1b')
prepare() {
cd ${srcdir}/$pkgname-$pkgver
- patch -Np1 -i ../giflib-5.0.patch
+ patch -Np0 -i ../giflib-5.1.patch
sed -i 's#PrintGifError()#fprintf(stderr, "%s\\n", GifErrorString())#g' src/gif2swf.c
}
diff --git a/community/swftools/giflib-5.0.patch b/community/swftools/giflib-5.0.patch
deleted file mode 100644
index 48263c6f3..000000000
--- a/community/swftools/giflib-5.0.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff -rupN a/src/gif2swf.c b/src/gif2swf.c
---- a/src/gif2swf.c 2011-01-02 03:30:29.000000000 +0000
-+++ b/src/gif2swf.c 2013-07-30 19:30:32.666103403 +0000
-@@ -65,6 +65,15 @@ enum disposal_method {
- RESTORE_TO_PREVIOUS
- };
-
-+static void PrintGifError(int err)
-+{
-+ char *Err = GifErrorString(err);
-+
-+ if (Err != NULL)
-+ fprintf(stderr, "\nGIF-LIB error: %s.\n", Err);
-+ else
-+ fprintf(stderr, "\nGIF-LIB undefined error %d.\n", err);
-+}
-
- void SetFrameAction(TAG ** t, const char *src, int ver)
- {
-@@ -230,13 +239,13 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, c
- }
- fclose(fi);
-
-- if ((gft = DGifOpenFileName(sname)) == NULL) {
-+ if ((gft = DGifOpenFileName(sname, NULL)) == NULL) {
- fprintf(stderr, "%s is not a GIF file!\n", sname);
- return t;
- }
-
- if (DGifSlurp(gft) != GIF_OK) {
-- PrintGifError();
-+ PrintGifError(DGifSlurp(gft));
- return t;
- }
-
-@@ -488,7 +497,7 @@ int CheckInputFile(char *fname, char **r
- }
- fclose(fi);
-
-- if ((gft = DGifOpenFileName(s)) == NULL) {
-+ if ((gft = DGifOpenFileName(s, NULL)) == NULL) {
- fprintf(stderr, "%s is not a GIF file!\n", fname);
- return -1;
- }
-@@ -499,7 +508,7 @@ int CheckInputFile(char *fname, char **r
- global.max_image_height = gft->SHeight;
-
- if (DGifSlurp(gft) != GIF_OK) {
-- PrintGifError();
-+ PrintGifError(DGifSlurp(gft));
- return -1;
- }
- // After DGifSlurp() call, gft->ImageCount become available
diff --git a/community/swftools/giflib-5.1.patch b/community/swftools/giflib-5.1.patch
new file mode 100644
index 000000000..5401a90a0
--- /dev/null
+++ b/community/swftools/giflib-5.1.patch
@@ -0,0 +1,92 @@
+$NetBSD$
+
+Fix build with giflib-5.x.
+
+--- src/gif2swf.c.orig 2011-01-02 03:30:29.000000000 +0000
++++ src/gif2swf.c
+@@ -65,6 +65,17 @@ enum disposal_method {
+ RESTORE_TO_PREVIOUS
+ };
+
++/* from util/qprintf.c of giflib 5.0.4 */
++void
++PrintGifError(int ErrorCode)
++{
++ char *Err = GifErrorString(ErrorCode);
++
++ if (Err != NULL)
++ fprintf(stderr, "GIF-LIB error: %s.\n", Err);
++ else
++ fprintf(stderr, "GIF-LIB undefined error %d.\n", ErrorCode);
++}
+
+ void SetFrameAction(TAG ** t, const char *src, int ver)
+ {
+@@ -200,6 +211,7 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, c
+ SRECT r;
+ MATRIX m;
+ int fs;
++ int ErrorCode;
+
+ U8 *imagedata, *from, *to;
+ GifImageDesc *img;
+@@ -230,13 +242,13 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, c
+ }
+ fclose(fi);
+
+- if ((gft = DGifOpenFileName(sname)) == NULL) {
++ if ((gft = DGifOpenFileName(sname, &ErrorCode)) == NULL) {
+ fprintf(stderr, "%s is not a GIF file!\n", sname);
+ return t;
+ }
+
+ if (DGifSlurp(gft) != GIF_OK) {
+- PrintGifError();
++ PrintGifError(ErrorCode);
+ return t;
+ }
+
+@@ -455,7 +467,7 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, c
+
+ free(pal);
+ free(imagedata);
+- DGifCloseFile(gft);
++ DGifCloseFile(gft, NULL);
+
+ return t;
+ }
+@@ -465,6 +477,7 @@ int CheckInputFile(char *fname, char **r
+ FILE *fi;
+ char *s = malloc(strlen(fname) + 5);
+ GifFileType *gft;
++ int ErrorCode;
+
+ if (!s)
+ exit(2);
+@@ -488,7 +501,7 @@ int CheckInputFile(char *fname, char **r
+ }
+ fclose(fi);
+
+- if ((gft = DGifOpenFileName(s)) == NULL) {
++ if ((gft = DGifOpenFileName(s, &ErrorCode)) == NULL) {
+ fprintf(stderr, "%s is not a GIF file!\n", fname);
+ return -1;
+ }
+@@ -499,7 +512,7 @@ int CheckInputFile(char *fname, char **r
+ global.max_image_height = gft->SHeight;
+
+ if (DGifSlurp(gft) != GIF_OK) {
+- PrintGifError();
++ PrintGifError(ErrorCode);
+ return -1;
+ }
+ // After DGifSlurp() call, gft->ImageCount become available
+@@ -518,7 +531,7 @@ int CheckInputFile(char *fname, char **r
+ fprintf(stderr, "frame: %u, delay: %.3f sec\n", i + 1, getGifDelayTime(gft, i) / 100.0);
+ }
+
+- DGifCloseFile(gft);
++ DGifCloseFile(gft, NULL);
+
+ return 0;
+ }
diff --git a/community/sxiv/PKGBUILD b/community/sxiv/PKGBUILD
index dbe4d6937..36b323de1 100644
--- a/community/sxiv/PKGBUILD
+++ b/community/sxiv/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 110167 2014-04-25 15:45:41Z bpiotrowski $
+# $Id: PKGBUILD 113169 2014-06-14 19:22:23Z andyrtr $
# Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
# Contributor: Thomas Dziedzic < gostrc at gmail >
# Contributor: Bert Muennich <muennich at informatik.hu-berlin.de>
@@ -6,22 +6,29 @@
pkgname=sxiv
pkgver=1.2
-pkgrel=1
+pkgrel=2
pkgdesc='Simple X Image Viewer'
arch=('i686' 'x86_64')
license=('GPL2')
install=sxiv.install
url='https://github.com/muennich/sxiv'
depends=('imlib2' 'desktop-file-utils')
-source=(https://github.com/muennich/sxiv/archive/v$pkgver.tar.gz)
-md5sums=('9b79d3c70693d9abbc66295cf6f281a0')
+source=(https://github.com/muennich/sxiv/archive/v$pkgver.tar.gz
+ giflib-5.1.0.patch)
+md5sums=('9b79d3c70693d9abbc66295cf6f281a0'
+ '98a6c832655b90e57ff137df41a1fb90')
+
+prepare() {
+ cd $pkgname-$pkgver
+ patch -p1 -i ../giflib-5.1.0.patch
+}
build() {
- make -C sxiv-$pkgver
+ make -C $pkgname-$pkgver
}
package() {
- cd sxiv-$pkgver
+ cd $pkgname-$pkgver
make PREFIX="$pkgdir"/usr install
install -Dm644 sxiv.desktop "$pkgdir"/usr/share/applications/sxiv.desktop
}
diff --git a/community/sxiv/giflib-5.1.0.patch b/community/sxiv/giflib-5.1.0.patch
new file mode 100644
index 000000000..54115553f
--- /dev/null
+++ b/community/sxiv/giflib-5.1.0.patch
@@ -0,0 +1,15 @@
+diff -rupN a/image.c b/image.c
+--- a/image.c 2014-04-24 20:40:26.000000000 +0200
++++ b/image.c 2014-05-27 11:39:41.786715632 +0200
+@@ -278,7 +278,11 @@ bool img_load_gif(img_t *img, const file
+ }
+ } while (rec != TERMINATE_RECORD_TYPE);
+
++#if defined(GIFLIB_MAJOR) && GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1
++ DGifCloseFile(gif, NULL);
++#else
+ DGifCloseFile(gif);
++#endif
+
+ if (err && !file->loaded)
+ warn("corrupted gif file: %s", file->name);
diff --git a/community/sylpheed/PKGBUILD b/community/sylpheed/PKGBUILD
index 2456ae056..8f421779f 100644
--- a/community/sylpheed/PKGBUILD
+++ b/community/sylpheed/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 108819 2014-04-04 16:08:03Z speps $
+# $Id: PKGBUILD 113100 2014-06-13 15:15:49Z speps $
# Maintainer: speps <speps at aur dot archlinux dot org>
# Contributor: Alexander Fehr <pizzapunk gmail com>
# Contributor: dorphell <dorphell@archlinux.org>
pkgname=sylpheed
-pkgver=3.4.1
+pkgver=3.4.2
pkgrel=1
pkgdesc="Lightweight and user-friendly e-mail client"
arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ depends=('compface' 'gpgme' 'gtkspell' 'desktop-file-utils')
makedepends=('openssl')
install="$pkgname.install"
source=("http://sylpheed.sraoss.jp/$pkgname/v${pkgver%.*}/$pkgname-$pkgver.tar.bz2")
-md5sums=('9071bb341a6d96244fe7cd5ff013c70d')
+md5sums=('d4e53489763ff2cb575ab02890d91dc9')
build() {
cd $pkgname-$pkgver
diff --git a/community/torcs/PKGBUILD b/community/torcs/PKGBUILD
index bb0d02f18..aabf3f6ee 100644
--- a/community/torcs/PKGBUILD
+++ b/community/torcs/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 101128 2013-11-17 21:08:42Z spupykin $
+# $Id: PKGBUILD 113236 2014-06-16 11:43:01Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Shahar Weiss <sweiss4@gmx.net>
pkgname=torcs
-pkgver=1.3.5
+pkgver=1.3.6
pkgrel=1
pkgdesc="A 3D racing cars simulator using OpenGL"
url="http://torcs.sourceforge.net"
@@ -13,7 +13,7 @@ depends=('freeglut' 'libpng' 'freealut' 'libxi' 'libxmu' 'libxrandr' 'libvorbis'
makedepends=('plib' 'mesa')
options=('!makeflags')
source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-${pkgver/_/-}.tar.bz2)
-md5sums=('cd7bc804668af531df9511a6f64a1e84')
+md5sums=('e39e33052caa8a11094091f2cdf7b528')
build() {
cd $srcdir/$pkgname-${pkgver/_/-}
diff --git a/community/volumeicon/PKGBUILD b/community/volumeicon/PKGBUILD
index 2e09342b3..f52222c64 100644
--- a/community/volumeicon/PKGBUILD
+++ b/community/volumeicon/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 108393 2014-03-27 13:24:26Z arodseth $
+# $Id: PKGBUILD 113124 2014-06-13 21:48:36Z arodseth $
# Maintainer: Alexander Rødseth <rodseth@gmail.com>
# Contributor: Maato <maato softwarebakery com>
@@ -8,26 +8,33 @@
pkgname=volumeicon
pkgver=0.5.0
-pkgrel=2
+pkgrel=3
pkgdesc='Volume control for your system tray'
arch=('x86_64' 'i686')
url='http://softwarebakery.com/maato/volumeicon.html'
license=('GPL3')
depends=('gtk3' 'alsa-lib' 'libnotify')
-makedepends=('intltool')
-source=("http://softwarebakery.com/maato/files/volumeicon/$pkgname-$pkgver.tar.gz")
-sha256sums=('e5f1179f9ec5ab25e3740e4f6bbe0baa75368f0ae87d370197b3fbefb61bd782')
+makedepends=('intltool' 'git')
+source=('git://github.com/Maato/volumeicon.git#commit=9e3755fdbe')
+md5sums=('SKIP')
+
+pkgver() {
+ cd "$pkgname"
+
+ head -1 ChangeLog | cut -d: -f1
+}
prepare() {
- cd "$pkgname-$pkgver"
+ cd "$pkgname"
- aclocal
- autoconf
- automake --add-missing
+ #aclocal
+ #autoconf
+ #automake --add-missing
+ ./autogen.sh
}
build() {
- cd "$pkgname-$pkgver"
+ cd "$pkgname"
./configure \
--prefix=/usr \
@@ -36,7 +43,7 @@ build() {
}
package() {
- make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
+ make -C "$pkgname" DESTDIR="$pkgdir" install
}
# vim:set ts=2 sw=2 et:
diff --git a/community/wireshark/PKGBUILD b/community/wireshark/PKGBUILD
index f95ba4e2c..801131027 100644
--- a/community/wireshark/PKGBUILD
+++ b/community/wireshark/PKGBUILD
@@ -1,25 +1,18 @@
-# $Id: PKGBUILD 111041 2014-05-12 09:22:44Z tredaelli $
+# $Id: PKGBUILD 113098 2014-06-13 14:27:34Z tredaelli $
# Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com>
# Contributor: Guillaume ALAUX <guillaume@archlinux.org>
# Contributor: Florian Pritz <bluewind at jabber dot ccc dot de>
pkgname=('wireshark-cli' 'wireshark-gtk')
pkgbase=wireshark
-pkgver=1.10.7
-pkgrel=2
+pkgver=1.10.8
+pkgrel=1
arch=('i686' 'x86_64')
license=('GPL2')
makedepends=('gtk3' 'krb5' 'libpcap' 'bash' 'gnutls' 'portaudio'
'lua' 'python' 'desktop-file-utils' 'hicolor-icon-theme')
url='http://www.wireshark.org/'
-source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2
- wireshark-1.10.5-fix-flow-crash.patch)
-sha256sums=('d98d263b31dd904a0337ba2db6d1a80bb495b4ac419a304f0f25c551d50cafc6'
- 'de630c5dd1aa87749fd33c0f3f94a30215e122b1a7ffffeb9bed213fad0fe3ea')
-
-prepare() {
- cd ${pkgbase}-${pkgver}
- patch -p1 -i "${srcdir}"/wireshark-1.10.5-fix-flow-crash.patch
-}
+source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2)
+sha256sums=('27d9cf4f0ca1ac436104b7f27caf8ad65f73db09edc8df0742ce9688c7d38763')
build() {
cd ${pkgbase}-${pkgver}
diff --git a/community/xmms2/PKGBUILD b/community/xmms2/PKGBUILD
index a93021723..be146cdcc 100644
--- a/community/xmms2/PKGBUILD
+++ b/community/xmms2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 112700 2014-06-05 09:34:30Z spupykin $
+# $Id: PKGBUILD 113220 2014-06-16 10:32:01Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
pkgname=xmms2
pkgver=0.8DrO_o
-pkgrel=28
+pkgrel=29
pkgdesc="complete rewrite of the popular music player"
arch=('i686' 'x86_64')
url="http://xmms2.org/"
@@ -74,7 +74,8 @@ build() {
./waf configure --prefix=/usr \
--with-optionals=python,launcher,xmmsclient++,xmmsclient++-glib,perl,ruby,nycli,pixmaps,et,mdns,medialib-updater \
--with-ruby-archdir=`ruby -e 'puts RbConfig::CONFIG["vendorarchdir"]'` \
- --with-ruby-libdir=`ruby -e 'puts RbConfig::CONFIG["vendorlibdir"]'`
+ --with-ruby-libdir=`ruby -e 'puts RbConfig::CONFIG["vendorlibdir"]'` \
+ --with-perl-archdir=`perl -V:installvendorarch | cut -f2 -d\'`
./waf build
}
diff --git a/community/xplanet/PKGBUILD b/community/xplanet/PKGBUILD
index 8da9880f9..7d996c430 100644
--- a/community/xplanet/PKGBUILD
+++ b/community/xplanet/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 101195 2013-11-19 11:02:23Z spupykin $
+# $Id: PKGBUILD 113170 2014-06-14 19:22:24Z andyrtr $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: dorphell <dorphell@archlinux.org>
# Committer: Judd Vinet <jvinet@zeroflux.org>
pkgname=xplanet
pkgver=1.3.0
-pkgrel=4
+pkgrel=5
pkgdesc="An Xearth wannabe"
arch=(i686 x86_64)
url="http://xplanet.sourceforge.net/"
@@ -14,7 +14,7 @@ depends=('pango' 'giflib' 'libtiff' 'libxss')
source=(http://downloads.sourceforge.net/project/xplanet/xplanet/$pkgver/xplanet-$pkgver.tar.gz
giflib6.patch)
md5sums=('41f7db2ccd1d8b4b989cacaf9adfe692'
- '74e1894304fe3b7caf0b3ddf3c471b0b')
+ '027342e9a912e8eaee3a913d6c710050')
prepare() {
cd $srcdir/$pkgname-$pkgver
diff --git a/community/xplanet/giflib6.patch b/community/xplanet/giflib6.patch
index aaf024198..653b9c8dc 100644
--- a/community/xplanet/giflib6.patch
+++ b/community/xplanet/giflib6.patch
@@ -1,6 +1,6 @@
-diff -wbBur xplanet-1.3.0/src/libimage/gif.c /home/sergej/tmp/BUILD/staging-i686/sergej/build/xplanet/src/xplanet-1.3.0/src/libimage/gif.c
+diff -wbBur xplanet-1.3.0/src/libimage/gif.c xplanet-1.3.0.my/src/libimage/gif.c
--- xplanet-1.3.0/src/libimage/gif.c 2006-03-26 01:50:51.000000000 +0300
-+++ /home/sergej/tmp/BUILD/staging-i686/sergej/build/xplanet/src/xplanet-1.3.0/src/libimage/gif.c 2013-07-30 18:21:17.412474692 +0400
++++ xplanet-1.3.0.my/src/libimage/gif.c 2014-05-29 18:59:14.830652716 +0400
@@ -20,7 +20,7 @@
#include <stdio.h>
@@ -59,6 +59,15 @@ diff -wbBur xplanet-1.3.0/src/libimage/gif.c /home/sergej/tmp/BUILD/staging-i686
return(0);
}
}
+@@ -154,7 +154,7 @@
+
+ free(buffer);
+
+- DGifCloseFile(infile);
++ DGifCloseFile(infile, NULL);
+ return(1);
+ }
+
@@ -178,7 +178,7 @@
return(0);
}
@@ -119,11 +128,13 @@ diff -wbBur xplanet-1.3.0/src/libimage/gif.c /home/sergej/tmp/BUILD/staging-i686
return(0);
}
ptr += width;
-@@ -233,7 +233,7 @@
+@@ -232,8 +232,8 @@
+
EGifSpew(outfile);
- if (EGifCloseFile(outfile) == GIF_ERROR)
+- if (EGifCloseFile(outfile) == GIF_ERROR)
- PrintGifError();
++ if (EGifCloseFile(outfile, NULL) == GIF_ERROR)
+ printf("%s\n", GifErrorString(GIF_ERROR));
free(buffer);
diff --git a/community/xulrunner/PKGBUILD b/community/xulrunner/PKGBUILD
index 2428bd69b..950ade5be 100644
--- a/community/xulrunner/PKGBUILD
+++ b/community/xulrunner/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 110094 2014-04-24 00:59:43Z cbehan $
+# $Id: PKGBUILD 113196 2014-06-16 03:29:43Z cbehan $
# Maintainer: Connor Behan <connor.behan@gmail.com>
# Contributor: Jan de Groot <jgc@archlinux.org>
# Contributor: Alexander Baldeck <alexander@archlinux.org>
pkgname=xulrunner
-pkgver=29.0
+pkgver=30.0
pkgrel=1
pkgdesc="Mozilla Runtime Environment"
arch=('i686' 'x86_64')
license=('MPL' 'GPL' 'LGPL')
-depends=('gtk2' 'mozilla-common' 'nss' 'libxt' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'libpulse' 'libevent' 'libvpx' 'python2')
-makedepends=('zip' 'unzip' 'pkg-config' 'diffutils' 'yasm' 'mesa' 'autoconf2.13' 'gstreamer0.10-base')
+depends=('gtk2' 'mozilla-common' 'nss' 'libxt' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'libpulse' 'libevent' 'libvpx' 'icu' 'python2')
+makedepends=('zip' 'unzip' 'pkg-config' 'diffutils' 'yasm' 'mesa' 'autoconf2.13' 'gst-plugins-base-libs')
url="http://wiki.mozilla.org/XUL:Xul_Runner"
source=(ftp://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/$pkgver/source/xulrunner-$pkgver.source.tar.bz2
mozconfig
@@ -18,8 +18,8 @@ source=(ftp://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/$pkgver/source/
shared-libs.patch)
options=('!emptydirs' '!makeflags' 'staticlibs')
replaces=('xulrunner-oss')
-sha256sums=('408fe73f88f6db2594e4e2bf44b51954c086d1c6948bfa79bb604321d8145230'
- '38f1f7a49a03b67a6b96bb696640a28fd20b42f6e45a27a81d25d66fd0148e4e'
+sha256sums=('7faee20752c87433c746a650006acdeb710b21d216894101bb44356123f557ad'
+ 'df0e663e7f9246b84936882e564270fac541c6bb39450b759abe686e5c27a052'
'23485d937035648add27a7657f6934dc5b295e886cdb0506eebd02a43d07f269'
'e2b4a00d14f4ba69c62b3f9ef9908263fbab179ba8004197cbc67edbd916fdf1')
diff --git a/community/xulrunner/mozconfig b/community/xulrunner/mozconfig
index ce95b12e8..2f77a93dc 100644
--- a/community/xulrunner/mozconfig
+++ b/community/xulrunner/mozconfig
@@ -12,6 +12,7 @@ ac_add_options --with-system-bz2
ac_add_options --with-system-png
ac_add_options --with-system-libevent
ac_add_options --with-system-libvpx
+ac_add_options --with-system-icu
ac_add_options --enable-system-hunspell
ac_add_options --enable-system-sqlite
ac_add_options --enable-system-ffi
@@ -21,7 +22,7 @@ ac_add_options --with-pthreads
# Features
ac_add_options --enable-startup-notification
-ac_add_options --enable-gstreamer
+ac_add_options --enable-gstreamer=1.0
ac_add_options --disable-crashreporter
ac_add_options --disable-updater
ac_add_options --disable-tests
diff --git a/community/zile/PKGBUILD b/community/zile/PKGBUILD
index 2f2e7ce5f..d0a9d64ac 100644
--- a/community/zile/PKGBUILD
+++ b/community/zile/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 106262 2014-02-26 03:23:44Z kkeen $
+# $Id: PKGBUILD 113183 2014-06-15 18:13:45Z kkeen $
# Maintainer: Kyle Keen <keenerd@gmail.com>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
# Contributor: Kevin Piche <kevin@archlinux.org>
pkgname=zile
-pkgver=2.4.10
+pkgver=2.4.11
pkgrel=1
pkgdesc="A small, fast, and powerful Emacs clone"
arch=('i686' 'x86_64')
@@ -13,8 +13,8 @@ license=('GPL3')
depends=('acl' 'gc' 'ncurses')
makedepends=('help2man')
source=(http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.sig})
-sha1sums=('256ae72ee43613c61bdbc558e8eb3dd50fe4de19'
- '0a7bc694588129e79b997e516a39c9f60ddfef1a')
+sha1sums=('ad2efb80031c3a406f8f83ac5d400a38bc297434'
+ 'SKIP')
build() {
cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/ziproxy/PKGBUILD b/community/ziproxy/PKGBUILD
index a9003f6dc..b7deb83f3 100644
--- a/community/ziproxy/PKGBUILD
+++ b/community/ziproxy/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 102371 2013-12-09 14:56:17Z spupykin $
+# $Id: PKGBUILD 113171 2014-06-14 19:22:25Z andyrtr $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Yejun Yang yejunx AT gmail DOT com
pkgname=ziproxy
pkgver=3.3.0
-pkgrel=4
+pkgrel=5
pkgdesc="forwarding, non-caching, compressing HTTP proxy server"
arch=('i686' 'x86_64')
url="http://ziproxy.sourceforge.net/"
@@ -31,7 +31,7 @@ source=(http://downloads.sourceforge.net/project/ziproxy/ziproxy/ziproxy-$pkgver
md5sums=('a8fda01591d455bb23c64c9c5ed3980d'
'feb35264391c790cedd5e995182b5ff5'
'3d2f9208b5ab6738c136049e1fd2e433'
- '0eb798863234ee0e9066812ef2a73539')
+ '0cc338d537e09c2d643283389b6cac06')
prepare() {
cd $srcdir/$pkgname-$pkgver
diff --git a/community/ziproxy/build-fix.patch b/community/ziproxy/build-fix.patch
index fb23953b6..c8667f0fc 100644
--- a/community/ziproxy/build-fix.patch
+++ b/community/ziproxy/build-fix.patch
@@ -1,6 +1,6 @@
-diff -wbBur ziproxy-3.3.0/src/image.c ziproxy-3.3.0.q/src/image.c
+diff -wbBur ziproxy-3.3.0/src/image.c ziproxy-3.3.0.my/src/image.c
--- ziproxy-3.3.0/src/image.c 2013-01-04 20:48:50.000000000 +0400
-+++ ziproxy-3.3.0.q/src/image.c 2013-08-11 00:24:03.868670477 +0400
++++ ziproxy-3.3.0.my/src/image.c 2014-05-29 18:52:52.980657105 +0400
@@ -93,6 +93,10 @@
#define MIN_INSIZE_TO_JPEG 600
#define MIN_INSIZE_TO_JP2K 800
@@ -21,3 +21,12 @@ diff -wbBur ziproxy-3.3.0/src/image.c ziproxy-3.3.0.q/src/image.c
return( IMG_RET_ERR_UNKNOWN + IMG_RET_FLG_WHILE_DECOMP);//more possible reasons
bmp = new_raw_bitmap();
+@@ -1083,7 +1087,7 @@
+ }
+ bmp->pal_bpp = bmp->bpp;
+
+- DGifCloseFile(GifFile);
++ DGifCloseFile(GifFile, NULL);
+ return IMG_RET_OK;
+ }
+