summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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
-rw-r--r--core/binutils/PKGBUILD12
-rw-r--r--core/binutils/binutils-2.24-shared-pie.patch99
-rw-r--r--core/binutils/binutils-2.24-static-pie-hang.patch78
-rw-r--r--core/dbus/PKGBUILD6
-rw-r--r--core/mdadm/PKGBUILD12
-rw-r--r--core/perl/PKGBUILD142
-rwxr-xr-xcore/perl/patchprov259
-rw-r--r--core/perl/provides.pl299
-rw-r--r--core/perl/upgpkg4
-rw-r--r--core/xfsprogs/PKGBUILD8
-rw-r--r--extra/aspell-pt/PKGBUILD8
-rw-r--r--extra/calligra/0001-switch-to-librevenge-based-import-libs.patch882
-rw-r--r--extra/calligra/PKGBUILD16
-rw-r--r--extra/cifs-utils/0003-cifskey-better-use-snprintf.patch49
-rw-r--r--extra/cifs-utils/0004-cifscreds-better-error-handling-when-key_search-fail.patch85
-rw-r--r--extra/cifs-utils/0005-cifscreds-better-error-handling-for-key_add.patch102
-rw-r--r--extra/cifs-utils/PKGBUILD23
-rw-r--r--extra/cmake/FindPython-Interp-Libs-Search-for-Python-3.4.patch40
-rw-r--r--extra/cmake/PKGBUILD39
-rw-r--r--extra/cmake/findfreetype.patch26
-rw-r--r--extra/efl/PKGBUILD24
-rw-r--r--extra/efl/efl-1.10.0-giflib-5.1.0.patch39
-rw-r--r--extra/emacs/PKGBUILD6
-rw-r--r--extra/emacs/emacs-24.3-giflib5.patch71
-rw-r--r--extra/fbida/PKGBUILD6
-rw-r--r--extra/fbida/ida-PrintGifError.patch22
-rw-r--r--extra/fontforge/PKGBUILD13
-rw-r--r--extra/fontforge/giflib.patch37
-rw-r--r--extra/gc/PKGBUILD8
-rw-r--r--extra/giflib/PKGBUILD5
-rw-r--r--extra/gparted/PKGBUILD6
-rw-r--r--extra/imlib/PKGBUILD11
-rw-r--r--extra/imlib/imlib-giflib5.patch110
-rw-r--r--extra/imlib/imlib-giflib51.patch126
-rw-r--r--extra/imlib2/PKGBUILD10
-rw-r--r--extra/imlib2/imlib2-giflib5.patch14
-rw-r--r--extra/imlib2/imlib2-giflib51.patch64
-rw-r--r--extra/java7-openjdk/PKGBUILD375
-rw-r--r--extra/java7-openjdk/giflib_5.1.diff14
-rw-r--r--extra/kdemultimedia-kmix/PKGBUILD22
-rw-r--r--extra/kdemultimedia-kmix/use-qdbus-qt4.patch59
-rw-r--r--extra/khtml/PKGBUILD6
-rw-r--r--extra/libcdr/PKGBUILD12
-rw-r--r--extra/libetonyek/PKGBUILD10
-rw-r--r--extra/libgadu/PKGBUILD18
-rw-r--r--extra/libgdiplus/PKGBUILD11
-rw-r--r--extra/libgdiplus/libgdiplus-2.10.9-giflib-5.1.0.patch30
-rw-r--r--extra/libmspub/PKGBUILD10
-rw-r--r--extra/libodfgen/PKGBUILD11
-rw-r--r--extra/libreoffice-fresh/PKGBUILD130
-rw-r--r--extra/libreoffice/PKGBUILD64
-rw-r--r--extra/libreoffice/PKGBUILD.43725
-rw-r--r--extra/libvisio/PKGBUILD12
-rw-r--r--extra/libwebp/PKGBUILD15
-rw-r--r--extra/libwebp/libwebp-0.4.0-giflib-5.1.0.patch12
-rw-r--r--extra/libwpd/PKGBUILD10
-rw-r--r--extra/libwpg/PKGBUILD11
-rw-r--r--extra/libwps/PKGBUILD11
-rw-r--r--extra/live-media/PKGBUILD6
-rw-r--r--extra/llvm/PKGBUILD27
-rw-r--r--extra/llvm/clang-3.4-max_align_t.patch36
-rw-r--r--extra/maxima/PKGBUILD6
-rw-r--r--extra/mesa/PKGBUILD4
-rw-r--r--extra/mkvtoolnix/PKGBUILD6
-rw-r--r--extra/perl-net-dns/PKGBUILD6
-rw-r--r--extra/php-apcu/PKGBUILD21
-rw-r--r--extra/php-xcache/PKGBUILD19
-rw-r--r--extra/pyqt4/PKGBUILD14
-rw-r--r--extra/pyqt5/PKGBUILD8
-rw-r--r--extra/refind-efi/PKGBUILD9
-rw-r--r--extra/sbcl/PKGBUILD6
-rw-r--r--extra/sip/PKGBUILD8
-rw-r--r--extra/tracker/PKGBUILD15
-rw-r--r--extra/tracker/tracker-1.0.1-giflib-5.1.0.patch12
-rw-r--r--extra/vc/PKGBUILD20
-rw-r--r--extra/vice/PKGBUILD11
-rw-r--r--extra/vice/vice-2.4-giflib-5.1.0.patch39
-rw-r--r--extra/windowmaker/PKGBUILD16
-rw-r--r--extra/windowmaker/giflib_510.diff54
-rw-r--r--extra/xcb-util-renderutil/PKGBUILD14
-rw-r--r--extra/xf86-video-intel/PKGBUILD18
-rw-r--r--extra/xf86-video-intel/sna-avoid-discarding-damage.patch103
162 files changed, 4541 insertions, 2481 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;
+ }
+
diff --git a/core/binutils/PKGBUILD b/core/binutils/PKGBUILD
index ba9f6327f..a227a791c 100644
--- a/core/binutils/PKGBUILD
+++ b/core/binutils/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 214772 2014-06-10 10:35:54Z allan $
+# $Id: PKGBUILD 215105 2014-06-14 08:08:00Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
pkgname=binutils
pkgver=2.24
-pkgrel=5
+pkgrel=6
pkgdesc="A set of programs to assemble and manipulate binary and object files"
arch=('i686' 'x86_64')
url="http://www.gnu.org/software/binutils/"
@@ -19,11 +19,11 @@ options=('staticlibs' '!distcc' '!ccache')
install=binutils.install
source=(ftp://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.bz2{,.sig}
binutils-2.24-lto-testsuite.patch
- binutils-2.24-static-pie-hang.patch)
+ binutils-2.24-shared-pie.patch)
md5sums=('e0f71a7b2ddab0f8612336ac81d9636b'
'SKIP'
'b16e895c24ff80acd98a21021eccefad'
- '4d2cf591560c3d25265778146bbe1941')
+ 'ec59461c4febab9cfe1c1ef33326bc50')
validpgpkeys=('EAF1C276A747E9ED86210CBAC3126D3B4AE55E93')
prepare() {
@@ -35,8 +35,8 @@ prepare() {
# fix lto testsuite with gcc-4.9 - commit b35d44f1
patch -p1 -i $srcdir/binutils-2.24-lto-testsuite.patch
- # fix autoconf hang with -static -fPIE -pie - commits d1ec1e40 and 818d220a
- patch -p1 -i $srcdir/binutils-2.24-static-pie-hang.patch
+ # fix issues with -static -fPIE -pie - commit 4199e3b8
+ patch -p1 -i $srcdir/binutils-2.24-shared-pie.patch
mkdir ${srcdir}/binutils-build
}
diff --git a/core/binutils/binutils-2.24-shared-pie.patch b/core/binutils/binutils-2.24-shared-pie.patch
new file mode 100644
index 000000000..d40aa47e0
--- /dev/null
+++ b/core/binutils/binutils-2.24-shared-pie.patch
@@ -0,0 +1,99 @@
+diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
+index 9a2fe89..13f86f0 100644
+--- a/ld/emultempl/elf32.em
++++ b/ld/emultempl/elf32.em
+@@ -1480,6 +1480,8 @@ gld${EMULATION_NAME}_before_allocation (void)
+ const char *rpath;
+ asection *sinterp;
+ bfd *abfd;
++ struct elf_link_hash_entry *ehdr_start = NULL;
++ struct bfd_link_hash_entry ehdr_start_save;
+
+ if (is_elf_hash_table (link_info.hash))
+ {
+@@ -1504,6 +1506,16 @@ gld${EMULATION_NAME}_before_allocation (void)
+ _bfd_elf_link_hash_hide_symbol (&link_info, h, TRUE);
+ if (ELF_ST_VISIBILITY (h->other) != STV_INTERNAL)
+ h->other = (h->other & ~ELF_ST_VISIBILITY (-1)) | STV_HIDDEN;
++ /* Don't leave the symbol undefined. Undefined hidden
++ symbols typically won't have dynamic relocations, but
++ we most likely will need dynamic relocations for
++ __ehdr_start if we are building a PIE or shared
++ library. */
++ ehdr_start = h;
++ ehdr_start_save = h->root;
++ h->root.type = bfd_link_hash_defined;
++ h->root.u.def.section = bfd_abs_section_ptr;
++ h->root.u.def.value = 0;
+ }
+ }
+
+@@ -1620,6 +1632,14 @@ ${ELF_INTERPRETER_SET_DEFAULT}
+
+ if (!bfd_elf_size_dynsym_hash_dynstr (link_info.output_bfd, &link_info))
+ einfo ("%P%F: failed to set dynamic section sizes: %E\n");
++
++ if (ehdr_start != NULL)
++ {
++ /* If we twiddled __ehdr_start to defined earlier, put it back
++ as it was. */
++ ehdr_start->root.type = ehdr_start_save.type;
++ ehdr_start->root.u = ehdr_start_save.u;
++ }
+ }
+
+ EOF
+diff --git a/ld/testsuite/ld-elf/ehdr_start-shared.d b/ld/testsuite/ld-elf/ehdr_start-shared.d
+new file mode 100644
+index 0000000..c17516a
+--- /dev/null
++++ b/ld/testsuite/ld-elf/ehdr_start-shared.d
+@@ -0,0 +1,9 @@
++#source: ehdr_start.s
++#ld: -e _start -shared
++#nm: -n
++#target: *-*-linux* *-*-gnu* *-*-nacl*
++#xfail: cris*-*-* frv-*-*
++
++#...
++[0-9a-f]*000 [Adrt] __ehdr_start
++#pass
+diff --git a/ld/testsuite/ld-elf/ehdr_start-userdef.d b/ld/testsuite/ld-elf/ehdr_start-userdef.d
+index 2a88e98..b58ae3f 100644
+--- a/ld/testsuite/ld-elf/ehdr_start-userdef.d
++++ b/ld/testsuite/ld-elf/ehdr_start-userdef.d
+@@ -2,6 +2,7 @@
+ #ld: -e _start -T ehdr_start-userdef.t
+ #readelf: -Ws
+ #target: *-*-linux* *-*-gnu* *-*-nacl*
++#xfail: frv-*-*
+
+ #...
+ Symbol table '\.symtab' contains [0-9]+ entries:
+diff --git a/ld/testsuite/ld-elf/ehdr_start-weak.d b/ld/testsuite/ld-elf/ehdr_start-weak.d
+index 8bd9035..24ae34c 100644
+--- a/ld/testsuite/ld-elf/ehdr_start-weak.d
++++ b/ld/testsuite/ld-elf/ehdr_start-weak.d
+@@ -2,6 +2,7 @@
+ #ld: -e _start -T ehdr_start-missing.t
+ #nm: -n
+ #target: *-*-linux* *-*-gnu* *-*-nacl*
++#xfail: frv-*-*
+
+ #...
+ \s+[wU] __ehdr_start
+diff --git a/ld/testsuite/ld-elf/ehdr_start.d b/ld/testsuite/ld-elf/ehdr_start.d
+index 52e5b54..d538b66 100644
+--- a/ld/testsuite/ld-elf/ehdr_start.d
++++ b/ld/testsuite/ld-elf/ehdr_start.d
+@@ -2,6 +2,7 @@
+ #ld: -e _start
+ #nm: -n
+ #target: *-*-linux* *-*-gnu* *-*-nacl*
++#xfail: frv-*-*
+
+ #...
+ [0-9a-f]*000 [Adrt] __ehdr_start
+--
+1.7.1
+
diff --git a/core/binutils/binutils-2.24-static-pie-hang.patch b/core/binutils/binutils-2.24-static-pie-hang.patch
deleted file mode 100644
index 512485e7c..000000000
--- a/core/binutils/binutils-2.24-static-pie-hang.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c
-index 4d391e1..d7f59e5 100644
---- a/bfd/elf32-i386.c
-+++ b/bfd/elf32-i386.c
-@@ -2368,8 +2368,13 @@ elf_i386_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
-
- for (pp = &eh->dyn_relocs; (p = *pp) != NULL; )
- {
-- p->count -= p->pc_count;
-- p->pc_count = 0;
-+ /* Don't update reloc count if there are any non
-+ pc-relative relocs. */
-+ if (!h->pointer_equality_needed)
-+ {
-+ p->count -= p->pc_count;
-+ p->pc_count = 0;
-+ }
- if (p->count == 0)
- *pp = p->next;
- else
-diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c
-index edee8ec..999011b 100644
---- a/bfd/elf64-x86-64.c
-+++ b/bfd/elf64-x86-64.c
-@@ -2463,8 +2463,13 @@ elf_x86_64_allocate_dynrelocs (struct elf_link_hash_entry *h, void * inf)
-
- for (pp = &eh->dyn_relocs; (p = *pp) != NULL; )
- {
-- p->count -= p->pc_count;
-- p->pc_count = 0;
-+ /* Don't update reloc count if there are any non
-+ pc-relative relocs. */
-+ if (!h->pointer_equality_needed)
-+ {
-+ p->count -= p->pc_count;
-+ p->pc_count = 0;
-+ }
- if (p->count == 0)
- *pp = p->next;
- else
-diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c
-index 4d391e1..e834a5a 100644
---- a/bfd/elf32-i386.c
-+++ b/bfd/elf32-i386.c
-@@ -2390,9 +2390,12 @@ elf_i386_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
- }
-
- /* Also discard relocs on undefined weak syms with non-default
-- visibility. */
-+ visibility. Don't discard relocs against __ehdr_start which
-+ will be defined by assign_file_positions_for_non_load_sections
-+ later. */
- if (eh->dyn_relocs != NULL
-- && h->root.type == bfd_link_hash_undefweak)
-+ && h->root.type == bfd_link_hash_undefweak
-+ && strcmp (h->root.root.string, "__ehdr_start") != 0)
- {
- if (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT)
- eh->dyn_relocs = NULL;
-diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c
-index edee8ec..f364fe4 100644
---- a/bfd/elf64-x86-64.c
-+++ b/bfd/elf64-x86-64.c
-@@ -2473,9 +2473,12 @@ elf_x86_64_allocate_dynrelocs (struct elf_link_hash_entry *h, void * inf)
- }
-
- /* Also discard relocs on undefined weak syms with non-default
-- visibility. */
-+ visibility. Don't discard relocs against __ehdr_start which
-+ will be defined by assign_file_positions_for_non_load_sections
-+ later. */
- if (eh->dyn_relocs != NULL
-- && h->root.type == bfd_link_hash_undefweak)
-+ && h->root.type == bfd_link_hash_undefweak
-+ && strcmp (h->root.root.string, "__ehdr_start") != 0)
- {
- if (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT)
- eh->dyn_relocs = NULL;
diff --git a/core/dbus/PKGBUILD b/core/dbus/PKGBUILD
index 1ba14c299..88c3712e4 100644
--- a/core/dbus/PKGBUILD
+++ b/core/dbus/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 212337 2014-05-13 14:02:03Z jgc $
+# $Id: PKGBUILD 215082 2014-06-13 11:12:13Z jgc $
# Maintainer: Tom Gundersen <teg@jklm.no>
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Link Dupont <link@subpop.net>
pkgbase=dbus
pkgname=('dbus' 'libdbus')
-pkgver=1.8.2
+pkgver=1.8.4
pkgrel=1
pkgdesc="Freedesktop.org message bus system"
url="http://www.freedesktop.org/Software/dbus"
@@ -14,7 +14,7 @@ license=('GPL' 'custom')
makedepends=('libx11' 'systemd' 'xmlto' 'docbook-xsl')
source=(http://dbus.freedesktop.org/releases/dbus/dbus-$pkgver.tar.gz{,.asc}
30-dbus)
-md5sums=('d6f709bbec0a022a1847c7caec9d6068'
+md5sums=('4717cb8ab5b80978fcadf2b4f2f72e1b'
'SKIP'
'3314d727fa57fc443fce25b5cbeebbcc')
diff --git a/core/mdadm/PKGBUILD b/core/mdadm/PKGBUILD
index 323154a5d..284486937 100644
--- a/core/mdadm/PKGBUILD
+++ b/core/mdadm/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 199470 2013-11-13 11:08:13Z tpowa $
+# $Id: PKGBUILD 215213 2014-06-16 18:49:26Z tpowa $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Contributor: Judd Vinet <jvinet@zeroflux.org>
pkgname=mdadm
-pkgver=3.3
+pkgver=3.3.1
pkgrel=2
pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as Software RAID"
arch=(i686 x86_64)
@@ -12,7 +12,7 @@ groups=('base')
conflicts=('mkinitcpio<0.7')
depends=('glibc')
backup=('etc/mdadm.conf')
-source=(ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/mdadm-$pkgver.tar.bz2
+source=(ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/mdadm-$pkgver.tar.xz
mdadm.conf
mdadm_install
mdadm_hook
@@ -20,7 +20,7 @@ source=(ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/mdadm-$pkgver.tar.bz2
mdadm.service
disable-werror.patch)
replaces=('raidtools')
-md5sums=('8ac04259cdd74b4566c3b6dea9414b57'
+md5sums=('4227d48de62dfb217c92fa0c54171bbe'
'5a37c112aa07dccdde62f9fa5b888607'
'af2f73f0094ebee66f503ca4710c7142'
'fbfb7d07efcbaf5dc61af424c5f6e352'
@@ -35,7 +35,7 @@ prepare() {
build() {
cd $srcdir/$pkgname-$pkgver
- make CXFLAGS="$CFLAGS" BINDIR=/usr/bin
+ make CXFLAGS="$CFLAGS" BINDIR=/usr/bin UDEVDIR=/usr/lib/udev
# build static mdassemble for Arch's initramfs
make MDASSEMBLE_AUTO=1 mdassemble
@@ -43,7 +43,7 @@ build() {
package() {
cd $srcdir/$pkgname-$pkgver
- make INSTALL=/usr/bin/install BINDIR=/usr/bin DESTDIR=$pkgdir install
+ make INSTALL=/usr/bin/install BINDIR=/usr/bin DESTDIR=$pkgdir UDEVDIR=/usr/lib/udev install
make SYSTEMD_DIR=$pkgdir/usr/lib/systemd/system install-systemd
install -D -m755 mdassemble $pkgdir/usr/bin/mdassemble
install -D -m644 ../mdadm.conf $pkgdir/etc/mdadm.conf
diff --git a/core/perl/PKGBUILD b/core/perl/PKGBUILD
index a44ae66dc..ff5b12693 100644
--- a/core/perl/PKGBUILD
+++ b/core/perl/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 214187 2014-06-04 13:50:35Z bluewind $
+# $Id: PKGBUILD 215143 2014-06-14 17:58:34Z bluewind $
# Maintainer: Florian Pritz <bluewind@xinu.at>
# Contributor: Angel Velasquez <angvp@archlinux.org>
# Contributor: kevin <kevin.archlinux.org>
@@ -7,27 +7,143 @@
pkgname=perl
pkgver=5.20.0
-pkgrel=2
+pkgrel=4
pkgdesc="A highly capable, feature-rich programming language"
arch=(i686 x86_64)
license=('GPL' 'PerlArtistic')
url="http://www.perl.org"
groups=('base')
depends=('gdbm' 'db' 'glibc')
+# NOTE: This array is automatically generated by `./patchprov`.
+# If you want to add entries, do so in the next array.
+provides=('perl-archive-tar=1.96'
+ 'perl-attribute-handlers=0.96'
+ 'perl-autodie=2.23'
+ 'perl-autoloader=5.74'
+ 'perl-autouse=1.08'
+ 'perl-b-debug=1.19'
+ 'perl-base=2.22'
+ 'perl-bignum=0.37'
+ 'perl-carp=1.3301'
+ 'perl-cgi=3.65'
+ 'perl-compress-raw-bzip2=2.064'
+ 'perl-compress-raw-zlib=2.065'
+ 'perl-config-perl-v=0.20'
+ 'perl-constant=1.31'
+ 'perl-cpan-meta-requirements=2.125'
+ 'perl-cpan-meta-yaml=0.012'
+ 'perl-cpan-meta=2.140640'
+ 'perl-cpan=2.05'
+ 'perl-data-dumper=2.151'
+ 'perl-db_file=1.831'
+ 'perl-devel-ppport=3.21'
+ 'perl-devel-selfstubber=1.05'
+ 'perl-digest-md5=2.53'
+ 'perl-digest-sha=5.88'
+ 'perl-digest=1.17'
+ 'perl-dumpvalue=1.17'
+ 'perl-encode=2.60'
+ 'perl-encoding-warnings=0.11'
+ 'perl-env=1.04'
+ 'perl-experimental=0.007'
+ 'perl-exporter=5.70'
+ 'perl-extutils-cbuilder=0.280216'
+ 'perl-extutils-command=1.18'
+ 'perl-extutils-constant=0.23'
+ 'perl-extutils-install=1.67'
+ 'perl-extutils-makemaker=6.98'
+ 'perl-extutils-manifest=1.63'
+ 'perl-extutils-parsexs=3.24'
+ 'perl-file-fetch=0.48'
+ 'perl-file-path=2.09'
+ 'perl-file-temp=0.2304'
+ 'perl-filter-simple=0.91'
+ 'perl-filter-util-call=1.49'
+ 'perl-getopt-long=2.42'
+ 'perl-http-tiny=0.043'
+ 'perl-i18n-collate=1.02'
+ 'perl-i18n-langtags=0.40'
+ 'perl-if=0.0603'
+ 'perl-io-compress=2.064'
+ 'perl-io-socket-ip=0.29'
+ 'perl-io-zlib=1.10'
+ 'perl-io=1.31'
+ 'perl-ipc-cmd=0.92'
+ 'perl-ipc-sysv=2.04'
+ 'perl-json-pp=2.27203'
+ 'perl-lib=0.63'
+ 'perl-libnet=1.25'
+ 'perl-locale-codes=3.30'
+ 'perl-locale-maketext-simple=0.21'
+ 'perl-locale-maketext=1.25'
+ 'perl-math-bigint-fastcalc=0.31'
+ 'perl-math-bigint=1.9993'
+ 'perl-math-bigrat=0.2606'
+ 'perl-math-complex=1.59'
+ 'perl-memoize=1.03'
+ 'perl-mime-base64=3.14'
+ 'perl-module-build=0.4205'
+ 'perl-module-corelist=3.11'
+ 'perl-module-load-conditional=0.62'
+ 'perl-module-load=0.32'
+ 'perl-module-loaded=0.08'
+ 'perl-module-metadata=1.000019'
+ 'perl-net-ping=2.43'
+ 'perl-package-constants=0.04'
+ 'perl-params-check=0.38'
+ 'perl-parent=0.228'
+ 'perl-parse-cpan-meta=1.4414'
+ 'perl-pathtools=3.47'
+ 'perl-perl-ostype=1.007'
+ 'perl-perlfaq=5.0150044'
+ 'perl-perlio-via-quotedprint=0.07'
+ 'perl-pod-checker=1.60'
+ 'perl-pod-escapes=1.06'
+ 'perl-pod-parser=1.62'
+ 'perl-pod-perldoc=3.23'
+ 'perl-pod-simple=3.28'
+ 'perl-pod-usage=1.63'
+ 'perl-podlators=2.5.3'
+ 'perl-safe=2.37'
+ 'perl-scalar-list-utils=1.38'
+ 'perl-search-dict=1.07'
+ 'perl-selfloader=1.21'
+ 'perl-socket=2.013'
+ 'perl-storable=2.49'
+ 'perl-sys-syslog=0.33'
+ 'perl-term-ansicolor=4.02'
+ 'perl-term-cap=1.15'
+ 'perl-term-complete=1.402'
+ 'perl-term-readline=1.14'
+ 'perl-test-harness=3.30'
+ 'perl-test-simple=1.001002'
+ 'perl-test=1.26'
+ 'perl-text-abbrev=1.02'
+ 'perl-text-balanced=2.02'
+ 'perl-text-parsewords=3.29'
+ 'perl-text-tabs=2013.0523'
+ 'perl-thread-queue=3.05'
+ 'perl-thread-semaphore=2.12'
+ 'perl-threads-shared=1.46'
+ 'perl-threads=1.93'
+ 'perl-tie-file=1.00'
+ 'perl-tie-refhash=1.39'
+ 'perl-time-hires=1.9726'
+ 'perl-time-local=1.2300'
+ 'perl-time-piece=1.27'
+ 'perl-unicode-collate=1.04'
+ 'perl-unicode-normalize=1.17'
+ 'perl-version=0.9908'
+ 'perl-xsloader=0.17')
+# Add your own provides here
+provides=(${provides[@]})
source=(http://www.cpan.org/src/5.0/perl-${pkgver}.tar.bz2
perlbin.sh
- perlbin.csh
- provides.pl)
+ perlbin.csh)
options=('makeflags' '!purge')
md5sums=('20cbecd4e9e880ee7a50a136c8b1484e'
'5ed2542fdb9a60682f215bd33701e61a'
- '1f0cbbee783e8a6d32f01be5118e0d5e'
- '999c3eea6464860704abbb055a0f0896')
-
-# workaround to let the integrity check find the correct provides array
-if [[ ${0##*/} = "parse_pkgbuilds.sh" ]]; then
- true && provides=($(bsdtar -q -O -xf "/srv/ftp/pool/packages/$pkgname-$pkgver-$pkgrel-$CARCH.pkg.tar.xz" .PKGINFO | sed -rn 's#^provides = (.*)#\1#p'))
-fi
+ '1f0cbbee783e8a6d32f01be5118e0d5e')
prepare() {
cd ${srcdir}/${pkgname}-${pkgver}
@@ -68,10 +184,6 @@ check() {
}
package() {
- # hack to work around makepkg running the subshell in check_sanity()
- new_provides=($(cd "$srcdir/perl-$pkgver"; LD_PRELOAD=./libperl.so ./perl -Ilib "$srcdir/provides.pl" .))
- provides=(${new_provides[@]})
-
cd ${srcdir}/${pkgname}-${pkgver}
make DESTDIR="$pkgdir" install
diff --git a/core/perl/patchprov b/core/perl/patchprov
new file mode 100755
index 000000000..c1b038dab
--- /dev/null
+++ b/core/perl/patchprov
@@ -0,0 +1,259 @@
+#!/usr/bin/perl
+##
+## Name:
+## patchprov
+##
+## Description:
+## Patch the provides list in the perl package PKGBUILD. Scan the appropriate
+## directories under the perl source tree for directories containing dists
+## similar to CPAN dists. Search the files in the distributions for VERSION
+## strings, which are perl expressions. Filters these version strings through
+## the perl interpreter, then transform the dist. names and versions into
+## package names and versions. Finally, we cut out the "provides" array from the
+## PKGBUILD and replace it with the newer version.
+##
+## Usage:
+## patchprov [path to perl source tree] [path to PKGBUILD]
+##
+## Caveats:
+## The path code is not platform independent and will only work in POSIX.
+##
+## Changelog:
+## 06/10/14 JD Rewrite from scratch for perl 5.20.0 and ArchLinux.
+##
+## Authors:
+## Justin "juster" Davis <jrcd83@gmail.com>
+##
+
+use warnings;
+use strict;
+
+sub err
+{
+ print STDERR "patchprov: error: @_\n";
+ exit 1;
+}
+
+## Extract the dist. name from its containing directory.
+sub path_dist
+{
+ my($path) = @_;
+ $path =~ s{^.*/}{};
+ return $path;
+}
+
+## Create a path like $path/lib/Foo/Bar.pm for Foo::Bar.
+sub lib_modpath
+{
+ my($path, $modname) = @_;
+ $modname =~ s{::}{/}g;
+ return "$path/lib/$modname.pm";
+}
+
+## Create a path to a file in the containing directory, named after
+## the last segment of the module name, with suffix attached.
+sub dumb_modpath
+{
+ my($path, $modname, $suffix) = @_;
+ $modname =~ s{^.*::}{};
+ return "$path/$modname$suffix";
+}
+
+## Find a source file contained in the directory that we can scrape the
+## perl versions string from.
+my %distmods = (
+ 'PathTools' => 'Cwd',
+ 'Scalar-List-Utils' => 'List::Util',
+ 'IO-Compress' => 'IO::Compress::Gzip',
+);
+sub dist_srcpath
+{
+ my($path) = @_;
+ my $distname = path_dist($path);
+ my $modname;
+ if(exists $distmods{$distname}){
+ $modname = $distmods{$distname};
+ }else{
+ $modname = $distname;
+ $modname =~ s/-/::/g;
+ }
+ my @srcpaths = (
+ lib_modpath($path, $modname),
+ dumb_modpath($path, $modname, '.pm'),
+ dumb_modpath($path, $modname, '_pm.PL'),
+ "$path/VERSION", # for podlators
+ );
+ for my $src (@srcpaths){
+ return $src if(-f $src);
+ }
+ return undef;
+}
+
+## Scrape the version string for the module file or Makefile.PL.
+sub scrape_verln
+{
+ my($srcpath) = @_;
+ open my $fh, '<', $srcpath or die "open: $!";
+ while(my $ln = <$fh>){
+ if($ln =~ s/^.*VERSION *=>? *//){
+ close $fh;
+ return $ln;
+ }
+ }
+ close $fh;
+ err("failed to find VERSION in $srcpath");
+}
+
+## Scrape the version string from the module source file.
+sub scrape_modver
+{
+ my($srcpath) = @_;
+ return scrape_verln($srcpath);
+}
+
+## Scrape the version string from the Makefile.PL. (for libnet)
+sub scrape_mkplver
+{
+ my($srcpath) = @_;
+ my $verln = scrape_verln($srcpath);
+ $verln =~ s/,/;/;
+ return $verln;
+}
+
+## Scrape the version string from a file inside the dist dir.
+sub distpath_ver
+{
+ my($distpath) = @_;
+ my $srcpath = dist_srcpath($distpath);
+ my $mkplpath = "$distpath/Makefile.PL";
+ if(defined $srcpath){
+ return scrape_modver($srcpath);
+ }elsif(-f $mkplpath){
+ return scrape_mkplver($mkplpath);
+ }else{
+ err("failed to scrape version from $distpath");
+ }
+}
+
+## Search the base path for the dist dirs and extract their respective
+## version strings.
+sub find_distvers
+{
+ my($basepath) = @_;
+ opendir my $dh, $basepath or die "opendir: $!";
+ my @dirs = grep { -d $_ } map { "$basepath/$_" } grep { !/^[.]/ } readdir $dh;
+ closedir $dh;
+
+ my @distvers;
+ for my $dpath (@dirs){
+ push @distvers, [ path_dist($dpath), distpath_ver($dpath) ];
+ }
+ return @distvers;
+}
+
+## Maps an aref of dist name/perl version strings (perl expressions) to
+## a package name and version string suitable for a PKGBUILD.
+sub pkgspec
+{
+ my($dist, $ver) = @$_;
+ $dist =~ tr/A-Z/a-z/;
+ $ver = eval $ver;
+ return "perl-$dist=$ver";
+}
+
+## Searches the perl source dir provided for a list of packages which
+## correspond to the core distributions bundled within in.
+sub perlcorepkgs
+{
+ my($perlpath) = @_;
+ my @dirs = ("$perlpath/cpan", "$perlpath/dist");
+ my @provs;
+ for my $d (@dirs){
+ if(!-d $d){
+ err("$d is not a valid directory");
+ }
+ push @provs, map pkgspec, find_distvers($d);
+ }
+ return @provs;
+}
+
+## Formats the provided lines into a neatly formatted bash array. The first arg
+## is the name of the bash variable to assign it to.
+sub basharray
+{
+ my $vname = shift;
+
+ ## Sort entries and surround with quotes.
+ my @lns = sort map { qq{'$_'} } @_;
+ $lns[0] = "$vname=($lns[0]";
+
+ ## Indent lines for OCD geeks.
+ if(@lns > 1){
+ my $ind = length($vname) + 2;
+ splice @lns, 1, @lns-1,
+ map { (' ' x $ind) . $_ } @lns[1 .. $#lns];
+ }
+
+ $lns[$#lns] .= ')';
+ return map { "$_\n" } @lns;
+}
+
+## Patch the PKGBUILD at the given path with a new provides array, overwriting
+## the old one.
+sub patchpb
+{
+ my $pbpath = shift;
+ open my $fh, '<', $pbpath or die "open: $!";
+ my @lines = <$fh>;
+ close $fh;
+
+ my($i, $j);
+ for($i = 0; $i < @lines; $i++){
+ last if($lines[$i] =~ /^provides=/);
+ }
+ if($i == @lines){
+ err("failed to find provides array in PKGBUILD");
+ }
+ for($j = $i; $j < @lines; $j++){
+ last if($lines[$j] =~ /[)]/);
+ }
+ if($j == @lines){
+ err("failed to find end of provides array");
+ }
+
+ splice @lines, $i, $j-$i+1,
+ basharray('provides', grep { !/win32|next/ } @_);
+
+ ## Avoid corrupting the existing PKGBUILD in case of a crash, etc.
+ if(-f "$pbpath.$$"){
+ err("pbpath.$$ temporary file already exists, please remove it.");
+ }
+ open $fh, '>', "$pbpath.$$" or die "open: $!";
+ print $fh @lines;
+ close $fh or die "close: $!";
+ rename "$pbpath.$$", "$pbpath" or die "rename: $!";
+
+ return;
+}
+
+## Program entrypoint.
+sub main
+{
+ if(@_ < 2){
+ print STDERR "usage: $0 [perl source path] [PKGBUILD path]\n";
+ exit 2;
+ }
+ my($perlpath, $pbpath) = @_;
+ if(!-f $pbpath){
+ err("$pbpath is not a valid file.");
+ }elsif(!-d $perlpath){
+ err("$perlpath is not a valid directory.");
+ }else{
+ patchpb($pbpath, perlcorepkgs($perlpath));
+ }
+ exit 0;
+}
+
+main(@ARGV);
+
+# EOF
diff --git a/core/perl/provides.pl b/core/perl/provides.pl
deleted file mode 100644
index d2cdc762e..000000000
--- a/core/perl/provides.pl
+++ /dev/null
@@ -1,299 +0,0 @@
-# provides.pl
-##
-# Script for printing out a provides list of every CPAN distribution
-# that is bundled with perl. You can run it before building perl
-# or you can run it after building perl. Required modules are in core
-# for perl 5.13 and above. It might be nice if this didn't require
-# HTTP::Tiny and maybe just used wget or curl.
-#
-# This script uses HTTP::Tiny to query Tatsuhiko Miyagawa's webapp at
-# cpanmetadb.plackperl.org to cross-reference module files to their
-# providing CPAN distribution. Thank you Miyagawa!
-#
-# - Justin "juster" Davis <jrcd83@gmail.com>
-
-use warnings 'FATAL' => 'all';
-use strict;
-
-package Common;
-
-sub evalver
-{
- my ($path, $mod) = @_;
-
- open my $fh, '<', $path or die "open $path: $!";
-
- my $m = ($mod
- ? qr/(?:\$${mod}::VERSION|\$VERSION)/
- : qr/\$VERSION/);
-
- while (my $ln = <$fh>) {
- next unless $ln =~ /\s*$m\s*=\s*.+/;
- chomp $ln;
- my $ver = do { no strict; eval $ln };
- return $ver unless $@;
- die qq{$path:$. bad version string in "$ln"\n};
- }
-
- close $fh;
- return undef;
-}
-
-
-#-----------------------------------------------------------------------------
-
-package Dists;
-
-sub maindistfile
-{
- my ($dist, $dir) = @_;
-
- # libpath is the modern style, installing modules under lib/
- # with dirs matching the name components.
- my $libpath = join q{/}, 'lib', split /-/, "${dist}.pm";
-
- # dumbpath is an old style where there's no subdirs and just
- # a .pm file.
- my $dumbpath = $dist;
- $dumbpath =~ s/\A.+-//;
- $dumbpath .= ".pm";
-
- my @paths = ($libpath, $dumbpath);
- # Some modules (with simple names like XSLoader, lib, etc) are
- # generated by Makefile.PL. Search through their generating code.
- push @paths, "${dist}_pm.PL" if $dist =~ tr/-/-/ == 0;
-
- for my $path (map { "$dir/$_" } @paths) { return $path if -f $path; }
- return undef;
-}
-
-sub module_ver
-{
- my ($dist, $dir) = @_;
-
- my $path = maindistfile($dist, $dir) or return undef;
-
- my $mod = $dist;
- $mod =~ s/-/::/g;
- my $ver = Common::evalver($path, $mod);
- unless ($ver) {
- warn "failed to find version in module file for $dist\n";
- return undef;
- }
-
- return $ver;
-}
-
-sub changelog_ver
-{
- my ($dist, $dir) = @_;
-
- my $path;
- for my $tmp (glob "$dir/{Changes,ChangeLog}") {
- if (-f $tmp) { $path = $tmp; last; }
- }
- return undef unless $path;
-
- open my $fh, '<', $path or die "open: $!";
- while (<$fh>) {
- return $1 if /\A\s*(?:$dist[ \t]*)?([0-9._]+)/;
- return $1 if /\A\s*version\s+([0-9._]+)/i;
- }
- close $fh;
-
- return undef;
-}
-
-# for some reason podlators has a VERSION file with perl code in it
-sub verfile_ver
-{
- my ($dist, $dir) = @_;
-
- my $path = "$dir/VERSION";
- return undef unless -f $path; # no warning, only podlaters has it
-
- return Common::evalver($path);
-}
-
-# scans a directory full of nicely separated dist. directories.
-sub scan_distroot
-{
- my ($distroot) = @_;
- opendir my $cpand, "$distroot" or die "failed to open $distroot";
- my @dists = grep { !/^\./ && -d "$distroot/$_" } readdir $cpand;
- closedir $cpand;
-
- my @found;
- for my $dist (@dists) {
- my $distdir = "$distroot/$dist";
- my $ver = (module_ver($dist, $distdir)
- || changelog_ver($dist, $distdir)
- || verfile_ver($dist, $distdir));
-
- if ($ver) { push @found, [ $dist, $ver ]; }
- else { warn "failed to find version for $dist\n"; }
- }
- return @found;
-}
-
-sub find
-{
- my ($srcdir) = @_;
- return map { scan_distroot($_) } glob "$srcdir/{cpan,dist}";
-}
-
-#-----------------------------------------------------------------------------
-
-package Modules;
-
-use HTTP::Tiny qw();
-use File::Find qw();
-use File::stat;
-
-*findfile = *File::Find::find;
-
-sub cpan_provider
-{
- my ($module) = @_;
- my $url = "http://cpanmetadb.plackperl.org/v1.0/package/$module";
- my $http = HTTP::Tiny->new;
- my $resp = $http->get($url);
- return undef unless $resp->{'success'};
-
- my ($cpanpath) = $resp->{'content'} =~ /^distfile: (.*)$/m
- or return undef;
-
- my $dist = $cpanpath;
- $dist =~ s{\A.+/}{}; # remove author directory
- $dist =~ s{-[^-]+\z}{}; # remove version and extension
- return ($dist eq 'perl' ? undef : $dist);
-}
-
-sub find
-{
- my ($srcdir) = @_;
- my $libdir = "$srcdir/lib/";
- die "failed to find $libdir directory" unless -d $libdir;
-
- # Find only the module files that have not changed since perl
- # was extracted. We don't want the files perl just recently
- # installed into lib/. We processed those already.
- my @modfiles;
- my $finder = sub {
- return unless /[.]pm\z/;
- return if m{\Q$libdir\E[^/]+/t/}; # ignore testing modules
- push @modfiles, $_;
- };
- findfile({ 'no_chdir' => 1, 'wanted' => $finder }, $libdir);
-
- # First we have to find what the oldest ctime actually is.
- my $oldest = time;
- @modfiles = map {
- my $modfile = $_;
- my $ctime = (stat $modfile)->ctime;
- $oldest = $ctime if $ctime < $oldest;
- [ $modfile, $ctime ]; # save ctime for later
- } @modfiles;
-
- # Then we filter out any file that was created more than a
- # few seconds after that. Process the rest.
- my @mods;
- for my $modfile (@modfiles) {
- my ($mod, $ctime) = @$modfile;
- next if $ctime - $oldest > 5; # ignore newer files
-
- my $path = $mod;
- $mod =~ s{[.]pm\z}{};
- $mod =~ s{\A$libdir}{};
- $mod =~ s{/}{::}g;
-
- my $ver = Common::evalver($path, $mod) || q{};
- push @mods, [ $mod, $ver ];
- }
-
- # Convert modules names to the dist names who provide them.
- my %seen;
- my @dists;
- for my $modref (@mods) {
- my ($mod, $ver) = @$modref;
- my $dist = cpan_provider($mod) or next; # filter out core modules
- next if $seen{$dist}++; # avoid duplicate dists
- push @dists, [ $dist, $ver ];
- }
- return @dists;
-}
-
-#-----------------------------------------------------------------------------
-
-package Dist2Pkg;
-
-sub name
-{
- my ($name) = @_;
- my $orig = $name;
-
- # Package names should be lowercase and consist of alphanumeric
- # characters only (and hyphens!)...
- $name =~ tr/A-Z/a-z/;
- $name =~ tr/_+/-/; # _ and +'s converted to - (ie Tabbed-Text+Wrap)
- $name =~ tr/-a-z0-9+//cd; # Delete all other chars.
- $name =~ tr/-/-/s;
-
- # Delete leading or trailing hyphens...
- $name =~ s/\A-|-\z//g;
-
- die qq{Dist. name '$orig' completely violates packaging standards}
- unless $name;
-
- return "perl-$name";
-}
-
-sub version
-{
- my ($version) = @_;
-
- # Package versions should be numbers and decimal points only...
- $version =~ tr/-/./;
- $version =~ tr/_0-9.-//cd;
-
- # Remove developer versions because pacman has no special logic
- # to compare them to regular versions like perl does.
- $version =~ s/_[^_]+\z//;
-
- $version =~ tr/_//d; # delete other underscores
- $version =~ tr/././s; # only one period at a time
- $version =~ s/\A[.]|[.]\z//g; # shouldn't start or stop with a period
-
- return $version;
-}
-
-#-----------------------------------------------------------------------------
-
-package main;
-
-my %CPANNAME = ('List-Util' => 'Scalar-List-Utils',
- 'Text-Tabs' => 'Text-Tabs+Wrap',
- 'Cwd' => 'PathTools');
-
-my $perldir = shift or die "Usage: $0 [path to perl source directory]\n";
-die "$perldir is not a valid directory." unless -d $perldir;
-
-my @dists = (Dists::find($perldir), Modules::find($perldir));
-for my $dist (@dists) {
- my $name = $dist->[0];
- $dist->[0] = $CPANNAME{$name} if exists $CPANNAME{$name};
-}
-
-my @pkgs = map {
- my ($name, $ver) = @$_;
- $name = Dist2Pkg::name($name);
- $ver = Dist2Pkg::version($ver);
- [ $name, $ver ];
-} @dists;
-
-@pkgs = sort { $a->[0] cmp $b->[0] } @pkgs;
-
-for my $pkg (@pkgs) {
- my ($name, $ver) = @$pkg;
- print "$name=$ver\n";
-}
diff --git a/core/perl/upgpkg b/core/perl/upgpkg
new file mode 100644
index 000000000..6a3860717
--- /dev/null
+++ b/core/perl/upgpkg
@@ -0,0 +1,4 @@
+upgpkg_build() {
+ makepkg -o
+ ./patchprov src/perl-$pkgver PKGBUILD
+}
diff --git a/core/xfsprogs/PKGBUILD b/core/xfsprogs/PKGBUILD
index cefbffbf9..d143b0cbe 100644
--- a/core/xfsprogs/PKGBUILD
+++ b/core/xfsprogs/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 197846 2013-10-30 11:07:35Z allan $
+# $Id: PKGBUILD 215214 2014-06-16 18:49:27Z tpowa $
#
pkgname=xfsprogs
-pkgver=3.1.11
-pkgrel=2
+pkgver=3.2.0
+pkgrel=1
pkgdesc="XFS filesystem utilities"
arch=('i686' 'x86_64')
license=('LGPL')
@@ -12,7 +12,7 @@ depends=('util-linux')
options=('!makeflags')
# We mirror the sources as upstream tends to move them once a new release is out
source=("ftp://ftp.archlinux.org/other/xfsprogs/${pkgname}-${pkgver}.tar.gz")
-md5sums=('de9f1f45026c2f4e0776058d429ff4b6')
+md5sums=('400047b2f6af87c0345b8f0cc00c13db')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/aspell-pt/PKGBUILD b/extra/aspell-pt/PKGBUILD
index abcadda52..87479bf4c 100644
--- a/extra/aspell-pt/PKGBUILD
+++ b/extra/aspell-pt/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 211658 2014-04-22 15:35:58Z fyan $
+# $Id: PKGBUILD 215101 2014-06-14 04:25:55Z fyan $
# Maintainer:
pkgname=aspell-pt
-_pkgverPT=20140412
+_pkgverPT=20140513
_pkgverBR=20090702
pkgver=$_pkgverPT
pkgrel=1
@@ -17,8 +17,8 @@ source=(ftp://ftp.gnu.org/gnu/aspell/dict/pt_BR/aspell6-pt_BR-$_pkgverBR-0.tar.b
http://natura.di.uminho.pt/download/sources/Dictionaries/aspell6/aspell6.pt-$_pkgverPT.tar.bz2
http://natura.di.uminho.pt/download/sources/Dictionaries/aspell6/aspell6.pt-preao-$_pkgverPT.tar.bz2)
sha1sums=('add1db9a6a908dccaad13a7fd85c3b202299ff26'
- '26d991841bb13d3dfa6fe2bb9a29edd6982d6657'
- '492ace13679f5fa3824bb528e9017fbab4ef0d4c')
+ '9b74f0bbdd9afa00cf6b6e86f8be065bc062dfca'
+ '341fe147c4454062249736da360012b4247b4fee')
build() {
cd aspell6-pt_BR-$_pkgverBR-0
diff --git a/extra/calligra/0001-switch-to-librevenge-based-import-libs.patch b/extra/calligra/0001-switch-to-librevenge-based-import-libs.patch
new file mode 100644
index 000000000..ced0ff074
--- /dev/null
+++ b/extra/calligra/0001-switch-to-librevenge-based-import-libs.patch
@@ -0,0 +1,882 @@
+From 8e8f99cc314435f100d367f41c110becd19d3885 Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon@redhat.com>
+Date: Tue, 27 May 2014 16:15:52 +0200
+Subject: [PATCH] switch to librevenge-based import libs
+
+---
+ CMakeLists.txt | 10 ++++++
+ cmake/modules/FindLibEtonyek.cmake | 6 ++--
+ cmake/modules/FindLibOdfGen.cmake | 6 ++--
+ cmake/modules/FindLibRevenge.cmake | 37 +++++++++++++++++++++
+ cmake/modules/FindLibVisio.cmake | 6 ++--
+ cmake/modules/FindLibWpd.cmake | 22 +++----------
+ cmake/modules/FindLibWpg.cmake | 6 ++--
+ cmake/modules/FindLibWps.cmake | 6 ++--
+ filters/flow/visio/import/CMakeLists.txt | 3 +-
+ filters/flow/visio/import/VSDXImport.cpp | 9 ++---
+ filters/flow/wpg/import/CMakeLists.txt | 3 +-
+ filters/flow/wpg/import/WPGImport.cpp | 9 ++---
+ filters/karbon/wpg/CMakeLists.txt | 4 +--
+ filters/karbon/wpg/WPGImport.cpp | 39 ++++++++--------------
+ filters/libodfhandler/DiskDocumentHandler.cxx | 13 ++++----
+ filters/libodfhandler/DiskDocumentHandler.hxx | 8 ++---
+ filters/libodfhandler/OutputFileHelper.cxx | 6 ++--
+ filters/libodfhandler/OutputFileHelper.hxx | 9 ++---
+ filters/libodfhandler/StdOutHandler.cxx | 13 ++++----
+ filters/libodfhandler/StdOutHandler.hxx | 8 ++---
+ filters/stage/keynote/import/CMakeLists.txt | 5 +--
+ filters/stage/keynote/import/KeyImport.cpp | 15 +++++----
+ filters/words/wordperfect/import/CMakeLists.txt | 3 +-
+ filters/words/wordperfect/import/WPDImport.cpp | 44 ++++++++++++++-----------
+ filters/words/works/import/CMakeLists.txt | 3 +-
+ filters/words/works/import/WPSImport.cpp | 18 +++++-----
+ 26 files changed, 177 insertions(+), 134 deletions(-)
+ create mode 100644 cmake/modules/FindLibRevenge.cmake
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5b6b764..c337864 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -697,6 +697,16 @@ macro_optional_find_package(Okular)
+ macro_log_feature(OKULAR_FOUND "Okular" "Okular ODP Plugin" "http://okular.kde.org/" FALSE "" "Required to build the Okular OpenDocument Presenter plugin")
+
+ ##
++## Test for librevenge
++##
++macro_optional_find_package(LibRevenge)
++macro_log_feature(LIBREVENGE_FOUND "LibRevenge"
++ "A base library for writing document import filters"
++ "http://sf.net/p/libwpd/librevenge/" FALSE ""
++ "Required by various import filters"
++)
++
++##
+ ## Test for libodfgen
+ ##
+ macro_optional_find_package(LibOdfGen)
+diff --git a/cmake/modules/FindLibEtonyek.cmake b/cmake/modules/FindLibEtonyek.cmake
+index 5b78964..ad10d79 100644
+--- a/cmake/modules/FindLibEtonyek.cmake
++++ b/cmake/modules/FindLibEtonyek.cmake
+@@ -10,16 +10,16 @@
+
+ include(LibFindMacros)
+ libfind_package(LIBETONYEK LibWpd)
+-libfind_pkg_check_modules(LIBETONYEK_PKGCONF libetonyek-0.0)
++libfind_pkg_check_modules(LIBETONYEK_PKGCONF libetonyek-0.1)
+
+ find_path(LIBETONYEK_INCLUDE_DIR
+ NAMES libetonyek/libetonyek.h
+ HINTS ${LIBETONYEK_PKGCONF_INCLUDE_DIRS} ${LIBETONYEK_PKGCONF_INCLUDEDIR}
+- PATH_SUFFIXES libetonyek-0.0
++ PATH_SUFFIXES libetonyek-0.1
+ )
+
+ find_library(LIBETONYEK_LIBRARY
+- NAMES etonyek etonyek-0.0
++ NAMES etonyek etonyek-0.1
+ HINTS ${LIBETONYEK_PKGCONF_LIBRARY_DIRS} ${LIBETONYEK_PKGCONF_LIBDIR}
+ )
+
+diff --git a/cmake/modules/FindLibOdfGen.cmake b/cmake/modules/FindLibOdfGen.cmake
+index 9ab80d1..355c345 100644
+--- a/cmake/modules/FindLibOdfGen.cmake
++++ b/cmake/modules/FindLibOdfGen.cmake
+@@ -9,16 +9,16 @@
+ # Redistribution and use is allowed according to the terms of the BSD license.
+
+ include(LibFindMacros)
+-libfind_pkg_check_modules(LIBODFGEN_PKGCONF libodfgen-0.0)
++libfind_pkg_check_modules(LIBODFGEN_PKGCONF libodfgen-0.1)
+
+ find_path(LIBODFGEN_INCLUDE_DIR
+ NAMES libodfgen/libodfgen.hxx
+ HINTS ${LIBODFGEN_PKGCONF_INCLUDE_DIRS} ${LIBODFGEN_PKGCONF_INCLUDEDIR}
+- PATH_SUFFIXES libodfgen-0.0
++ PATH_SUFFIXES libodfgen-0.1
+ )
+
+ find_library(LIBODFGEN_LIBRARY
+- NAMES odfgen-0.0
++ NAMES odfgen-0.1
+ HINTS ${LIBODFGEN_PKGCONF_LIBRARY_DIRS} ${LIBODFGEN_PKGCONF_LIBDIR}
+ )
+
+diff --git a/cmake/modules/FindLibRevenge.cmake b/cmake/modules/FindLibRevenge.cmake
+new file mode 100644
+index 0000000..8ed18b1
+--- /dev/null
++++ b/cmake/modules/FindLibRevenge.cmake
+@@ -0,0 +1,37 @@
++# - Try to find the librevenge
++# Once done this will define
++#
++# LIBREVENGE_FOUND - system has LIBREVENGE
++# LIBREVENGE_INCLUDE_DIRS - the LIBREVENGE include directory
++# LIBREVENGE_LIBRARIES - Link these to use LIBREVENGE
++# LIBREVENGE_DEFINITIONS - Compiler switches required for using LIBREVENGE
++#
++
++include(LibFindMacros)
++libfind_pkg_check_modules(REVENGE_PKGCONF librevenge-0.0)
++
++find_path(REVENGE_INCLUDE_DIR
++ NAMES librevenge/librevenge.h
++ HINTS ${REVENGE_PKGCONF_INCLUDE_DIRS} ${REVENGE_PKGCONF_INCLUDEDIR}
++ PATH_SUFFIXES librevenge-0.0
++)
++
++find_path(REVENGE_STREAM_INCLUDE_DIR
++ NAMES librevenge-stream/librevenge-stream.h
++ HINTS ${REVENGE_STREAM_PKGCONF_INCLUDE_DIRS} ${REVENGE_STREAM_PKGCONF_INCLUDEDIR}
++ PATH_SUFFIXES librevenge-0.0
++)
++
++find_library(REVENGE_LIBRARY
++ NAMES revenge librevenge revenge-0.0 librevenge-0.0
++ HINTS ${REVENGE_STREAM_PKGCONF_LIBRARY_DIRS} ${REVENGE_STREAM_PKGCONF_LIBDIR}
++)
++
++find_library(REVENGE_STREAM_LIBRARY
++ NAMES revenge-stream librevenge-stream revenge-stream-0.0 librevenge-stream-0.0
++ HINTS ${REVENGE_PKGCONF_LIBRARY_DIRS} ${REVENGE_PKGCONF_LIBDIR}
++)
++
++set(LIBREVENGE_PROCESS_LIBS REVENGE_LIBRARY REVENGE_STREAM_LIBRARY)
++set(LIBREVENGE_PROCESS_INCLUDES REVENGE_INCLUDE_DIR REVENGE_STREAM_INCLUDE_DIR)
++libfind_process(LIBREVENGE)
+diff --git a/cmake/modules/FindLibVisio.cmake b/cmake/modules/FindLibVisio.cmake
+index a8533ee..49871b3 100644
+--- a/cmake/modules/FindLibVisio.cmake
++++ b/cmake/modules/FindLibVisio.cmake
+@@ -12,16 +12,16 @@
+ include(LibFindMacros)
+ libfind_package(LIBWPD LibWpd)
+ libfind_package(LIBWPG LibWpg)
+-libfind_pkg_check_modules(LIBVISIO_PKGCONF libvisio-0.0)
++libfind_pkg_check_modules(LIBVISIO_PKGCONF libvisio-0.1)
+
+ find_path(LIBVISIO_INCLUDE_DIR
+ NAMES libvisio/libvisio.h
+ HINTS ${LIBVISIO_PKGCONF_INCLUDE_DIRS} ${LIBVISIO_PKGCONF_INCLUDEDIR}
+- PATH_SUFFIXES libvisio-0.0
++ PATH_SUFFIXES libvisio-0.1
+ )
+
+ find_library(LIBVISIO_LIBRARY
+- NAMES visio visio-0.0
++ NAMES visio visio-0.1
+ HINTS ${LIBVISIO_PKGCONF_LIBRARY_DIRS} ${LIBVISIO_PKGCONF_LIBDIR}
+ )
+
+diff --git a/cmake/modules/FindLibWpd.cmake b/cmake/modules/FindLibWpd.cmake
+index 2a324cc..ed9bc26 100644
+--- a/cmake/modules/FindLibWpd.cmake
++++ b/cmake/modules/FindLibWpd.cmake
+@@ -8,31 +8,19 @@
+ #
+
+ include(LibFindMacros)
+-libfind_pkg_check_modules(WPD_PKGCONF libwpd-0.9)
+-libfind_pkg_check_modules(WPD_STREAM_PKGCONF libwpd-stream-0.9)
++libfind_pkg_check_modules(WPD_PKGCONF libwpd-0.10)
+
+ find_path(WPD_INCLUDE_DIR
+ NAMES libwpd/libwpd.h
+ HINTS ${WPD_PKGCONF_INCLUDE_DIRS} ${WPD_PKGCONF_INCLUDEDIR}
+- PATH_SUFFIXES libwpd-0.9
+-)
+-
+-find_path(WPD_STREAM_INCLUDE_DIR
+- NAMES libwpd-stream/libwpd-stream.h
+- HINTS ${WPD_STREAM_PKGCONF_INCLUDE_DIRS} ${WPD_STREAM_PKGCONF_INCLUDEDIR}
+- PATH_SUFFIXES libwpd-0.9
++ PATH_SUFFIXES libwpd-0.10
+ )
+
+ find_library(WPD_LIBRARY
+- NAMES wpd libwpd wpd-0.9 libwpd-0.9
++ NAMES wpd libwpd wpd-0.10 libwpd-0.10
+ HINTS ${WPD_PKGCONF_LIBRARY_DIRS} ${WPD_PKGCONF_LIBDIR}
+ )
+
+-find_library(WPD_STREAM_LIBRARY
+- NAMES wpd-stream libwpd-stream wpd-stream-0.9 libwpd-stream-0.9
+- HINTS ${WPD_STREAM_PKGCONF_LIBRARY_DIRS} ${WPD_STREAM_PKGCONF_LIBDIR}
+-)
+-
+-set(LIBWPD_PROCESS_LIBS WPD_LIBRARY WPD_STREAM_LIBRARY)
+-set(LIBWPD_PROCESS_INCLUDES WPD_INCLUDE_DIR WPD_STREAM_INCLUDE_DIR)
++set(LIBWPD_PROCESS_LIBS WPD_LIBRARY)
++set(LIBWPD_PROCESS_INCLUDES WPD_INCLUDE_DIR)
+ libfind_process(LIBWPD)
+diff --git a/cmake/modules/FindLibWpg.cmake b/cmake/modules/FindLibWpg.cmake
+index 56d9302..16c2a1c 100644
+--- a/cmake/modules/FindLibWpg.cmake
++++ b/cmake/modules/FindLibWpg.cmake
+@@ -11,16 +11,16 @@
+
+ include(LibFindMacros)
+ libfind_package(LIBWPG LibWpd)
+-libfind_pkg_check_modules(LIBWPG_PKGCONF libwpg-0.2)
++libfind_pkg_check_modules(LIBWPG_PKGCONF libwpg-0.3)
+
+ find_path(LIBWPG_INCLUDE_DIR
+ NAMES libwpg/libwpg.h
+ HINTS ${LIBWPG_PKGCONF_INCLUDE_DIRS} ${LIBWPG_PKGCONF_INCLUDEDIR}
+- PATH_SUFFIXES libwpg-0.2
++ PATH_SUFFIXES libwpg-0.3
+ )
+
+ find_library(LIBWPG_LIBRARY
+- NAMES wpg wpg-0.2
++ NAMES wpg wpg-0.3
+ HINTS ${LIBWPG_PKGCONF_LIBRARY_DIRS} ${LIBWPG_PKGCONF_LIBDIR}
+ )
+
+diff --git a/cmake/modules/FindLibWps.cmake b/cmake/modules/FindLibWps.cmake
+index 149f34c..f8c8225 100644
+--- a/cmake/modules/FindLibWps.cmake
++++ b/cmake/modules/FindLibWps.cmake
+@@ -10,16 +10,16 @@
+
+ include(LibFindMacros)
+ libfind_package(LIBWPS LibWpd)
+-libfind_pkg_check_modules(LIBWPS_PKGCONF libwps-0.2)
++libfind_pkg_check_modules(LIBWPS_PKGCONF libwps-0.3)
+
+ find_path(LIBWPS_INCLUDE_DIR
+ NAMES libwps/libwps.h
+ HINTS ${LIBWPS_PKGCONF_INCLUDE_DIRS} ${LIBWPS_PKGCONF_INCLUDEDIR}
+- PATH_SUFFIXES libwps-0.2
++ PATH_SUFFIXES libwps-0.3
+ )
+
+ find_library(LIBWPS_LIBRARY
+- NAMES wps wps-0.2
++ NAMES wps wps-0.3
+ HINTS ${LIBWPS_PKGCONF_LIBRARY_DIRS} ${LIBWPS_PKGCONF_LIBDIR}
+ )
+
+diff --git a/filters/flow/visio/import/CMakeLists.txt b/filters/flow/visio/import/CMakeLists.txt
+index 1de4385..4c2a391 100644
+--- a/filters/flow/visio/import/CMakeLists.txt
++++ b/filters/flow/visio/import/CMakeLists.txt
+@@ -1,6 +1,7 @@
+ include_directories(
+ ../../../libodfhandler/
+ ${LIBODFGEN_INCLUDE_DIRS}
++ ${LIBREVENGE_INCLUDE_DIRS}
+ ${LIBVISIO_INCLUDE_DIRS}
+ ${KOMAIN_INCLUDES}
+ )
+@@ -15,7 +16,7 @@ set(vsdx2odg_PART_SRCS
+
+ kde4_add_plugin(calligra_filter_vsdx2odg ${vsdx2odg_PART_SRCS})
+
+-target_link_libraries(calligra_filter_vsdx2odg komain ${LIBODFGEN_LIBRARIES} ${LIBVISIO_LIBRARIES})
++target_link_libraries(calligra_filter_vsdx2odg komain ${LIBODFGEN_LIBRARIES} ${LIBREVENGE_LIBRARIES} ${LIBVISIO_LIBRARIES})
+
+ install(TARGETS calligra_filter_vsdx2odg DESTINATION ${PLUGIN_INSTALL_DIR})
+ install(FILES calligra_filter_vsdx2odg.desktop DESTINATION ${SERVICES_INSTALL_DIR})
+diff --git a/filters/flow/visio/import/VSDXImport.cpp b/filters/flow/visio/import/VSDXImport.cpp
+index 70a54d9..eb3a208 100644
+--- a/filters/flow/visio/import/VSDXImport.cpp
++++ b/filters/flow/visio/import/VSDXImport.cpp
+@@ -17,7 +17,7 @@
+ #include "VSDXImport.h"
+
+ #include <libvisio/libvisio.h>
+-#include <libodfgen/OdgGenerator.hxx>
++#include <libodfgen/libodfgen.hxx>
+
+ #include "OutputFileHelper.hxx"
+ #include <KoFilterChain.h>
+@@ -39,7 +39,7 @@ public:
+ ~OdgOutputFileHelper() {}
+
+ private:
+- bool _isSupportedFormat(WPXInputStream *input, const char * /* password */)
++ bool _isSupportedFormat(librevenge::RVNGInputStream *input, const char * /* password */)
+ {
+ if (!libvisio::VisioDocument::isSupported(input))
+ {
+@@ -49,9 +49,10 @@ private:
+ return true;
+ }
+
+- bool _convertDocument(WPXInputStream *input, const char * /* password */, OdfDocumentHandler *handler, OdfStreamType streamType)
++ bool _convertDocument(librevenge::RVNGInputStream *input, const char * /* password */, OdfDocumentHandler *handler, OdfStreamType streamType)
+ {
+- OdgGenerator exporter(handler, streamType);
++ OdgGenerator exporter;
++ exporter.addDocumentHandler(handler, streamType);
+ return libvisio::VisioDocument::parse(input, &exporter);
+ }
+ };
+diff --git a/filters/flow/wpg/import/CMakeLists.txt b/filters/flow/wpg/import/CMakeLists.txt
+index 524d1b1..e2ee2a5 100644
+--- a/filters/flow/wpg/import/CMakeLists.txt
++++ b/filters/flow/wpg/import/CMakeLists.txt
+@@ -1,6 +1,7 @@
+ include_directories(
+ ../../../libodfhandler/
+ ${LIBODFGEN_INCLUDE_DIRS}
++ ${LIBREVENGE_INCLUDE_DIRS}
+ ${LIBVISIO_INCLUDE_DIRS}
+ ${KOMAIN_INCLUDES}
+ )
+@@ -15,7 +16,7 @@ set(wpg2odg_PART_SRCS
+
+ kde4_add_plugin(calligra_filter_wpg2odg ${wpg2odg_PART_SRCS})
+
+-target_link_libraries(calligra_filter_wpg2odg komain ${LIBODFGEN_LIBRARIES} ${LIBWPG_LIBRARIES})
++target_link_libraries(calligra_filter_wpg2odg komain ${LIBODFGEN_LIBRARIES} ${LIBREVENGE_LIBRARIES} ${LIBWPG_LIBRARIES})
+
+ install(TARGETS calligra_filter_wpg2odg DESTINATION ${PLUGIN_INSTALL_DIR})
+ install(FILES calligra_filter_wpg2odg.desktop DESTINATION ${SERVICES_INSTALL_DIR})
+diff --git a/filters/flow/wpg/import/WPGImport.cpp b/filters/flow/wpg/import/WPGImport.cpp
+index b4e0fa7..563ae6e 100644
+--- a/filters/flow/wpg/import/WPGImport.cpp
++++ b/filters/flow/wpg/import/WPGImport.cpp
+@@ -17,7 +17,7 @@
+ #include "WPGImport.h"
+
+ #include <libwpg/libwpg.h>
+-#include <libodfgen/OdgGenerator.hxx>
++#include <libodfgen/libodfgen.hxx>
+
+ #include "OutputFileHelper.hxx"
+ #include <KoFilterChain.h>
+@@ -39,7 +39,7 @@ public:
+ ~OdgOutputFileHelper() {}
+
+ private:
+- bool _isSupportedFormat(WPXInputStream *input, const char * /* password */)
++ bool _isSupportedFormat(librevenge::RVNGInputStream *input, const char * /* password */)
+ {
+ if (!libwpg::WPGraphics::isSupported(input))
+ {
+@@ -49,9 +49,10 @@ private:
+ return true;
+ }
+
+- bool _convertDocument(WPXInputStream *input, const char * /* password */, OdfDocumentHandler *handler, OdfStreamType streamType)
++ bool _convertDocument(librevenge::RVNGInputStream *input, const char * /* password */, OdfDocumentHandler *handler, OdfStreamType streamType)
+ {
+- OdgGenerator exporter(handler, streamType);
++ OdgGenerator exporter;
++ exporter.addDocumentHandler(handler, streamType);
+ return libwpg::WPGraphics::parse(input, &exporter);
+ }
+ };
+diff --git a/filters/karbon/wpg/CMakeLists.txt b/filters/karbon/wpg/CMakeLists.txt
+index 5f578e9..ffa7742 100644
+--- a/filters/karbon/wpg/CMakeLists.txt
++++ b/filters/karbon/wpg/CMakeLists.txt
+@@ -1,11 +1,11 @@
+
+-include_directories(${CMAKE_BINARY_DIR}/filters/ ${LIBWPD_INCLUDE_DIRS} ${LIBWPG_INCLUDE_DIR}/)
++include_directories(${CMAKE_BINARY_DIR}/filters/ ${LIBREVENGE_INCLUDE_DIRS} ${LIBWPG_INCLUDE_DIR}/)
+
+ set(wpg2svg_PART_SRCS WPGImport.cpp)
+
+ kde4_add_plugin(calligra_filter_wpg2svg ${wpg2svg_PART_SRCS})
+
+-target_link_libraries(calligra_filter_wpg2svg komain ${LIBWPG_LIBRARIES} ${LIBWPG_STREAM_LIBRARIES} ${LIBWPD_LIBRARIES})
++target_link_libraries(calligra_filter_wpg2svg komain ${LIBWPG_LIBRARIES} ${LIBREVENGE_LIBRARIES})
+
+ install(TARGETS calligra_filter_wpg2svg DESTINATION ${PLUGIN_INSTALL_DIR})
+ install(FILES calligra_filter_wpg2svg.desktop DESTINATION ${SERVICES_INSTALL_DIR})
+diff --git a/filters/karbon/wpg/WPGImport.cpp b/filters/karbon/wpg/WPGImport.cpp
+index f1852ee..4457bec 100644
+--- a/filters/karbon/wpg/WPGImport.cpp
++++ b/filters/karbon/wpg/WPGImport.cpp
+@@ -32,14 +32,12 @@
+ #include <QString>
+ #include <QFile>
+
++#include <librevenge/librevenge.h>
++#include <librevenge-stream/librevenge-stream.h>
++
+ #include <libwpg/libwpg.h>
+-#if LIBWPG_VERSION_MINOR<2
+-#include <libwpg/WPGStreamImplementation.h>
+-#else
+-#include <libwpd-stream/libwpd-stream.h>
+-#include <libwpd/libwpd.h>
+-#endif
+
++#include <cassert>
+ #include <iostream>
+
+ K_PLUGIN_FACTORY(WPGImportFactory, registerPlugin<WPGImport>();)
+@@ -63,39 +61,29 @@ KoFilter::ConversionStatus WPGImport::convert(const QByteArray& from, const QByt
+ if (to != "image/svg+xml")
+ return KoFilter::NotImplemented;
+
+-#if LIBWPG_VERSION_MINOR<2
+- WPXInputStream* input = new libwpg::WPGFileStream(m_chain->inputFile().toLocal8Bit());
+- if (input->isOLEStream()) {
+- WPXInputStream* olestream = input->getDocumentOLEStream();
+- if (olestream) {
+- delete input;
+- input = olestream;
+- }
+- }
+- libwpg::WPGString output;
+-#else
+- WPXInputStream* input = new WPXFileStream(m_chain->inputFile().toLocal8Bit());
+- if (input->isOLEStream()) {
+- WPXInputStream* olestream = input->getDocumentOLEStream("Anything");
++ librevenge::RVNGInputStream* input = new librevenge::RVNGFileStream(m_chain->inputFile().toLocal8Bit());
++ if (input->isStructured()) {
++ librevenge::RVNGInputStream* olestream = input->getSubStreamByName("Anything");
+ if (olestream) {
+ delete input;
+ input = olestream;
+ }
+ }
+- ::WPXString output;
+-#endif
+-
+ if (!libwpg::WPGraphics::isSupported(input)) {
+ kWarning() << "ERROR: Unsupported file format (unsupported version) or file is encrypted!";
+ delete input;
+ return KoFilter::NotImplemented;
+ }
+
+- if (!libwpg::WPGraphics::generateSVG(input, output)) {
++ ::librevenge::RVNGStringVector output;
++ librevenge::RVNGSVGDrawingGenerator generator(output, "");
++
++ if (!libwpg::WPGraphics::parse(input, &generator)) {
+ kWarning() << "ERROR: SVG Generation failed!";
+ delete input;
+ return KoFilter::ParsingError;
+ }
++ assert(1 == output.size());
+
+ delete input;
+
+@@ -104,7 +92,8 @@ KoFilter::ConversionStatus WPGImport::convert(const QByteArray& from, const QByt
+ kWarning() << "ERROR: Could not open output file" << m_chain->outputFile();
+ return KoFilter::InternalError;
+ }
+- outputFile.write(output.cstr());
++ outputFile.write("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.1//EN\" \"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\">\n");
++ outputFile.write(output[0].cstr());
+ outputFile.close();
+
+ return KoFilter::OK;
+diff --git a/filters/libodfhandler/DiskDocumentHandler.cxx b/filters/libodfhandler/DiskDocumentHandler.cxx
+index e035fdc..f8ca273 100644
+--- a/filters/libodfhandler/DiskDocumentHandler.cxx
++++ b/filters/libodfhandler/DiskDocumentHandler.cxx
+@@ -37,7 +37,7 @@ DiskOdfDocumentHandler::DiskOdfDocumentHandler(FemtoZip *pOutput) :
+ {
+ }
+
+-void DiskOdfDocumentHandler::startElement(const char *psName, const WPXPropertyList &xPropList)
++void DiskOdfDocumentHandler::startElement(const char *psName, const librevenge::RVNGPropertyList &xPropList)
+ {
+ if (mbIsTagOpened)
+ {
+@@ -46,11 +46,11 @@ void DiskOdfDocumentHandler::startElement(const char *psName, const WPXPropertyL
+ }
+ PUTSTRING("<");
+ PUTSTRING(psName);
+- WPXPropertyList::Iter i(xPropList);
++ librevenge::RVNGPropertyList::Iter i(xPropList);
+ for (i.rewind(); i.next(); )
+ {
+- // filter out libwpd elements
+- if (strncmp(i.key(), "libwpd", 6) != 0)
++ // filter out librevenge properties
++ if (strncmp(i.key(), "librevenge", 10) != 0)
+ {
+ PUTSTRING(" ");
+ PUTSTRING(i.key());
+@@ -91,14 +91,15 @@ void DiskOdfDocumentHandler::endElement(const char *psName)
+ }
+ }
+
+-void DiskOdfDocumentHandler::characters(const WPXString &sCharacters)
++void DiskOdfDocumentHandler::characters(const librevenge::RVNGString &sCharacters)
+ {
+ if (mbIsTagOpened)
+ {
+ PUTSTRING(">");
+ mbIsTagOpened = false;
+ }
+- WPXString sEscapedCharacters(sCharacters, true);
++ librevenge::RVNGString sEscapedCharacters;
++ sEscapedCharacters.appendEscapedXML(sCharacters);
+ if (sEscapedCharacters.len() > 0)
+ PUTSTRING(sEscapedCharacters.cstr());
+ }
+diff --git a/filters/libodfhandler/DiskDocumentHandler.hxx b/filters/libodfhandler/DiskDocumentHandler.hxx
+index 17f7eb7..d52a256 100644
+--- a/filters/libodfhandler/DiskDocumentHandler.hxx
++++ b/filters/libodfhandler/DiskDocumentHandler.hxx
+@@ -23,7 +23,7 @@
+ #ifndef _DISKDOCUMENTHANDLER_H
+ #define _DISKDOCUMENTHANDLER_H
+
+-#include <libodfgen/OdfDocumentHandler.hxx>
++#include <libodfgen/libodfgen.hxx>
+
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+@@ -45,9 +45,9 @@ public:
+ #endif
+ virtual void startDocument() {}
+ virtual void endDocument();
+- virtual void startElement(const char *psName, const WPXPropertyList &xPropList);
++ virtual void startElement(const char *psName, const librevenge::RVNGPropertyList &xPropList);
+ virtual void endElement(const char *psName);
+- virtual void characters(const WPXString &sCharacters);
++ virtual void characters(const librevenge::RVNGString &sCharacters);
+
+ private:
+ DiskOdfDocumentHandler(DiskOdfDocumentHandler const &);
+@@ -58,7 +58,7 @@ private:
+ FemtoZip *mpOutput;
+ #endif
+ bool mbIsTagOpened;
+- WPXString msOpenedTagName;
++ librevenge::RVNGString msOpenedTagName;
+ };
+ #endif
+
+diff --git a/filters/libodfhandler/OutputFileHelper.cxx b/filters/libodfhandler/OutputFileHelper.cxx
+index 8786d4c..61e48e9 100644
+--- a/filters/libodfhandler/OutputFileHelper.cxx
++++ b/filters/libodfhandler/OutputFileHelper.cxx
+@@ -37,7 +37,7 @@
+
+ #include "DiskDocumentHandler.hxx"
+ #include "StdOutHandler.hxx"
+-#include <libwpd-stream/WPXStreamImplementation.h>
++#include <librevenge-stream/librevenge-stream.h>
+
+ struct OutputFileHelperImpl
+ {
+@@ -197,12 +197,12 @@ bool OutputFileHelper::writeChildFile(const char *childFileName, const char *str
+
+ bool OutputFileHelper::writeConvertedContent(const char *childFileName, const char *inFileName, const OdfStreamType streamType)
+ {
+- WPXFileStream input(inFileName);
++ librevenge::RVNGFileStream input(inFileName);
+
+ if (!_isSupportedFormat(&input, m_impl->mpPassword))
+ return false;
+
+- input.seek(0, WPX_SEEK_SET);
++ input.seek(0, librevenge::RVNG_SEEK_SET);
+
+ OdfDocumentHandler *pHandler;
+ #ifdef USE_GSF_OUTPUT
+diff --git a/filters/libodfhandler/OutputFileHelper.hxx b/filters/libodfhandler/OutputFileHelper.hxx
+index a61b9a0..d2632a9 100644
+--- a/filters/libodfhandler/OutputFileHelper.hxx
++++ b/filters/libodfhandler/OutputFileHelper.hxx
+@@ -22,9 +22,10 @@
+ #ifndef _OUTPUTFILEHELPER_HXX
+ #define _OUTPUTFILEHELPER_HXX
+
+-#include <libodfgen/OdfDocumentHandler.hxx>
++#include <libodfgen/libodfgen.hxx>
++
++#include <librevenge-stream/librevenge-stream.h>
+
+-class WPXInputStream;
+ struct OutputFileHelperImpl;
+
+ class OutputFileHelper
+@@ -38,8 +39,8 @@ public:
+ bool writeConvertedContent(const char *childFileName, const char *inFileName, const OdfStreamType streamType);
+
+ private:
+- virtual bool _isSupportedFormat(WPXInputStream *input, const char *password) = 0;
+- virtual bool _convertDocument(WPXInputStream *input, const char *password, OdfDocumentHandler *handler, const OdfStreamType streamType) = 0;
++ virtual bool _isSupportedFormat(librevenge::RVNGInputStream *input, const char *password) = 0;
++ virtual bool _convertDocument(librevenge::RVNGInputStream *input, const char *password, OdfDocumentHandler *handler, const OdfStreamType streamType) = 0;
+ OutputFileHelperImpl *m_impl;
+
+ private:
+diff --git a/filters/libodfhandler/StdOutHandler.cxx b/filters/libodfhandler/StdOutHandler.cxx
+index 6864266..16e19f0 100644
+--- a/filters/libodfhandler/StdOutHandler.cxx
++++ b/filters/libodfhandler/StdOutHandler.cxx
+@@ -31,7 +31,7 @@ StdOutHandler::StdOutHandler() :
+ printf("<?xml version=\"1.0\"?>\n");
+ }
+
+-void StdOutHandler::startElement(const char *psName, const WPXPropertyList &xPropList)
++void StdOutHandler::startElement(const char *psName, const librevenge::RVNGPropertyList &xPropList)
+ {
+ if (mbIsTagOpened)
+ {
+@@ -39,11 +39,11 @@ void StdOutHandler::startElement(const char *psName, const WPXPropertyList &xPro
+ mbIsTagOpened = false;
+ }
+ printf("<%s", psName);
+- WPXPropertyList::Iter i(xPropList);
++ librevenge::RVNGPropertyList::Iter i(xPropList);
+ for (i.rewind(); i.next(); )
+ {
+- // filter out libwpd elements
+- if (strncmp(i.key(), "libwpd", 6) != 0)
++ // filter out librevenge properties
++ if (strncmp(i.key(), "librevenge", 10) != 0)
+ printf(" %s=\"%s\"", i.key(), i()->getStr().cstr());
+ }
+ mbIsTagOpened = true;
+@@ -73,15 +73,14 @@ void StdOutHandler::endElement(const char *psName)
+ }
+ }
+
+-void StdOutHandler::characters(const WPXString &sCharacters)
++void StdOutHandler::characters(const librevenge::RVNGString &sCharacters)
+ {
+ if (mbIsTagOpened)
+ {
+ printf(">");
+ mbIsTagOpened = false;
+ }
+- WPXString sEscapedCharacters(sCharacters, true);
+- printf("%s", sEscapedCharacters.cstr());
++ printf("%s", librevenge::RVNGString::escapeXML(sCharacters).cstr());
+ }
+
+ void StdOutHandler::endDocument()
+diff --git a/filters/libodfhandler/StdOutHandler.hxx b/filters/libodfhandler/StdOutHandler.hxx
+index a18189a..44fa1e7 100644
+--- a/filters/libodfhandler/StdOutHandler.hxx
++++ b/filters/libodfhandler/StdOutHandler.hxx
+@@ -23,7 +23,7 @@
+ #ifndef _STDOUTHANDLER_H
+ #define _STDOUTHANDLER_H
+
+-#include <libodfgen/OdfDocumentHandler.hxx>
++#include <libodfgen/libodfgen.hxx>
+
+ class StdOutHandler : public OdfDocumentHandler
+ {
+@@ -31,12 +31,12 @@ public:
+ StdOutHandler();
+ virtual void startDocument() {}
+ virtual void endDocument();
+- virtual void startElement(const char *psName, const WPXPropertyList &xPropList);
++ virtual void startElement(const char *psName, const librevenge::RVNGPropertyList &xPropList);
+ virtual void endElement(const char *psName);
+- virtual void characters(const WPXString &sCharacters);
++ virtual void characters(const librevenge::RVNGString &sCharacters);
+ private:
+ bool mbIsTagOpened;
+- WPXString msOpenedTagName;
++ librevenge::RVNGString msOpenedTagName;
+ };
+ #endif
+
+diff --git a/filters/words/wordperfect/import/CMakeLists.txt b/filters/words/wordperfect/import/CMakeLists.txt
+index 6a0e2d7..ffb3c70 100644
+--- a/filters/words/wordperfect/import/CMakeLists.txt
++++ b/filters/words/wordperfect/import/CMakeLists.txt
+@@ -1,6 +1,7 @@
+ include_directories(
+ ../../../libodfhandler/
+ ${LIBODFGEN_INCLUDE_DIRS}
++ ${LIBREVENGE_INCLUDE_DIRS}
+ ${LIBWPD_INCLUDE_DIRS}
+ ${LIBWPG_INCLUDE_DIRS}
+ ${KOMAIN_INCLUDES}
+@@ -17,7 +18,7 @@ set(wpd2odt_PART_SRCS
+ kde4_add_plugin(calligra_filter_wpd2odt ${wpd2odt_PART_SRCS})
+
+ target_link_libraries(calligra_filter_wpd2odt
+- komain ${LIBODFGEN_LIBRARIES} ${LIBWPD_LIBRARIES} ${LIBWPG_LIBRARIES})
++ komain ${LIBODFGEN_LIBRARIES} ${LIBREVENGE_LIBRARIES} ${LIBWPD_LIBRARIES} ${LIBWPG_LIBRARIES})
+
+ install(TARGETS calligra_filter_wpd2odt DESTINATION ${PLUGIN_INSTALL_DIR})
+
+diff --git a/filters/words/wordperfect/import/WPDImport.cpp b/filters/words/wordperfect/import/WPDImport.cpp
+index af9d9b6..edf1c91 100644
+--- a/filters/words/wordperfect/import/WPDImport.cpp
++++ b/filters/words/wordperfect/import/WPDImport.cpp
+@@ -18,8 +18,7 @@
+
+ #include <libwpd/libwpd.h>
+ #include <libwpg/libwpg.h>
+-#include <libodfgen/OdtGenerator.hxx>
+-#include <libodfgen/OdgGenerator.hxx>
++#include <libodfgen/libodfgen.hxx>
+
+ #include <OutputFileHelper.hxx>
+ #include <KoFilterChain.h>
+@@ -31,6 +30,7 @@
+ #include <QString>
+ #include <QByteArray>
+
++#include <cassert>
+ #include <stdio.h>
+
+ class OdtOutputFileHelper : public OutputFileHelper
+@@ -41,20 +41,20 @@ public:
+ ~OdtOutputFileHelper() {};
+
+ private:
+- bool _isSupportedFormat(WPXInputStream *input, const char *password)
++ bool _isSupportedFormat(librevenge::RVNGInputStream *input, const char *password)
+ {
+- WPDConfidence confidence = WPDocument::isFileFormatSupported(input);
+- if (WPD_CONFIDENCE_EXCELLENT != confidence && WPD_CONFIDENCE_SUPPORTED_ENCRYPTION != confidence)
++ libwpd::WPDConfidence confidence = libwpd::WPDocument::isFileFormatSupported(input);
++ if (libwpd::WPD_CONFIDENCE_EXCELLENT != confidence && libwpd::WPD_CONFIDENCE_SUPPORTED_ENCRYPTION != confidence)
+ {
+ fprintf(stderr, "ERROR: We have no confidence that you are giving us a valid WordPerfect document.\n");
+ return false;
+ }
+- if (WPD_CONFIDENCE_SUPPORTED_ENCRYPTION == confidence && !password)
++ if (libwpd::WPD_CONFIDENCE_SUPPORTED_ENCRYPTION == confidence && !password)
+ {
+ fprintf(stderr, "ERROR: The WordPerfect document is encrypted and you did not give us a password.\n");
+ return false;
+ }
+- if (confidence == WPD_CONFIDENCE_SUPPORTED_ENCRYPTION && password && (WPD_PASSWORD_MATCH_OK != WPDocument::verifyPassword(input, password)))
++ if (confidence == libwpd::WPD_CONFIDENCE_SUPPORTED_ENCRYPTION && password && (libwpd::WPD_PASSWORD_MATCH_OK != libwpd::WPDocument::verifyPassword(input, password)))
+ {
+ fprintf(stderr, "ERROR: The WordPerfect document is encrypted and we either\n");
+ fprintf(stderr, "ERROR: don't know how to decrypt it or the given password is wrong.\n");
+@@ -64,41 +64,47 @@ private:
+ return true;
+ }
+
+- static bool handleEmbeddedWPGObject(const WPXBinaryData &data, OdfDocumentHandler *pHandler, const OdfStreamType streamType)
++ static bool handleEmbeddedWPGObject(const librevenge::RVNGBinaryData &data, OdfDocumentHandler *pHandler, const OdfStreamType streamType)
+ {
+- OdgGenerator exporter(pHandler, streamType);
++ OdgGenerator exporter;
++ exporter.addDocumentHandler(pHandler, streamType);
+
+ libwpg::WPGFileFormat fileFormat = libwpg::WPG_AUTODETECT;
+
+- if (!libwpg::WPGraphics::isSupported(const_cast<WPXInputStream *>(data.getDataStream())))
++ if (!libwpg::WPGraphics::isSupported(const_cast<librevenge::RVNGInputStream *>(data.getDataStream())))
+ fileFormat = libwpg::WPG_WPG1;
+
+- return libwpg::WPGraphics::parse(const_cast<WPXInputStream *>(data.getDataStream()), &exporter, fileFormat);
++ return libwpg::WPGraphics::parse(const_cast<librevenge::RVNGInputStream *>(data.getDataStream()), &exporter, fileFormat);
+ }
+
+- static bool handleEmbeddedWPGImage(const WPXBinaryData &input, WPXBinaryData &output)
++ static bool handleEmbeddedWPGImage(const librevenge::RVNGBinaryData &input, librevenge::RVNGBinaryData &output)
+ {
+- WPXString svgOutput;
+ libwpg::WPGFileFormat fileFormat = libwpg::WPG_AUTODETECT;
+
+- if (!libwpg::WPGraphics::isSupported(const_cast<WPXInputStream *>(input.getDataStream())))
++ if (!libwpg::WPGraphics::isSupported(const_cast<librevenge::RVNGInputStream *>(input.getDataStream())))
+ fileFormat = libwpg::WPG_WPG1;
+
+- if (!libwpg::WPGraphics::generateSVG(const_cast<WPXInputStream *>(input.getDataStream()), svgOutput, fileFormat))
++ librevenge::RVNGStringVector svgOutput;
++ librevenge::RVNGSVGDrawingGenerator generator(svgOutput, "");
++ if (!libwpg::WPGraphics::parse(const_cast<librevenge::RVNGInputStream *>(input.getDataStream()), &generator, fileFormat))
+ return false;
++ assert(1 == svgOutput.size());
+
+ output.clear();
+- output.append((unsigned char *)svgOutput.cstr(), strlen(svgOutput.cstr()));
++ const librevenge::RVNGString svgPrefix("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.1//EN\" \"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\">\n");
++ output.append((unsigned char *)svgPrefix.cstr(), svgPrefix.size());
++ output.append((unsigned char *)svgOutput[0].cstr(), svgOutput[0].size());
+
+ return true;
+ }
+
+- bool _convertDocument(WPXInputStream *input, const char *password, OdfDocumentHandler *handler, const OdfStreamType streamType)
++ bool _convertDocument(librevenge::RVNGInputStream *input, const char *password, OdfDocumentHandler *handler, const OdfStreamType streamType)
+ {
+- OdtGenerator collector(handler, streamType);
++ OdtGenerator collector;
++ collector.addDocumentHandler(handler, streamType);
+ collector.registerEmbeddedObjectHandler("image/x-wpg", &handleEmbeddedWPGObject);
+ collector.registerEmbeddedImageHandler("image/x-wpg", &handleEmbeddedWPGImage);
+- if (WPD_OK == WPDocument::parse(input, &collector, password))
++ if (libwpd::WPD_OK == libwpd::WPDocument::parse(input, &collector, password))
+ return true;
+ return false;
+ }
+diff --git a/filters/words/works/import/CMakeLists.txt b/filters/words/works/import/CMakeLists.txt
+index 76317ae..2c51937 100644
+--- a/filters/words/works/import/CMakeLists.txt
++++ b/filters/words/works/import/CMakeLists.txt
+@@ -1,6 +1,7 @@
+ include_directories(
+ ../../../libodfhandler/
+ ${LIBODFGEN_INCLUDE_DIRS}
++ ${LIBREVENGE_INCLUDE_DIRS}
+ ${LIBWPS_INCLUDE_DIRS}
+ ${KOMAIN_INCLUDES}
+ )
+@@ -15,7 +16,7 @@ set(wps2odt_PART_SRCS
+
+ kde4_add_plugin(calligra_filter_wps2odt ${wps2odt_PART_SRCS})
+
+-target_link_libraries(calligra_filter_wps2odt komain ${LIBODFGEN_LIBRARIES} ${LIBWPS_LIBRARIES})
++target_link_libraries(calligra_filter_wps2odt komain ${LIBODFGEN_LIBRARIES} ${LIBREVENGE_LIBRARIES} ${LIBWPS_LIBRARIES})
+
+ install(TARGETS calligra_filter_wps2odt DESTINATION ${PLUGIN_INSTALL_DIR})
+ install(FILES calligra_filter_wps2odt.desktop DESTINATION ${SERVICES_INSTALL_DIR})
+diff --git a/filters/words/works/import/WPSImport.cpp b/filters/words/works/import/WPSImport.cpp
+index c2058e5..545daf3 100644
+--- a/filters/words/works/import/WPSImport.cpp
++++ b/filters/words/works/import/WPSImport.cpp
+@@ -16,9 +16,9 @@
+
+ #include "WPSImport.h"
+
+-#include <libwpd/libwpd.h>
++#include <librevenge/librevenge.h>
+ #include <libwps/libwps.h>
+-#include <libodfgen/OdtGenerator.hxx>
++#include <libodfgen/libodfgen.hxx>
+
+ #include "OutputFileHelper.hxx"
+ #include <KoFilterChain.h>
+@@ -40,10 +40,11 @@ public:
+ ~OdtOutputFileHelper() {};
+
+ private:
+- bool _isSupportedFormat(WPXInputStream *input, const char * /* password */)
++ bool _isSupportedFormat(librevenge::RVNGInputStream *input, const char * /* password */)
+ {
+- WPSConfidence confidence = WPSDocument::isFileFormatSupported(input);
+- if (confidence == WPS_CONFIDENCE_NONE || confidence == WPS_CONFIDENCE_POOR)
++ libwps::WPSKind kind = libwps::WPS_TEXT;
++ libwps::WPSConfidence confidence = libwps::WPSDocument::isFileFormatSupported(input, kind);
++ if ((libwps::WPS_TEXT != kind) || (confidence != libwps::WPS_CONFIDENCE_EXCELLENT))
+ {
+ fprintf(stderr, "ERROR: We have no confidence that you are giving us a valid Microsoft Works document.\n");
+ return false;
+@@ -52,10 +53,11 @@ private:
+ return true;
+ }
+
+- bool _convertDocument(WPXInputStream *input, const char * /* password */, OdfDocumentHandler *handler, const OdfStreamType streamType)
++ bool _convertDocument(librevenge::RVNGInputStream *input, const char * /* password */, OdfDocumentHandler *handler, const OdfStreamType streamType)
+ {
+- OdtGenerator collector(handler, streamType);
+- if (WPS_OK == WPSDocument::parse(input, &collector))
++ OdtGenerator collector;
++ collector.addDocumentHandler(handler, streamType);
++ if (libwps::WPS_OK == libwps::WPSDocument::parse(input, &collector))
+ return true;
+ return false;
+ }
+--
+1.9.3
+
+
diff --git a/extra/calligra/PKGBUILD b/extra/calligra/PKGBUILD
index be59f30c8..c00d3193b 100644
--- a/extra/calligra/PKGBUILD
+++ b/extra/calligra/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 213126 2014-05-19 14:15:56Z svenstaro $
+# $Id: PKGBUILD 215145 2014-06-14 19:16:51Z andyrtr $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Ronald van Haren <ronald.archlinux.org>
@@ -19,7 +19,7 @@ pkgname=('calligra-braindump'
'calligra-stage'
'calligra-words')
pkgver=2.8.3
-pkgrel=1
+pkgrel=3
arch=('i686' 'x86_64')
url='http://www.calligra-suite.org/'
license=('FDL1.2' 'GPL2' 'LGPL')
@@ -29,11 +29,17 @@ makedepends=('cmake' 'automoc4' 'boost' 'kdepimlibs' 'eigen2' 'kdeedu-marble'
'openjpeg' 'kdegraphics-okular' 'pstoedit' 'vc' 'libvisio'
'libetonyek' 'libpqxx' 'libspnav')
groups=('calligra')
-source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.xz")
-md5sums=('78ad97127a3cc6d2c5c79ac6ae56f130')
+source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.xz"
+ 0001-switch-to-librevenge-based-import-libs.patch)
+md5sums=('78ad97127a3cc6d2c5c79ac6ae56f130'
+ '2589200d3f2199a8bff5755ff3245e33')
prepare() {
mkdir build
+ # use librevenge based import filter libraries - patch taken from Fedora
+ pushd $pkgbase-$pkgver
+ patch -Np1 -i $srcdir/0001-switch-to-librevenge-based-import-libs.patch
+ popd
}
build() {
@@ -64,7 +70,7 @@ package_calligra-filters() {
package_calligra-libs() {
pkgdesc="Libraries for the Calligra office suite"
- depends=('kdepimlibs' 'kactivities')
+ depends=('kdepimlibs' 'kactivities' 'libkactivities4')
conflicts=('koffice-interfaces' 'koffice-libs' 'koffice-pics'
'koffice-servicetypes' 'calligra-interfaces'
'calligra-pics' 'calligra-servicetypes')
diff --git a/extra/cifs-utils/0003-cifskey-better-use-snprintf.patch b/extra/cifs-utils/0003-cifskey-better-use-snprintf.patch
new file mode 100644
index 000000000..bea3603e5
--- /dev/null
+++ b/extra/cifs-utils/0003-cifskey-better-use-snprintf.patch
@@ -0,0 +1,49 @@
+From 0c521d5060035da655107001374e08873ac5dde8 Mon Sep 17 00:00:00 2001
+From: Sebastian Krahmer <krahmer@suse.de>
+Date: Mon, 14 Apr 2014 11:39:41 +0200
+Subject: [PATCH] cifskey: better use snprintf()
+
+Prefer snprintf() over sprintf() in cifskey.c
+Projects that fork the code (pam_cifscreds) can't rely on
+the max-size parameters.
+
+[jlayton: removed unneeded initialization of "len" in key_add]
+
+Signed-off-by: Sebastian Krahmer <krahmer@suse.de>
+---
+ cifskey.c | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/cifskey.c b/cifskey.c
+index 7716c42..e89cacf 100644
+--- a/cifskey.c
++++ b/cifskey.c
+@@ -29,7 +29,8 @@ key_search(const char *addr, char keytype)
+ {
+ char desc[INET6_ADDRSTRLEN + sizeof(KEY_PREFIX) + 4];
+
+- sprintf(desc, "%s:%c:%s", KEY_PREFIX, keytype, addr);
++ if (snprintf(desc, sizeof(desc), "%s:%c:%s", KEY_PREFIX, keytype, addr) >= (int)sizeof(desc))
++ return -1;
+
+ return keyctl_search(DEST_KEYRING, CIFS_KEY_TYPE, desc, 0);
+ }
+@@ -43,10 +44,13 @@ key_add(const char *addr, const char *user, const char *pass, char keytype)
+ char val[MOUNT_PASSWD_SIZE + MAX_USERNAME_SIZE + 2];
+
+ /* set key description */
+- sprintf(desc, "%s:%c:%s", KEY_PREFIX, keytype, addr);
++ if (snprintf(desc, sizeof(desc), "%s:%c:%s", KEY_PREFIX, keytype, addr) >= (int)sizeof(desc))
++ return -1;
+
+ /* set payload contents */
+- len = sprintf(val, "%s:%s", user, pass);
++ len = snprintf(val, sizeof(val), "%s:%s", user, pass);
++ if (len >= (int)sizeof(val))
++ return -1;
+
+ return add_key(CIFS_KEY_TYPE, desc, val, len + 1, DEST_KEYRING);
+ }
+--
+1.8.4.2
+
diff --git a/extra/cifs-utils/0004-cifscreds-better-error-handling-when-key_search-fail.patch b/extra/cifs-utils/0004-cifscreds-better-error-handling-when-key_search-fail.patch
new file mode 100644
index 000000000..cf57eea7b
--- /dev/null
+++ b/extra/cifs-utils/0004-cifscreds-better-error-handling-when-key_search-fail.patch
@@ -0,0 +1,85 @@
+From 3da4c43b575498be86c87a2ac3f3142e3cab1c59 Mon Sep 17 00:00:00 2001
+From: Jeff Layton <jlayton@samba.org>
+Date: Sun, 20 Apr 2014 20:41:05 -0400
+Subject: [PATCH] cifscreds: better error handling when key_search fails
+
+If we ended up getting a bogus string that would have overflowed, then
+make key_search set errno to EINVAL before returning. The callers can
+then test to see if the returned error is what was expected or something
+else and handle it appropriately.
+
+Cc: Sebastian Krahmer <krahmer@suse.de>
+Signed-off-by: Jeff Layton <jlayton@samba.org>
+---
+ cifscreds.c | 9 +++++++++
+ cifskey.c | 5 ++++-
+ pam_cifscreds.c | 9 +++++++++
+ 3 files changed, 22 insertions(+), 1 deletion(-)
+
+diff --git a/cifscreds.c b/cifscreds.c
+index fa05dc8..64d55b0 100644
+--- a/cifscreds.c
++++ b/cifscreds.c
+@@ -188,6 +188,15 @@ static int cifscreds_add(struct cmdarg *arg)
+ return EXIT_FAILURE;
+ }
+
++ switch(errno) {
++ case ENOKEY:
++ /* success */
++ break;
++ default:
++ printf("Key search failed: %s\n", strerror(errno));
++ return EXIT_FAILURE;
++ }
++
+ currentaddress = nextaddress;
+ if (currentaddress) {
+ *(currentaddress - 1) = ',';
+diff --git a/cifskey.c b/cifskey.c
+index e89cacf..4f01ed0 100644
+--- a/cifskey.c
++++ b/cifskey.c
+@@ -20,6 +20,7 @@
+ #include <sys/types.h>
+ #include <keyutils.h>
+ #include <stdio.h>
++#include <errno.h>
+ #include "cifskey.h"
+ #include "resolve_host.h"
+
+@@ -29,8 +30,10 @@ key_search(const char *addr, char keytype)
+ {
+ char desc[INET6_ADDRSTRLEN + sizeof(KEY_PREFIX) + 4];
+
+- if (snprintf(desc, sizeof(desc), "%s:%c:%s", KEY_PREFIX, keytype, addr) >= (int)sizeof(desc))
++ if (snprintf(desc, sizeof(desc), "%s:%c:%s", KEY_PREFIX, keytype, addr) >= (int)sizeof(desc)) {
++ errno = EINVAL;
+ return -1;
++ }
+
+ return keyctl_search(DEST_KEYRING, CIFS_KEY_TYPE, desc, 0);
+ }
+diff --git a/pam_cifscreds.c b/pam_cifscreds.c
+index e0d8a55..fb23117 100644
+--- a/pam_cifscreds.c
++++ b/pam_cifscreds.c
+@@ -206,6 +206,15 @@ static int cifscreds_pam_add(pam_handle_t *ph, const char *user, const char *pas
+ return PAM_SERVICE_ERR;
+ }
+
++ switch(errno) {
++ case ENOKEY:
++ break;
++ default:
++ pam_syslog(ph, LOG_ERR, "Unable to search keyring for %s (%s)",
++ currentaddress, strerror(errno));
++ return PAM_SERVICE_ERR;
++ }
++
+ currentaddress = nextaddress;
+ if (currentaddress) {
+ *(currentaddress - 1) = ',';
+--
+1.8.4.2
+
diff --git a/extra/cifs-utils/0005-cifscreds-better-error-handling-for-key_add.patch b/extra/cifs-utils/0005-cifscreds-better-error-handling-for-key_add.patch
new file mode 100644
index 000000000..3baedd639
--- /dev/null
+++ b/extra/cifs-utils/0005-cifscreds-better-error-handling-for-key_add.patch
@@ -0,0 +1,102 @@
+From 382ec63757c1d8d4d399d17ccc927c4897d4cfc9 Mon Sep 17 00:00:00 2001
+From: Jeff Layton <jlayton@samba.org>
+Date: Sun, 20 Apr 2014 20:41:05 -0400
+Subject: [PATCH] cifscreds: better error handling for key_add
+
+If the string buffers would have been overrun, set errno to EINVAL
+before returning. Then, have the callers report the errors to
+stderr or syslog as appropriate.
+
+Cc: Sebastian Krahmer <krahmer@suse.de>
+Signed-off-by: Jeff Layton <jlayton@samba.org>
+---
+ cifscreds.c | 6 +++---
+ cifskey.c | 8 ++++++--
+ pam_cifscreds.c | 9 +++++----
+ 3 files changed, 14 insertions(+), 9 deletions(-)
+
+diff --git a/cifscreds.c b/cifscreds.c
+index 64d55b0..5d84c3c 100644
+--- a/cifscreds.c
++++ b/cifscreds.c
+@@ -220,8 +220,8 @@ static int cifscreds_add(struct cmdarg *arg)
+ while (currentaddress) {
+ key_serial_t key = key_add(currentaddress, arg->user, pass, arg->keytype);
+ if (key <= 0) {
+- fprintf(stderr, "error: Add credential key for %s\n",
+- currentaddress);
++ fprintf(stderr, "error: Add credential key for %s: %s\n",
++ currentaddress, strerror(errno));
+ } else {
+ if (keyctl(KEYCTL_SETPERM, key, CIFS_KEY_PERMS) < 0) {
+ fprintf(stderr, "error: Setting permissons "
+@@ -422,7 +422,7 @@ static int cifscreds_update(struct cmdarg *arg)
+ key_serial_t key = key_add(addrs[id], arg->user, pass, arg->keytype);
+ if (key <= 0)
+ fprintf(stderr, "error: Update credential key "
+- "for %s\n", addrs[id]);
++ "for %s: %s\n", addrs[id], strerror(errno));
+ }
+
+ return EXIT_SUCCESS;
+diff --git a/cifskey.c b/cifskey.c
+index 4f01ed0..919540f 100644
+--- a/cifskey.c
++++ b/cifskey.c
+@@ -47,13 +47,17 @@ key_add(const char *addr, const char *user, const char *pass, char keytype)
+ char val[MOUNT_PASSWD_SIZE + MAX_USERNAME_SIZE + 2];
+
+ /* set key description */
+- if (snprintf(desc, sizeof(desc), "%s:%c:%s", KEY_PREFIX, keytype, addr) >= (int)sizeof(desc))
++ if (snprintf(desc, sizeof(desc), "%s:%c:%s", KEY_PREFIX, keytype, addr) >= (int)sizeof(desc)) {
++ errno = EINVAL;
+ return -1;
++ }
+
+ /* set payload contents */
+ len = snprintf(val, sizeof(val), "%s:%s", user, pass);
+- if (len >= (int)sizeof(val))
++ if (len >= (int)sizeof(val)) {
++ errno = EINVAL;
+ return -1;
++ }
+
+ return add_key(CIFS_KEY_TYPE, desc, val, len + 1, DEST_KEYRING);
+ }
+diff --git a/pam_cifscreds.c b/pam_cifscreds.c
+index fb23117..5d99c2d 100644
+--- a/pam_cifscreds.c
++++ b/pam_cifscreds.c
+@@ -208,6 +208,7 @@ static int cifscreds_pam_add(pam_handle_t *ph, const char *user, const char *pas
+
+ switch(errno) {
+ case ENOKEY:
++ /* success */
+ break;
+ default:
+ pam_syslog(ph, LOG_ERR, "Unable to search keyring for %s (%s)",
+@@ -233,8 +234,8 @@ static int cifscreds_pam_add(pam_handle_t *ph, const char *user, const char *pas
+ while (currentaddress) {
+ key_serial_t key = key_add(currentaddress, user, password, keytype);
+ if (key <= 0) {
+- pam_syslog(ph, LOG_ERR, "error: Add credential key for %s",
+- currentaddress);
++ pam_syslog(ph, LOG_ERR, "error: Add credential key for %s: %s",
++ currentaddress, strerror(errno));
+ } else {
+ if ((args & ARG_DEBUG) == ARG_DEBUG) {
+ pam_syslog(ph, LOG_DEBUG, "credential key for \\\\%s\\%s added",
+@@ -336,8 +337,8 @@ static int cifscreds_pam_update(pam_handle_t *ph, const char *user, const char *
+ for (id = 0; id < count; id++) {
+ key_serial_t key = key_add(currentaddress, user, password, keytype);
+ if (key <= 0) {
+- pam_syslog(ph, LOG_ERR, "error: Update credential key for %s",
+- currentaddress);
++ pam_syslog(ph, LOG_ERR, "error: Update credential key for %s: %s",
++ currentaddress, strerror(errno));
+ }
+ }
+
+--
+1.8.4.2
+
diff --git a/extra/cifs-utils/PKGBUILD b/extra/cifs-utils/PKGBUILD
index 951a2cf95..6ef93d3a2 100644
--- a/extra/cifs-utils/PKGBUILD
+++ b/extra/cifs-utils/PKGBUILD
@@ -1,14 +1,26 @@
-# $Id: PKGBUILD 214184 2014-06-04 12:03:07Z tpowa $
+# $Id: PKGBUILD 215193 2014-06-16 10:42:57Z tpowa $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
pkgname=cifs-utils
pkgver=6.3
-pkgrel=1
+pkgrel=2
pkgdesc="CIFS filesystem user-space tools"
arch=(i686 x86_64)
url="http://wiki.samba.org/index.php/LinuxCIFS_utils"
license=('GPL')
depends=('libcap-ng' 'keyutils' 'krb5' 'talloc' 'libwbclient' 'pam')
-source=(ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/$pkgname-$pkgver.tar.bz2)
+source=(ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/$pkgname-$pkgver.tar.bz2
+ '0003-cifskey-better-use-snprintf.patch'
+ '0004-cifscreds-better-error-handling-when-key_search-fail.patch'
+ '0005-cifscreds-better-error-handling-for-key_add.patch')
+
+prepare() {
+ cd "$srcdir/$pkgname-$pkgver"
+ # add fedora patches
+ # 40789 CVE-2014-2830
+ patch -Np1 -i "$srcdir/0003-cifskey-better-use-snprintf.patch"
+ patch -Np1 -i "$srcdir/0004-cifscreds-better-error-handling-when-key_search-fail.patch"
+ patch -Np1 -i "$srcdir/0005-cifscreds-better-error-handling-for-key_add.patch"
+}
build() {
cd "$srcdir/$pkgname-$pkgver"
@@ -27,4 +39,7 @@ package() {
# set mount.cifs uid, to enable none root mounting form fstab
chmod +s $pkgdir/usr/bin/mount.cifs
}
-md5sums=('93697dbc043cb4d5c66e15e281f872e5')
+md5sums=('93697dbc043cb4d5c66e15e281f872e5'
+ 'cc13c6d1b734a446d0f4384e0ce32748'
+ '350491f336dc931f9b192228909e5924'
+ 'ac2b3367363fbc79f8f7fdfcae008a8c')
diff --git a/extra/cmake/FindPython-Interp-Libs-Search-for-Python-3.4.patch b/extra/cmake/FindPython-Interp-Libs-Search-for-Python-3.4.patch
deleted file mode 100644
index fee6b39bf..000000000
--- a/extra/cmake/FindPython-Interp-Libs-Search-for-Python-3.4.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From ab6201ab647c13fee44c44822b8502e9848faaaf Mon Sep 17 00:00:00 2001
-From: Matt McCormick <matt.mccormick@kitware.com>
-Date: Wed, 5 Mar 2014 17:41:47 -0500
-Subject: [PATCH] FindPython{Interp,Libs}: Search for Python 3.4.
-
-Python 3.4.0rnc1 was released on 2014-02-20.
----
- Modules/FindPythonInterp.cmake | 2 +-
- Modules/FindPythonLibs.cmake | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Modules/FindPythonInterp.cmake b/Modules/FindPythonInterp.cmake
-index 8da848c..e23a58b 100644
---- a/Modules/FindPythonInterp.cmake
-+++ b/Modules/FindPythonInterp.cmake
-@@ -47,7 +47,7 @@ unset(_Python_NAMES)
-
- set(_PYTHON1_VERSIONS 1.6 1.5)
- set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
--set(_PYTHON3_VERSIONS 3.3 3.2 3.1 3.0)
-+set(_PYTHON3_VERSIONS 3.4 3.3 3.2 3.1 3.0)
-
- if(PythonInterp_FIND_VERSION)
- if(PythonInterp_FIND_VERSION_COUNT GREATER 1)
-diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake
-index 0749efc..1dbc967 100644
---- a/Modules/FindPythonLibs.cmake
-+++ b/Modules/FindPythonLibs.cmake
-@@ -51,7 +51,7 @@ CMAKE_FIND_FRAMEWORKS(Python)
-
- set(_PYTHON1_VERSIONS 1.6 1.5)
- set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
--set(_PYTHON3_VERSIONS 3.3 3.2 3.1 3.0)
-+set(_PYTHON3_VERSIONS 3.4 3.3 3.2 3.1 3.0)
-
- if(PythonLibs_FIND_VERSION)
- if(PythonLibs_FIND_VERSION_COUNT GREATER 1)
---
-1.9.0
-
diff --git a/extra/cmake/PKGBUILD b/extra/cmake/PKGBUILD
index 3e1e54f5b..01a0f37c5 100644
--- a/extra/cmake/PKGBUILD
+++ b/extra/cmake/PKGBUILD
@@ -1,34 +1,29 @@
-# $Id: PKGBUILD 208238 2014-03-20 07:54:59Z bpiotrowski $
+# $Id: PKGBUILD 215225 2014-06-16 21:39:19Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
pkgname=cmake
-pkgver=2.8.12.2
-pkgrel=2
-pkgdesc="A cross-platform open-source make system"
+pkgver=3.0.0
+pkgrel=3
+pkgdesc='A cross-platform open-source make system'
arch=('i686' 'x86_64')
url="http://www.cmake.org/"
license=('custom')
depends=('curl' 'libarchive' 'shared-mime-info')
-makedepends=('qt4' 'emacs')
-optdepends=('qt4: cmake-gui')
+makedepends=('qt5-base' 'python-sphinx' 'emacs')
+optdepends=('qt5-base: cmake-gui'
+ 'libxkbcommon-x11: cmake-gui')
install="${pkgname}.install"
-source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz"
- "findfreetype.patch"
- "FindPython-Interp-Libs-Search-for-Python-3.4.patch")
-md5sums=('17c6513483d23590cbce6957ec6d1e66'
- '90321de1d9d46cd8d6609d0509dbd7b0'
- '5e036a37f9b0b3368b8cfcc5784d1514')
+source=("http://www.cmake.org/files/v3.0/${pkgname}-${pkgver}.tar.gz")
+md5sums=('21a1c85e1a3b803c4b48e7ff915a863e')
build() {
cd ${pkgname}-${pkgver}
- patch -Np1 < ${srcdir}/findfreetype.patch
- patch -Np1 < ${srcdir}/FindPython-Interp-Libs-Search-for-Python-3.4.patch
-
./bootstrap --prefix=/usr \
--mandir=/share/man \
--docdir=/share/doc/cmake \
+ --sphinx-man \
--system-libs \
--qt-gui \
--parallel=$(/usr/bin/getconf _NPROCESSORS_ONLN)
@@ -40,12 +35,14 @@ package() {
make DESTDIR="${pkgdir}" install
vimpath="${pkgdir}/usr/share/vim/vimfiles"
- install -Dm644 Docs/cmake-indent.vim "${vimpath}"/indent/cmake-indent.vim
- install -Dm644 Docs/cmake-syntax.vim "${vimpath}"/syntax/cmake-syntax.vim
-
- install -Dm644 Docs/cmake-mode.el \
- "${pkgdir}"/usr/share/emacs/site-lisp/cmake-mode.el
- emacs -batch -f batch-byte-compile "${pkgdir}"/usr/share/emacs/site-lisp/cmake-mode.el
+ install -d "${vimpath}"/{help,indent,syntax}
+ ln -s /usr/share/cmake-3.0/editors/vim/cmake-help.vim "${vimpath}"/help/
+ ln -s /usr/share/cmake-3.0/editors/vim/cmake-indent.vim "${vimpath}"/indent/
+ ln -s /usr/share/cmake-3.0/editors/vim/cmake-syntax.vim "${vimpath}"/syntax/
+
+ install -d "${pkgdir}"/usr/share/emacs/site-lisp/
+ emacs -batch -f batch-byte-compile "${pkgdir}"/usr/share/cmake-3.0/editors/emacs/cmake-mode.el
+ ln -s /usr/share/cmake-3.0/editors/emacs/cmake-mode.el "${pkgdir}"/usr/share/emacs/site-lisp/
install -Dm644 Copyright.txt \
"${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
diff --git a/extra/cmake/findfreetype.patch b/extra/cmake/findfreetype.patch
deleted file mode 100644
index 454b591dd..000000000
--- a/extra/cmake/findfreetype.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/Modules/FindFreetype.cmake b/Modules/FindFreetype.cmake
-index 179dc00..0f5a2b4 100644
---- a/Modules/FindFreetype.cmake
-+++ b/Modules/FindFreetype.cmake
-@@ -62,10 +62,10 @@ find_path(FREETYPE_INCLUDE_DIR_ft2build ft2build.h
- ENV GTKMM_BASEPATH
- [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]
- [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]
-- PATH_SUFFIXES include/freetype2 include
-+ PATH_SUFFIXES include/freetype2 include/freetype include
- )
-
--find_path(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h
-+find_path(FREETYPE_INCLUDE_DIR_freetype2 config/ftheader.h
- HINTS
- ENV FREETYPE_DIR
- PATHS
-@@ -76,7 +76,7 @@ find_path(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h
- ENV GTKMM_BASEPATH
- [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]
- [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]
-- PATH_SUFFIXES include/freetype2 include
-+ PATH_SUFFIXES include/freetype2 include/freetype include include/freetype2/freetype
- )
-
- find_library(FREETYPE_LIBRARY
diff --git a/extra/efl/PKGBUILD b/extra/efl/PKGBUILD
index 40e57269b..2a094f136 100644
--- a/extra/efl/PKGBUILD
+++ b/extra/efl/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 213609 2014-05-26 19:22:35Z ronald $
+# $Id: PKGBUILD 215156 2014-06-14 19:17:03Z andyrtr $
# Maintainer: Ronald van Haren <ronald@archlinux.org>
# Contributor: Enlightenment Developers <enlightenment-devel@enlightenment.org>
pkgbase=efl
pkgname=('efl' 'efl-docs')
pkgver=1.10.0
-pkgrel=1
+pkgrel=2
pkgdesc="Enlightenment Foundation Libraries"
arch=('i686' 'x86_64')
url="http://www.enlightenment.org"
@@ -14,18 +14,22 @@ depends=('bullet' 'libjpeg-turbo' 'gst-plugins-base'
'luajit' 'curl' 'fribidi' 'libpulse' 'libxcomposite'
'libxinerama' 'libxrandr' 'libxss' 'python2'
'libxcursor' 'libxp' 'libwebp' 'shared-mime-info'
- 'libxkbcommon' 'wayland')
+ 'libxkbcommon' 'wayland')
makedepends=('doxygen')
-replaces=('ecore' 'edje' 'eet' 'eeze' 'efreet' 'eina' 'eio' 'embryo'
- 'emotion' 'ethumb' 'evas')
+replaces=('ecore' 'edje' 'eet' 'eeze' 'efreet' 'eina' 'eio' 'embryo'
+ 'emotion' 'ethumb' 'evas')
options=('!emptydirs')
-source=(http://download.enlightenment.org/rel/libs/${pkgname}/$pkgname-$pkgver.tar.gz)
+source=(http://download.enlightenment.org/rel/libs/${pkgname}/$pkgname-$pkgver.tar.gz
+ efl-1.10.0-giflib-5.1.0.patch)
install=efl.install
-sha1sums=('c9e57f55f050e2a7e97e870857170163a550beaa')
+sha1sums=('c9e57f55f050e2a7e97e870857170163a550beaa'
+ '269bc6104859291107aa0c9eac2d9d3026df5b12')
prepare() {
- sed -i 's/env python$/&2/' "${srcdir}/${pkgname}-${pkgver}/src/scripts/eina/eina-bench-cmp"
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ sed -i 's/env python$/&2/' src/scripts/eina/eina-bench-cmp
+ patch -p1 -i "${srcdir}/efl-1.10.0-giflib-5.1.0.patch"
}
build() {
@@ -48,9 +52,9 @@ package_efl(){
# install non-standard license files
install -Dm644 "${srcdir}/${pkgname}-${pkgver}/licenses/COPYING.BSD" \
- "${pkgdir}/usr/share/licenses/${pkgname}/COPYING.BSD"
+ "${pkgdir}/usr/share/licenses/${pkgname}/COPYING.BSD"
install -Dm644 "${srcdir}/${pkgname}-${pkgver}/licenses/COPYING.SMALL" \
- "${pkgdir}/usr/share/licenses/${pkgname}/COPYING.SMALL"
+ "${pkgdir}/usr/share/licenses/${pkgname}/COPYING.SMALL"
}
package_efl-docs() {
diff --git a/extra/efl/efl-1.10.0-giflib-5.1.0.patch b/extra/efl/efl-1.10.0-giflib-5.1.0.patch
new file mode 100644
index 000000000..429b91ea8
--- /dev/null
+++ b/extra/efl/efl-1.10.0-giflib-5.1.0.patch
@@ -0,0 +1,39 @@
+diff -rupN a/src/modules/evas/loaders/gif/evas_image_load_gif.c b/src/modules/evas/loaders/gif/evas_image_load_gif.c
+--- a/src/modules/evas/loaders/gif/evas_image_load_gif.c 2014-05-19 16:10:12.000000000 +0000
++++ b/src/modules/evas/loaders/gif/evas_image_load_gif.c 2014-06-01 11:05:50.963850389 +0000
+@@ -528,7 +528,7 @@ evas_image_load_file_head_gif2(void *loa
+ ret = EINA_TRUE;
+
+ on_error: // jump here on any errors to clean up
+- if (gif) DGifCloseFile(gif);
++ if (gif) DGifCloseFile(gif, NULL);
+ if (fi.map) eina_file_map_free(f, fi.map);
+ return ret;
+ }
+@@ -606,7 +606,7 @@ open_file:
+ // start as we have nothnig to build on
+ if ((index > 0) && (index < loader->imgnum) && (animated->animated))
+ {
+- if (loader->gif) DGifCloseFile(loader->gif);
++ if (loader->gif) DGifCloseFile(loader->gif, NULL);
+ if ((loader->fi.map) && (loader->f))
+ eina_file_map_free(loader->f, loader->fi.map);
+ loader->gif = NULL;
+@@ -764,7 +764,7 @@ open_file:
+ loader->imgnum = imgnum;
+ if ((animated->frame_count <= 1) || (rec == TERMINATE_RECORD_TYPE))
+ {
+- if (loader->gif) DGifCloseFile(loader->gif);
++ if (loader->gif) DGifCloseFile(loader->gif, NULL);
+ if ((loader->fi.map) && (loader->f))
+ eina_file_map_free(loader->f, loader->fi.map);
+ loader->gif = NULL;
+@@ -848,7 +848,7 @@ static void
+ evas_image_load_file_close_gif2(void *loader_data)
+ {
+ Loader_Info *loader = loader_data;
+- if (loader->gif) DGifCloseFile(loader->gif);
++ if (loader->gif) DGifCloseFile(loader->gif, NULL);
+ if ((loader->fi.map) && (loader->f))
+ eina_file_map_free(loader->f, loader->fi.map);
+ free(loader);
diff --git a/extra/emacs/PKGBUILD b/extra/emacs/PKGBUILD
index b2149a2f1..be31a3ec9 100644
--- a/extra/emacs/PKGBUILD
+++ b/extra/emacs/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 204839 2014-01-28 14:14:20Z juergen $
+# $Id: PKGBUILD 215157 2014-06-14 19:17:04Z andyrtr $
# Maintainer: Juergen Hoetzel <juergen@archlinux.org>
# Contributor: Renchi Raju <renchi@green.tam.uiuc.edu>
pkgname=emacs
pkgver=24.3
-pkgrel=6
+pkgrel=7
pkgdesc="The extensible, customizable, self-documenting real-time display editor"
arch=('i686' 'x86_64')
url="http://www.gnu.org/software/emacs/emacs.html"
@@ -15,7 +15,7 @@ source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.xz{,.sig}
emacs-24.3-giflib5.patch)
md5sums=('ea9ed000ca165280265aabb55b9afbd7'
'SKIP'
- '560cdf463299e059c5fadf474bcba218')
+ 'ccbe4e77440ff6ea56c8532ebc960446')
prepare() {
cd $pkgname-$pkgver
diff --git a/extra/emacs/emacs-24.3-giflib5.patch b/extra/emacs/emacs-24.3-giflib5.patch
index b8571abb2..f58c31907 100644
--- a/extra/emacs/emacs-24.3-giflib5.patch
+++ b/extra/emacs/emacs-24.3-giflib5.patch
@@ -24,3 +24,74 @@
if (!gif)
{
image_error ("Cannot open memory source `%s'", img->spec, Qnil);
+@@ -7225,7 +7225,11 @@
+ if (!check_image_size (f, gif->SWidth, gif->SHeight))
+ {
+ image_error ("Invalid image size (see `max-image-size')", Qnil, Qnil);
++#if GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1
++ fn_DGifCloseFile (gif, NULL);
++#else
+ fn_DGifCloseFile (gif);
++#endif
+ return 0;
+ }
+
+@@ -7234,7 +7238,11 @@
+ if (rc == GIF_ERROR || gif->ImageCount <= 0)
+ {
+ image_error ("Error reading `%s'", img->spec, Qnil);
++#if GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1
++ fn_DGifCloseFile (gif, NULL);
++#else
+ fn_DGifCloseFile (gif);
++#endif
+ return 0;
+ }
+
+@@ -7246,7 +7254,11 @@
+ {
+ image_error ("Invalid image number `%s' in image `%s'",
+ image_number, img->spec);
++#if GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1
++ fn_DGifCloseFile (gif, NULL);
++#else
+ fn_DGifCloseFile (gif);
++#endif
+ return 0;
+ }
+ }
+@@ -7264,14 +7276,22 @@
+ if (!check_image_size (f, width, height))
+ {
+ image_error ("Invalid image size (see `max-image-size')", Qnil, Qnil);
++#if GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1
++ fn_DGifCloseFile (gif, NULL);
++#else
+ fn_DGifCloseFile (gif);
++#endif
+ return 0;
+ }
+
+ /* Create the X image and pixmap. */
+ if (!x_create_x_image_and_pixmap (f, width, height, 0, &ximg, &img->pixmap))
+ {
++#if GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1
++ fn_DGifCloseFile (gif, NULL);
++#else
+ fn_DGifCloseFile (gif);
++#endif
+ return 0;
+ }
+
+@@ -7447,7 +7467,11 @@
+ Fcons (make_number (gif->ImageCount),
+ img->lisp_data));
+
++#if GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1
++ fn_DGifCloseFile (gif, NULL);
++#else
+ fn_DGifCloseFile (gif);
++#endif
+
+ /* Maybe fill in the background field while we have ximg handy. */
+ if (NILP (image_spec_value (img->spec, QCbackground, NULL)))
diff --git a/extra/fbida/PKGBUILD b/extra/fbida/PKGBUILD
index 560de96b1..082f742a1 100644
--- a/extra/fbida/PKGBUILD
+++ b/extra/fbida/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 191916 2013-08-01 06:59:45Z bpiotrowski $
+# $Id: PKGBUILD 215158 2014-06-14 19:17:06Z andyrtr $
# Maintainer: Eric Bélanger <eric@archlinux.org>
pkgname=fbida
pkgver=2.09
-pkgrel=3
+pkgrel=4
pkgdesc="Few applications to display and elementary edit images: fbi, fbgs, ida, exiftran"
arch=('i686' 'x86_64')
url="http://www.kraxel.org/blog/linux/fbida/"
@@ -17,7 +17,7 @@ source=(http://www.kraxel.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.
sha1sums=('5838b2cb7188481fece6159fccb3b121acd906e7'
'SKIP'
'd06b70f2d581a1a3e9e0909b5af7f3f71ed54717'
- '4e7ed05fbfba46296aae11a9768680109bee8ac5')
+ 'a5644d75e868bfc23bc462c3b4bc84c1a168146c')
prepare() {
cd ${pkgname}-${pkgver}
diff --git a/extra/fbida/ida-PrintGifError.patch b/extra/fbida/ida-PrintGifError.patch
index 60a45ea7d..e023218dd 100644
--- a/extra/fbida/ida-PrintGifError.patch
+++ b/extra/fbida/ida-PrintGifError.patch
@@ -59,3 +59,25 @@ diff -Naur fbida-2.09-orig/rd/read-gif.c fbida-2.09/rd/read-gif.c
}
if (NULL == h->gif->SColorMap &&
NULL == h->gif->Image.ColorMap) {
+@@ -165,7 +165,7 @@
+ oops:
+ if (debug)
+ fprintf(stderr,"gif: fatal error, aborting\n");
+- DGifCloseFile(h->gif);
++ DGifCloseFile(h->gif, &Error);
+ fclose(h->infile);
+ free(h->row);
+ free(h);
+@@ -202,10 +202,11 @@
+ gif_done(void *data)
+ {
+ struct gif_state *h = data;
++ int Error;
+
+ if (debug)
+ fprintf(stderr,"gif: done, cleaning up\n");
+- DGifCloseFile(h->gif);
++ DGifCloseFile(h->gif, &Error);
+ fclose(h->infile);
+ if (h->il)
+ free(h->il);
diff --git a/extra/fontforge/PKGBUILD b/extra/fontforge/PKGBUILD
index e06f51c1d..e5532bc08 100644
--- a/extra/fontforge/PKGBUILD
+++ b/extra/fontforge/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 209262 2014-03-31 07:34:34Z bisson $
+# $Id: PKGBUILD 215159 2014-06-14 19:17:07Z andyrtr $
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
# Contributor: Eric Belanger <eric@archlinux.org>
# Contributor: William Rea <sillywilly@gmail.com>
@@ -6,18 +6,20 @@
pkgname=fontforge
_pkgver=2.0.20140101
pkgver=${_pkgver##*.}
-pkgrel=2
+pkgrel=3
pkgdesc='Outline and bitmap font editor'
-url='http://fontforge.sourceforge.net/'
+url='http://www.fontforge.org/'
arch=('i686' 'x86_64')
license=('BSD')
depends=('libltdl' 'libxkbui' 'libxi'
'pango' 'giflib' 'libtiff' 'libspiro' 'libxml2' 'libspiro' 'libunicodenames' 'zeromq'
'python2' 'desktop-file-utils' 'gtk-update-icon-cache' 'hicolor-icon-theme')
source=("https://github.com/fontforge/fontforge/archive/${_pkgver}.tar.gz"
- 'http://fontforge.org/cidmaps.tgz')
+ 'http://fontforge.org/cidmaps.tgz'
+ 'giflib.patch')
sha1sums=('abce297e53e8b6ff6f08871e53d1eb0be5ab82e7'
- 'efbc7c9d3e95159f5600dc71f9cccb370e46bb94')
+ 'efbc7c9d3e95159f5600dc71f9cccb370e46bb94'
+ '420dd1dd75d72719f3203d832bfa8c1c7e7eef86')
options=('!makeflags')
install=install
@@ -25,6 +27,7 @@ install=install
prepare() {
cd "${srcdir}/${pkgname}-${_pkgver}"
sed '/fontforge_package_name/s/^#//' -i configure.ac
+ patch -p1 -i ../giflib.patch
./autogen.sh
}
diff --git a/extra/fontforge/giflib.patch b/extra/fontforge/giflib.patch
new file mode 100644
index 000000000..6234484a6
--- /dev/null
+++ b/extra/fontforge/giflib.patch
@@ -0,0 +1,37 @@
+diff -Naur old/gutils/gimagereadgif.c new/gutils/gimagereadgif.c
+--- old/gutils/gimagereadgif.c 2014-01-01 05:56:11.000000000 -1000
++++ new/gutils/gimagereadgif.c 2014-05-27 07:04:34.930338020 -1000
+@@ -170,13 +170,13 @@
+
+ if ( DGifSlurp(gif)!=GIF_OK ) {
+ fprintf(stderr,"Bad input file \"%s\"\n",filename );
+- DGifCloseFile(gif);
++ DGifCloseFile(gif, NULL);
+ return( NULL );
+ }
+
+ /* Process each image so that it/they can be imported into FF. */
+ if ( (images=(GImage **) malloc(gif->ImageCount*sizeof(GImage *)))==NULL ) {
+- DGifCloseFile(gif);
++ DGifCloseFile(gif, NULL);
+ NoMoreMemMessage();
+ return( NULL );
+ }
+@@ -185,7 +185,7 @@
+ if ( (images[i]=ProcessSavedImage(gif,&gif->SavedImages[i],il))==NULL ) {
+ while ( --i>=0 ) free(images[i]);
+ free(images);
+- DGifCloseFile(gif);
++ DGifCloseFile(gif, NULL);
+ return( NULL );
+ }
+ }
+@@ -195,7 +195,7 @@
+ ret = images[0];
+ else
+ ret = GImageCreateAnimation(images,gif->ImageCount);
+- DGifCloseFile(gif);
++ DGifCloseFile(gif, NULL);
+ free(images);
+ return( ret );
+ }
diff --git a/extra/gc/PKGBUILD b/extra/gc/PKGBUILD
index fe519ebe1..0a68d21be 100644
--- a/extra/gc/PKGBUILD
+++ b/extra/gc/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 213308 2014-05-19 16:09:54Z anatolik $
+# $Id: PKGBUILD 215177 2014-06-15 15:40:57Z heftig $
# Maintainer: Daniel Isenmann <daniel [at] archlinux.org>
# Contributor: dorphell <dorphell@gmx.net>
pkgname=gc
-pkgver=7.4.0
-pkgrel=3
+pkgver=7.4.2
+pkgrel=1
pkgdesc="A garbage collector for C and C++"
arch=('i686' 'x86_64')
url="http://www.hboehm.info/gc/"
license=('GPL')
source=("http://www.hboehm.info/gc/gc_source/${pkgname}-${pkgver}.tar.gz")
depends=('gcc-libs' 'libatomic_ops')
-md5sums=('f40d9a47c90d60791eeecb484f8df5ee')
+md5sums=('12c05fd2811d989341d8c6d81f66af87')
prepare() {
cd ${pkgname}-${pkgver}
diff --git a/extra/giflib/PKGBUILD b/extra/giflib/PKGBUILD
index 863a67c16..aa929cae8 100644
--- a/extra/giflib/PKGBUILD
+++ b/extra/giflib/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 211326 2014-04-18 17:38:48Z bpiotrowski $
+# $Id: PKGBUILD 215160 2014-06-14 19:17:08Z andyrtr $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Baptiste Daroussin <baptiste.daroussin@gmail.com>
# Contributor: Grigorios Bouzakis <grbzks[at]gmail[dot]com>
# Contributor: mightyjaym <jm.ambrosino@free.fr>
pkgname=giflib
-pkgver=5.0.6
+pkgver=5.1.0
pkgrel=1
pkgdesc="A library for reading and writing gif images"
url="http://sourceforge.net/projects/giflib/"
@@ -28,3 +28,4 @@ package() {
install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
}
+md5sums=('c7e9f1c10b755ab955156d4c1ac7fc5d')
diff --git a/extra/gparted/PKGBUILD b/extra/gparted/PKGBUILD
index ad95742d3..31472cb67 100644
--- a/extra/gparted/PKGBUILD
+++ b/extra/gparted/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 206153 2014-02-20 11:30:56Z giovanni $
+# $Id: PKGBUILD 215088 2014-06-13 13:44:39Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Andrew Simmons <andrew.simmons@gmail.com>
# Contributor: György Balló <ballogy@freestart.hu>
pkgname=gparted
-pkgver=0.18.0
+pkgver=0.19.0
pkgrel=1
pkgdesc="A Partition Magic clone, frontend to GNU Parted"
arch=('i686' 'x86_64')
@@ -28,7 +28,7 @@ install=gparted.install
source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.bz2"
'org.archlinux.pkexec.gparted.policy'
'gparted_polkit')
-md5sums=('c4c928de08519c923abaa5a099881241'
+md5sums=('9cf1d1d1596ce2f7191969e081008af2'
'122ed3120c846376bead22b25f6a3b19'
'0b68a4e2bc6bc15440730ebe2d7bf9f6')
diff --git a/extra/imlib/PKGBUILD b/extra/imlib/PKGBUILD
index feb2a6e91..76be50533 100644
--- a/extra/imlib/PKGBUILD
+++ b/extra/imlib/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 213047 2014-05-17 19:10:09Z eric $
+# $Id: PKGBUILD 215161 2014-06-14 19:17:10Z andyrtr $
# Maintainer: Eric Bélanger <eric@archlinux.org>
pkgname=imlib
pkgver=1.9.15
-pkgrel=14
+pkgrel=15
pkgdesc="General image handling library for X11 and Gtk"
arch=('i686' 'x86_64')
url="http://freshmeat.net/projects/imlib/"
@@ -12,13 +12,13 @@ depends=('giflib' 'libpng' 'libtiff' 'libxext')
makedepends=('libxt')
source=(http://ftp.gnome.org/pub/GNOME/sources/imlib/1.9/${pkgname}-${pkgver}.tar.bz2
debian-bug448360.patch CAN-2004-1026.patch aclocal-fixes.patch
- imlib-1.9.15-libpng15.patch imlib-giflib5.patch imlib-gtk.patch)
+ imlib-1.9.15-libpng15.patch imlib-giflib51.patch imlib-gtk.patch)
sha1sums=('c9a732a354fbb3c7e1a426e5d19fc92d73f8f720'
'fe2fd9ce4d7bc62271e724153de39012de8ec5ee'
'ec1b47281c1a7fb21abe841f948ecc56ed13f310'
'af54cb1ee0c8c6122b277284ebdd1022e31df3b5'
'33c3aaa43eb624f2a6ab0406285a8515903333e3'
- '56e9d65e05a347452fd608d2dfc8538f7ce09893'
+ '3c33b3d7f7125a6fbfcf48ca585739b71b1d8ebf'
'7cf962f8d7488200910ba4bdee00473f035b054a')
prepare() {
@@ -27,9 +27,10 @@ prepare() {
patch -p1 -i "${srcdir}/CAN-2004-1026.patch"
patch -p0 -i "${srcdir}/aclocal-fixes.patch"
patch -p0 -i "${srcdir}/imlib-1.9.15-libpng15.patch"
- patch -p1 -i "${srcdir}/imlib-giflib5.patch"
+ patch -p1 -i "${srcdir}/imlib-giflib51.patch"
patch -p1 -i "${srcdir}/imlib-gtk.patch"
sed '/AC_PATH_XTRA/d' -i configure.in
+ mv configure.in configure.ac
libtoolize --force
cp /usr/bin/libtool .
}
diff --git a/extra/imlib/imlib-giflib5.patch b/extra/imlib/imlib-giflib5.patch
deleted file mode 100644
index affd206fc..000000000
--- a/extra/imlib/imlib-giflib5.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-diff -Naur imlib-1.9.15-orig/Imlib/load.c imlib-1.9.15/Imlib/load.c
---- imlib-1.9.15-orig/Imlib/load.c 2013-07-29 17:33:54.656601713 -0400
-+++ imlib-1.9.15/Imlib/load.c 2013-07-29 17:39:39.063991823 -0400
-@@ -444,6 +444,7 @@
- int intjump[] = {8, 8, 4, 2};
- int istransp, transp;
- int fd;
-+ int Error;
-
- done = 0;
- istransp = 0;
-@@ -454,7 +455,7 @@
- fd = fileno(f);
- /* Apparently rewind(f) isn't sufficient */
- lseek(fd, (long) 0, 0);
-- gif = DGifOpenFileHandle(fd);
-+ gif = DGifOpenFileHandle(fd, &Error);
-
- if (!gif)
- return NULL;
-diff -Naur imlib-1.9.15-orig/gdk_imlib/io-gif.c imlib-1.9.15/gdk_imlib/io-gif.c
---- imlib-1.9.15-orig/gdk_imlib/io-gif.c 2013-07-29 17:33:54.656601713 -0400
-+++ imlib-1.9.15/gdk_imlib/io-gif.c 2013-07-29 17:37:11.941783903 -0400
-@@ -23,6 +23,7 @@
- int intjump[] = {8, 8, 4, 2};
- int istransp, transp;
- int fd;
-+ int Error;
-
- done = 0;
- istransp = 0;
-@@ -30,7 +31,7 @@
- fd = fileno(f);
- /* Apparently rewind(f) isn't sufficient */
- lseek(fd, (long) 0, 0);
-- gif = DGifOpenFileHandle(fd);
-+ gif = DGifOpenFileHandle(fd, &Error);
-
- transp = -1;
- data = NULL;
-diff -Naur imlib-1.9.15-orig/Imlib/load.c imlib-1.9.15/Imlib/load.c
---- imlib-1.9.15-orig/Imlib/load.c 2013-07-29 22:06:15.111285191 -0400
-+++ imlib-1.9.15/Imlib/load.c 2013-07-29 22:07:36.926673905 -0400
-@@ -6,6 +6,14 @@
-
- #define G_MAXINT ((int) 0x7fffffff)
-
-+static void
-+localPrintGifError(void)
-+{
-+ int ErrorCode=0;
-+ GifErrorString(ErrorCode);
-+ fprintf(stderr, "\nGIF-LIB error: %i.\n", ErrorCode);
-+}
-+
- /* Split the ID - damages input */
-
- static char *
-@@ -462,14 +470,14 @@
- {
- if (DGifGetRecordType(gif, &rec) == GIF_ERROR)
- {
-- PrintGifError();
-+ localPrintGifError();
- rec = TERMINATE_RECORD_TYPE;
- }
- if ((rec == IMAGE_DESC_RECORD_TYPE) && (!done))
- {
- if (DGifGetImageDesc(gif) == GIF_ERROR)
- {
-- PrintGifError();
-+ localPrintGifError();
- rec = TERMINATE_RECORD_TYPE;
- }
- *w = gif->Image.Width;
-diff -Naur imlib-1.9.15-orig/gdk_imlib/io-gif.c imlib-1.9.15/gdk_imlib/io-gif.c
---- imlib-1.9.15-orig/gdk_imlib/io-gif.c 2013-07-29 22:06:15.111285191 -0400
-+++ imlib-1.9.15/gdk_imlib/io-gif.c 2013-07-29 22:08:46.182265058 -0400
-@@ -10,6 +10,14 @@
- #else
- #include <gif_lib.h>
-
-+static void
-+localPrintGifError(void)
-+{
-+ int ErrorCode=0;
-+ GifErrorString(ErrorCode);
-+ fprintf(stderr, "\nGIF-LIB error: %i.\n", ErrorCode);
-+}
-+
- unsigned char *
- loader_gif(FILE *f, int *w, int *h, int *t)
- {
-@@ -43,14 +51,14 @@
- {
- if (DGifGetRecordType(gif, &rec) == GIF_ERROR)
- {
-- PrintGifError();
-+ localPrintGifError();
- rec = TERMINATE_RECORD_TYPE;
- }
- if ((rec == IMAGE_DESC_RECORD_TYPE) && (!done))
- {
- if (DGifGetImageDesc(gif) == GIF_ERROR)
- {
-- PrintGifError();
-+ localPrintGifError();
- rec = TERMINATE_RECORD_TYPE;
- }
- *w = gif->Image.Width;
diff --git a/extra/imlib/imlib-giflib51.patch b/extra/imlib/imlib-giflib51.patch
new file mode 100644
index 000000000..ae0cf7043
--- /dev/null
+++ b/extra/imlib/imlib-giflib51.patch
@@ -0,0 +1,126 @@
+diff -ruN imlib-1.9.15.orig/gdk_imlib/io-gif.c imlib-1.9.15/gdk_imlib/io-gif.c
+--- imlib-1.9.15.orig/gdk_imlib/io-gif.c 2014-05-27 09:38:13.210527763 +0000
++++ imlib-1.9.15/gdk_imlib/io-gif.c 2014-05-27 09:43:55.435910398 +0000
+@@ -30,7 +30,7 @@
+ fd = fileno(f);
+ /* Apparently rewind(f) isn't sufficient */
+ lseek(fd, (long) 0, 0);
+- gif = DGifOpenFileHandle(fd);
++ gif = DGifOpenFileHandle(fd, NULL);
+
+ transp = -1;
+ data = NULL;
+@@ -43,14 +43,14 @@
+ {
+ if (DGifGetRecordType(gif, &rec) == GIF_ERROR)
+ {
+- PrintGifError();
++ fprintf(stderr, "giflib error: %s\n", GifErrorString(gif->Error));
+ rec = TERMINATE_RECORD_TYPE;
+ }
+ if ((rec == IMAGE_DESC_RECORD_TYPE) && (!done))
+ {
+ if (DGifGetImageDesc(gif) == GIF_ERROR)
+ {
+- PrintGifError();
++ fprintf(stderr, "giflib error: %s\n", GifErrorString(gif->Error));
+ rec = TERMINATE_RECORD_TYPE;
+ }
+ *w = gif->Image.Width;
+@@ -62,13 +62,13 @@
+ rows = malloc(*h * sizeof(GifRowType *));
+ if (!rows)
+ {
+- DGifCloseFile(gif);
++ DGifCloseFile(gif, NULL);
+ return NULL;
+ }
+ data = _gdk_malloc_image(*w, *h);
+ if (!data)
+ {
+- DGifCloseFile(gif);
++ DGifCloseFile(gif, NULL);
+ free(rows);
+ return NULL;
+ }
+@@ -79,7 +79,7 @@
+ rows[i] = malloc(*w * sizeof(GifPixelType));
+ if (!rows[i])
+ {
+- DGifCloseFile(gif);
++ DGifCloseFile(gif, NULL);
+ for (i = 0; i < *h; i++)
+ if (rows[i])
+ free(rows[i]);
+@@ -168,7 +168,7 @@
+ }
+ }
+ }
+- DGifCloseFile(gif);
++ DGifCloseFile(gif, NULL);
+ for (i = 0; i < *h; i++)
+ free(rows[i]);
+ free(rows);
+diff -ruN imlib-1.9.15.orig/Imlib/load.c imlib-1.9.15/Imlib/load.c
+--- imlib-1.9.15.orig/Imlib/load.c 2014-05-27 09:38:13.220527723 +0000
++++ imlib-1.9.15/Imlib/load.c 2014-05-27 09:45:25.775576104 +0000
+@@ -454,7 +454,7 @@
+ fd = fileno(f);
+ /* Apparently rewind(f) isn't sufficient */
+ lseek(fd, (long) 0, 0);
+- gif = DGifOpenFileHandle(fd);
++ gif = DGifOpenFileHandle(fd, NULL);
+
+ if (!gif)
+ return NULL;
+@@ -462,14 +462,14 @@
+ {
+ if (DGifGetRecordType(gif, &rec) == GIF_ERROR)
+ {
+- PrintGifError();
++ fprintf(stderr, "Imlib ERROR: JPEG uses line buffers > 16. Cannot load.\n");
+ rec = TERMINATE_RECORD_TYPE;
+ }
+ if ((rec == IMAGE_DESC_RECORD_TYPE) && (!done))
+ {
+ if (DGifGetImageDesc(gif) == GIF_ERROR)
+ {
+- PrintGifError();
++ fprintf(stderr, "Imlib ERROR: JPEG uses line buffers > 16. Cannot load.\n");
+ rec = TERMINATE_RECORD_TYPE;
+ }
+ *w = gif->Image.Width;
+@@ -481,13 +481,13 @@
+ rows = malloc(*h * sizeof(GifRowType *));
+ if (!rows)
+ {
+- DGifCloseFile(gif);
++ DGifCloseFile(gif, NULL);
+ return NULL;
+ }
+ data = _imlib_malloc_image(*w, *h);
+ if (!data)
+ {
+- DGifCloseFile(gif);
++ DGifCloseFile(gif, NULL);
+ free(rows);
+ return NULL;
+ }
+@@ -498,7 +498,7 @@
+ rows[i] = malloc(*w * sizeof(GifPixelType));
+ if (!rows[i])
+ {
+- DGifCloseFile(gif);
++ DGifCloseFile(gif, NULL);
+ for (i = 0; i < *h; i++)
+ if (rows[i])
+ free(rows[i]);
+@@ -587,7 +587,7 @@
+ }
+ }
+ }
+- DGifCloseFile(gif);
++ DGifCloseFile(gif, NULL);
+ for (i = 0; i < *h; i++)
+ free(rows[i]);
+ free(rows);
diff --git a/extra/imlib2/PKGBUILD b/extra/imlib2/PKGBUILD
index 635ace90e..3c7d08d5f 100644
--- a/extra/imlib2/PKGBUILD
+++ b/extra/imlib2/PKGBUILD
@@ -1,24 +1,24 @@
-# $Id: PKGBUILD 204813 2014-01-27 19:49:53Z ronald $
+# $Id: PKGBUILD 215162 2014-06-14 19:17:11Z andyrtr $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Arjan Timmerman <arjan.archlinux.org>
# Contributor: Tom Newsom <Jeepster.gmx.co.uk>
pkgname=imlib2
pkgver=1.4.6
-pkgrel=1
+pkgrel=2
pkgdesc="Library that does image file loading and saving as well as rendering, manipulation, arbitrary polygon support"
url="http://sourceforge.net/projects/enlightenment/"
arch=('i686' 'x86_64')
license=('BSD')
depends=('libtiff' 'giflib' 'bzip2' 'freetype2' 'libxext' 'libpng' 'libid3tag' 'libjpeg-turbo')
source=(http://downloads.sourceforge.net/enlightenment/$pkgname-$pkgver.tar.bz2
- imlib2-giflib5.patch)
+ imlib2-giflib51.patch)
sha1sums=('20e111d822074593e8d657ecf8aafe504e9e2967'
- '29d0778ffbe6e57f08048918a79eb1ad6af87bce')
+ '3ee249142b4caecc4a38ac29a999708447f250c1')
prepare() {
cd $pkgname-$pkgver
- patch -Np0 -i ../imlib2-giflib5.patch
+ patch -Np1 -i ../imlib2-giflib51.patch
}
build() {
diff --git a/extra/imlib2/imlib2-giflib5.patch b/extra/imlib2/imlib2-giflib5.patch
deleted file mode 100644
index 966c6e4a7..000000000
--- a/extra/imlib2/imlib2-giflib5.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/modules/loaders/loader_gif.c.orig
-+++ src/modules/loaders/loader_gif.c
-@@ -40,7 +40,11 @@ load(ImlibImage * im, ImlibProgressFunct
- #endif
- if (fd < 0)
- return 0;
-+#if defined(GIFLIB_MAJOR) && (GIFLIB_MAJOR >= 5)
-+ gif = DGifOpenFileHandle(fd, NULL);
-+#else
- gif = DGifOpenFileHandle(fd);
-+#endif
- if (!gif)
- {
- close(fd);
diff --git a/extra/imlib2/imlib2-giflib51.patch b/extra/imlib2/imlib2-giflib51.patch
new file mode 100644
index 000000000..1bd8627d3
--- /dev/null
+++ b/extra/imlib2/imlib2-giflib51.patch
@@ -0,0 +1,64 @@
+diff -ruN imlib2-1.4.6.orig/src/modules/loaders/loader_gif.c imlib2-1.4.6/src/modules/loaders/loader_gif.c
+--- imlib2-1.4.6.orig/src/modules/loaders/loader_gif.c 2013-12-21 10:16:10.000000000 +0000
++++ imlib2-1.4.6/src/modules/loaders/loader_gif.c 2014-05-27 09:52:35.857291512 +0000
+@@ -36,7 +36,7 @@
+ #endif
+ if (fd < 0)
+ return 0;
+- gif = DGifOpenFileHandle(fd);
++ gif = DGifOpenFileHandle(fd, NULL);
+ if (!gif)
+ {
+ close(fd);
+@@ -60,13 +60,13 @@
+ h = gif->Image.Height;
+ if (!IMAGE_DIMENSIONS_OK(w, h))
+ {
+- DGifCloseFile(gif);
++ DGifCloseFile(gif, NULL);
+ return 0;
+ }
+ rows = malloc(h * sizeof(GifRowType *));
+ if (!rows)
+ {
+- DGifCloseFile(gif);
++ DGifCloseFile(gif, NULL);
+ return 0;
+ }
+ for (i = 0; i < h; i++)
+@@ -78,7 +78,7 @@
+ rows[i] = malloc(w * sizeof(GifPixelType));
+ if (!rows[i])
+ {
+- DGifCloseFile(gif);
++ DGifCloseFile(gif, NULL);
+ for (i = 0; i < h; i++)
+ {
+ if (rows[i])
+@@ -150,7 +150,7 @@
+ im->data = (DATA32 *) malloc(sizeof(DATA32) * w * h);
+ if (!im->data)
+ {
+- DGifCloseFile(gif);
++ DGifCloseFile(gif, NULL);
+ free(rows);
+ return 0;
+ }
+@@ -181,7 +181,7 @@
+ last_per = (int)per;
+ if (!(progress(im, (int)per, 0, last_y, w, i)))
+ {
+- DGifCloseFile(gif);
++ DGifCloseFile(gif, NULL);
+ for (i = 0; i < h; i++)
+ {
+ free(rows[i]);
+@@ -198,7 +198,7 @@
+ {
+ progress(im, 100, 0, last_y, w, h);
+ }
+- DGifCloseFile(gif);
++ DGifCloseFile(gif, NULL);
+ for (i = 0; i < h; i++)
+ {
+ free(rows[i]);
diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD
index 22bac7a2c..bb983cef3 100644
--- a/extra/java7-openjdk/PKGBUILD
+++ b/extra/java7-openjdk/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 210627 2014-04-16 12:11:05Z guillaume $
+# $Id: PKGBUILD 215163 2014-06-14 19:17:13Z andyrtr $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
# Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
# Contributor: Jan de Groot <jgc@archlinux.org>
@@ -6,24 +6,15 @@
pkgname=('jre7-openjdk-headless' 'jre7-openjdk' 'jdk7-openjdk' 'openjdk7-src' 'openjdk7-doc')
pkgbase=java7-openjdk
_java_ver=7
-_icedtea_ver=2.4.7
+_icedtea_ver=2.5.0
# check "${srcdir}/icedtea-${_icedtea_ver}"/Makefile.am
-_JDK_UPDATE_VERSION=55
-
-_CORBA_CHANGESET=e6ad5b912691
-_JAXP_CHANGESET=94b7e8e0d96f
-_JAXWS_CHANGESET=bd9a50a78d04
-_JDK_CHANGESET=9448fff93286
-_LANGTOOLS_CHANGESET=8c26a3c39128
-_OPENJDK_CHANGESET=13970e76b784
-
-_HOTSPOT_CHANGESET=69b542696e5b # see "${srcdir}/icedtea-${_icedtea_ver}"/hotspot.map
+_JDK_UPDATE_VERSION=60
_bootstrap=0 # 0/1 for quick build or full bootstrap
pkgver=${_java_ver}.u${_JDK_UPDATE_VERSION}_${_icedtea_ver}
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
url="http://icedtea.classpath.org"
license=('custom')
@@ -33,83 +24,91 @@ makedepends=('jdk7-openjdk' 'libxp' 'libxslt'
'java-rhino' 'libpulse>=0.9.11' 'zip' 'unzip' 'cpio' 'fastjar' 'wget'
'eclipse-ecj')
-_url=http://icedtea.classpath.org/hg/release/icedtea7-forest-${_icedtea_ver:0:3}
-source=(http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar.gz
- openjdk-${_OPENJDK_CHANGESET}.tar.gz::${_url}/archive/${_OPENJDK_CHANGESET}.tar.gz
- corba-${_CORBA_CHANGESET}.tar.gz::${_url}/corba/archive/${_CORBA_CHANGESET}.tar.gz
- jaxp-${_JAXP_CHANGESET}.tar.gz::${_url}/jaxp/archive/${_JAXP_CHANGESET}.tar.gz
- jaxws-${_JAXWS_CHANGESET}.tar.gz::${_url}/jaxws/archive/${_JAXWS_CHANGESET}.tar.gz
- jdk-${_JDK_CHANGESET}.tar.gz::${_url}/jdk/archive/${_JDK_CHANGESET}.tar.gz
- langtools-${_LANGTOOLS_CHANGESET}.tar.gz::${_url}/langtools/archive/${_LANGTOOLS_CHANGESET}.tar.gz
- hotspot-${_HOTSPOT_CHANGESET}.tar.gz::${_url}/hotspot/archive/${_HOTSPOT_CHANGESET}.tar.gz
+_icedtea_url=http://icedtea.classpath.org/download
+_drops_url=${_icedtea_url}/drops/icedtea7/${_icedtea_ver:0:3}
+source=(${_icedtea_url}/source/icedtea-${_icedtea_ver}.tar.gz
+ ${_drops_url}/openjdk.tar.bz2
+ ${_drops_url}/corba.tar.bz2
+ ${_drops_url}/jaxp.tar.bz2
+ ${_drops_url}/jaxws.tar.bz2
+ ${_drops_url}/jdk.tar.bz2
+ ${_drops_url}/langtools.tar.bz2
+ ${_drops_url}/hotspot.tar.bz2
fontconfig-paths.diff
openjdk7_nonreparenting-wm.diff
+ giflib_5.1.diff
jdk7-openjdk.profile
jdk7-openjdk.profile.csh
jre7-openjdk.profile
jre7-openjdk.profile.csh)
-sha256sums=('754350cbd704b22b7ba3d14c8283eb2d896d137824f95a9e6a2b34678658ade1'
- 'bcd45546509defc439f42f230c0ca64e8aa6ec00542c3634aab3a4c10be3fe6b'
- 'cc37272df260d08207c84763d4c39d7807728ba2d5908276b9bc63e925e70674'
- '3515cd105c29563bf78432576e658005386f45d7c3b2b7eac7af86cf196aaaea'
- '3e107628080d84a80a78ef0ef9dc3664989291dd17c8bacf031d59fba7bd7f4d'
- '9222e5317264f20d4a0b8170b4c4d02459cda98333c18e3a75064e7856ff58be'
- '5af29e32344e2f2fc0beb31f91b8312f2a0d6d02c53b4cb700ee2e27bcf1043b'
- 'e3bbed298ed7c77169fdfddc47cdb85c62ef2e5e7ea04ca28aa8779861efca65'
+sha256sums=('4e369e35dbf37a5fcc1a837861a74609bf907d3d0b9be7ac98d4f9c99dba7100'
+ '9a2f9486a48d51f84bdf9b9a52dc34fe90b886aa60ff5447b7f2502479065859'
+ '1f9f07f31ce8588cd3cd12465f94e142c852c380059a3dab9831d86d3f264253'
+ '59edb741e1b00243c040b399986960fad9e42f7e5dbe0a1e34798752b080c488'
+ 'ed3803635ed25f58cd86ad8ca27585f77cc50385da0342112980cc6ba8ff6028'
+ '508b4e26704749172022c95f44c5aa9feb391e82b54a545fdb79f3a51c269f83'
+ '0eb9c19cfbecfbc6ef1e37f475d73f16469b9e1d969f69b1af4b10cbc2415659'
+ '645a43adaec3be3d3297479d134c02e444af9f0be33d35942f0ca863592fea26'
'9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f'
'56b919ababb13bd6afdcdaceb112b529b6e82539255f2dae9a7e5eb91645164b'
+ '77fba3032edf6cce549cd4e174d9296684b20f4589dc59179fcc8cba7426a4e9'
'bd55299e08e6f8e61ba5baad0990170891801a29a1e8137e502b5e8a10fc37ea'
'3f28f8bfc6dd105a07f747d7135c77a77de433e2b8647dd7520a900135203fbd'
'b7c045b08ad55a9f79390c104fa846d0e7dbb49fccffb2fab2a3824b6b19c9c8'
'89d99d8ac269ca66e2e279aff652d5aac938a35faec93cd8cff8f048052bd3ce')
-noextract=("openjdk-${_OPENJDK_CHANGESET}.tar.gz"
- "corba-${_CORBA_CHANGESET}.tar.gz"
- "jaxp-${_JAXP_CHANGESET}.tar.gz"
- "jaxws-${_JAXWS_CHANGESET}.tar.gz"
- "jdk-${_JDK_CHANGESET}.tar.gz"
- "langtools-${_LANGTOOLS_CHANGESET}.tar.gz"
- "hotspot-${_HOTSPOT_CHANGESET}.tar.gz")
+noextract=(openjdk.tar.gz
+ corba.tar.gz
+ jaxp.tar.gz
+ jaxws.tar.gz
+ jdk.tar.gz
+ langtools.tar.gz
+ hotspot.tar.gz)
- _jvmdir=/usr/lib/jvm/java-7-openjdk
+[ "$CARCH" = "x86_64" ] && _JARCH=amd64
+[ "$CARCH" = "i686" ] && _JARCH=i386
+
+_jvmdir=/usr/lib/jvm/java-7-openjdk
+_imgdir="icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image"
+_nonheadless=(bin/policytool
+ lib/${_JARCH}/libjsoundalsa.so
+ lib/${_JARCH}/libsplashscreen.so
+ lib/${_JARCH}/xawt/libmawt.so)
- [ "$CARCH" = "x86_64" ] && _JARCH=amd64
- [ "$CARCH" = "i686" ] && _JARCH=i386
-
build() {
cd "${srcdir}/icedtea-${_icedtea_ver}"
-
+
export ALT_PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}"
export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}"
. /etc/profile.d/apache-ant.sh
- cp ${srcdir}/*.diff ${srcdir}/icedtea-${_icedtea_ver}/patches
+ cp "${srcdir}"/*.diff "${srcdir}"/icedtea-${_icedtea_ver}/patches
export DISTRIBUTION_PATCHES="patches/fontconfig-paths.diff \
- patches/openjdk7_nonreparenting-wm.diff"
+ patches/openjdk7_nonreparenting-wm.diff \
+ patches/giflib_5.1.diff"
if [ "$_bootstrap" = "1" ]; then
BOOTSTRAPOPT="--enable-bootstrap --with-ecj-jar=/usr/share/java/ecj.jar"
- else
+ else
BOOTSTRAPOPT="--disable-bootstrap"
fi
./configure \
- $BOOTSTRAPOPT \
+ ${BOOTSTRAPOPT} \
--with-parallel-jobs="${MAKEFLAGS/-j}" \
--disable-tests \
--disable-downloading --disable-Werror \
- --with-pkgversion="ArchLinux build ${pkgver}-${pkgrel}-${CARCH}" \
+ --with-pkgversion="Arch Linux build ${pkgver}-${pkgrel}-${CARCH}" \
--with-jdk-home=${JAVA_HOME} \
- --with-openjdk-src-zip=${srcdir}/openjdk-${_OPENJDK_CHANGESET}.tar.gz \
- --with-hotspot-src-zip=${srcdir}/hotspot-${_HOTSPOT_CHANGESET}.tar.gz \
- --with-corba-src-zip=${srcdir}/corba-${_CORBA_CHANGESET}.tar.gz \
- --with-jaxp-src-zip=${srcdir}/jaxp-${_JAXP_CHANGESET}.tar.gz \
- --with-jaxws-src-zip=${srcdir}/jaxws-${_JAXWS_CHANGESET}.tar.gz \
- --with-jdk-src-zip=${srcdir}/jdk-${_JDK_CHANGESET}.tar.gz \
- --with-langtools-src-zip=${srcdir}/langtools-${_LANGTOOLS_CHANGESET}.tar.gz \
- --enable-pulse-java \
+ --with-openjdk-src-zip="${srcdir}/openjdk.tar.bz2" \
+ --with-hotspot-src-zip="${srcdir}/hotspot.tar.bz2" \
+ --with-corba-src-zip="${srcdir}/corba.tar.bz2" \
+ --with-jaxp-src-zip="${srcdir}/jaxp.tar.bz2" \
+ --with-jaxws-src-zip="${srcdir}/jaxws.tar.bz2" \
+ --with-jdk-src-zip="${srcdir}/jdk.tar.bz2" \
+ --with-langtools-src-zip="${srcdir}/langtools.tar.bz2" \
--enable-nss \
--with-rhino \
--with-abs-install-dir=${_jvmdir}
@@ -122,135 +121,102 @@ check() {
}
package_jre7-openjdk-headless() {
- pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs - Minimal Java runtime - needed for executing non GUI Java programs"
+ pkgdesc='OpenJDK Java 7 headless runtime environment'
depends=('libjpeg-turbo' 'lcms2' 'nss' 'ca-certificates-java')
optdepends=('libcups: needed for Java Mauve support - libmawt.so'
'fontconfig: needed for Java Mauve support - libmawt.so'
'java-rhino: for some JavaScript support')
provides=('java-runtime-headless=7')
conflicts=('openjdk6')
- backup=(etc/profile.d/jre.sh
- etc/profile.d/jre.csh
- etc/java-7-openjdk/calendars.properties
- etc/java-7-openjdk/content-types.properties
- etc/java-7-openjdk/cursors/cursors.properties
- etc/java-7-openjdk/flavormap.properties
- etc/java-7-openjdk/fontconfig.bfc
- etc/java-7-openjdk/fontconfig.properties
- etc/java-7-openjdk/jvm.cfg
- etc/java-7-openjdk/logging.properties
- etc/java-7-openjdk/management/jmxremote.access
- etc/java-7-openjdk/management/jmxremote.password
- etc/java-7-openjdk/management/management.properties
- etc/java-7-openjdk/management/snmp.acl
- etc/java-7-openjdk/net.properties
- etc/java-7-openjdk/psfont.properties.ja
- etc/java-7-openjdk/psfontj2d.properties
- etc/java-7-openjdk/security/java.policy
- etc/java-7-openjdk/security/java.security
- etc/java-7-openjdk/security/nss.cfg
- etc/java-7-openjdk/sound.properties
- etc/java-7-openjdk/tz.properties)
+ # Upstream config files that should go to etc and get backup
+ _backup_etc=(etc/java-7-openjdk/${_JARCH}/jvm.cfg
+ etc/java-7-openjdk/calendars.properties
+ etc/java-7-openjdk/content-types.properties
+ etc/java-7-openjdk/flavormap.properties
+ etc/java-7-openjdk/fontconfig.bfc
+ etc/java-7-openjdk/fontconfig.properties
+ etc/java-7-openjdk/images/cursors/cursors.properties
+ etc/java-7-openjdk/logging.properties
+ etc/java-7-openjdk/management/jmxremote.access
+ etc/java-7-openjdk/management/jmxremote.password
+ etc/java-7-openjdk/management/management.properties
+ etc/java-7-openjdk/management/snmp.acl
+ etc/java-7-openjdk/net.properties
+ etc/java-7-openjdk/psfont.properties.ja
+ etc/java-7-openjdk/psfontj2d.properties
+ etc/java-7-openjdk/security/java.policy
+ etc/java-7-openjdk/security/java.security
+ etc/java-7-openjdk/security/nss.cfg
+ etc/java-7-openjdk/sound.properties
+ etc/java-7-openjdk/tz.properties)
+ backup=(${_backup_etc[@]}
+ etc/profile.d/jre.sh
+ etc/profile.d/jre.csh)
install=jre7-openjdk-headless.install
- cd "${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image/jre"
+ cd "${srcdir}/${_imgdir}/jre"
- mv lib/fontconfig.Ubuntu.properties.src lib/fontconfig.properties
- mv lib/fontconfig.Ubuntu.bfc lib/fontconfig.bfc
- rm -f lib/fontconfig.*.bfc
- rm -f lib/fontconfig.*.properties.src
- rm -f lib/fontconfig.properties.src
+ install -d -m755 "${pkgdir}${_jvmdir}/jre"
+ cp -a bin lib "${pkgdir}${_jvmdir}/jre"
- install -d -m755 ${pkgdir}${_jvmdir}/jre
- cp -a bin lib ${pkgdir}${_jvmdir}/jre
+ # Set config files
+ mv "${pkgdir}${_jvmdir}"/jre/lib/fontconfig.{Ubuntu.properties.src,properties}
+ mv "${pkgdir}${_jvmdir}"/jre/lib/fontconfig.{Ubuntu.bfc,bfc}
+ mv "${pkgdir}${_jvmdir}"/jre/lib/management/jmxremote.password{.template,}
+ mv "${pkgdir}${_jvmdir}"/jre/lib/management/snmp.acl{.template,}
+ rm -f "${pkgdir}${_jvmdir}"/jre/lib/fontconfig.*.bfc
+ rm -f "${pkgdir}${_jvmdir}"/jre/lib/fontconfig.*.properties.src
+ rm -f "${pkgdir}${_jvmdir}"/jre/lib/fontconfig.properties.src
- # Install man pages
- pushd ../../j2re-image/man
- install -m755 -d ${pkgdir}/usr/share/man/{,ja/}man1/
- install -m644 man1/*.1 ${pkgdir}/usr/share/man/man1
- install -m644 ja_JP.UTF-8/man1/*.1 ${pkgdir}/usr/share/man/ja/man1
- popd
+ # Remove 'non-headless' files
+ for f in ${_nonheadless[@]}; do
+ rm "${pkgdir}${_jvmdir}/jre/${f}"
+ done
- # more files that belong to the desktop package
- mkdir ${srcdir}/tmp-desktop-jre
- for file in \
- "${_jvmdir}/jre/bin/policytool" \
- "${_jvmdir}/jre/lib/${_JARCH}/libjsoundalsa.so" \
- "${_jvmdir}/jre/lib/${_JARCH}/libpulse-java.so" \
- "${_jvmdir}/jre/lib/${_JARCH}/libsplashscreen.so" \
- "${_jvmdir}/jre/lib/${_JARCH}/xawt/libmawt.so" \
- "/usr/share/man/ja/man1/policytool.1" \
- "/usr/share/man/man1/policytool.1"; do
- dirname=`dirname $file`
- install -dm755 ${srcdir}/tmp-desktop-jre/$dirname || /bin/true
- # mv file from fakeinstall to pkgdir
- mv ${pkgdir}/$file ${srcdir}/tmp-desktop-jre$file
+ # Man pages
+ pushd "${pkgdir}${_jvmdir}/jre/bin"
+ install -d -m 755 "${pkgdir}"/usr/share/man/{,ja/}man1/
+ for file in *; do
+ install -m 644 "${srcdir}/${_imgdir}/man/man1/${file}.1" \
+ "${pkgdir}/usr/share/man/man1/${file}.1"
+ install -m 644 "${srcdir}/${_imgdir}/man/ja/man1/${file}.1" \
+ "${pkgdir}/usr/share/man/ja/man1/${file}.1"
done
- rmdir ${pkgdir}${_jvmdir}/jre/lib/${_JARCH}/xawt
+ popd
# Link binaries into /usr/bin
- pushd ${pkgdir}${_jvmdir}/jre/bin
- install -m755 -d ${pkgdir}/usr/bin/
+ pushd "${pkgdir}${_jvmdir}/jre/bin"
+ install -d -m755 "${pkgdir}/usr/bin/"
for file in *; do
- ln -sf ${_jvmdir}/jre/bin/${file} ${pkgdir}/usr/bin
+ ln -sf ${_jvmdir}/jre/bin/${file} "${pkgdir}/usr/bin"
done
popd
# Link JKS keystore from ca-certificates-java
- rm -f ${pkgdir}${_jvmdir}/jre/lib/security/cacerts
+ rm -f "${pkgdir}${_jvmdir}/jre/lib/security/cacerts"
ln -sf /etc/ssl/certs/java/cacerts "${pkgdir}${_jvmdir}/jre/lib/security/cacerts"
# Set some variables
- install -m755 -d ${pkgdir}/etc/profile.d/
- install -m755 ${srcdir}/jre7-openjdk.profile ${pkgdir}/etc/profile.d/jre.sh
- install -m755 ${srcdir}/jre7-openjdk.profile.csh ${pkgdir}/etc/profile.d/jre.csh
+ install -d -m755 "${pkgdir}/etc/profile.d/"
+ install -m755 "${srcdir}/jre7-openjdk.profile" "${pkgdir}/etc/profile.d/jre.sh"
+ install -m755 "${srcdir}/jre7-openjdk.profile.csh" "${pkgdir}/etc/profile.d/jre.csh"
# Install license
- install -m755 -d ${pkgdir}/usr/share/licenses/${pkgbase}/
+ install -d -m755 "${pkgdir}/usr/share/licenses/${pkgbase}/"
install -m644 ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README \
- ${pkgdir}/usr/share/licenses/${pkgbase}
-
- # link license
+ "${pkgdir}/usr/share/licenses/${pkgbase}"
ln -sf /usr/share/licenses/${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}"
-
- # Put some more files under backup control
- install -m755 -d ${pkgdir}/etc/java-7-openjdk/
- install -m644 ${pkgdir}${_jvmdir}/jre/lib/*.properties* ${pkgdir}/etc/java-7-openjdk/
- # install dummy links to make them found by JAVA
- cd ${pkgdir}${_jvmdir}/jre/lib/
- for file in `ls ${pkgdir}/etc/java-7-openjdk/*.properties*`; do
- ln -vsf /etc/java-7-openjdk/`basename $file` .
+
+ # Move config files that were set in _backup_etc from ./lib to /etc
+ for file in ${_backup_etc[@]}; do
+ _filepkgpath=${_jvmdir}/jre/lib/${file#etc/java-7-openjdk/}
+ install -D -m 644 "${pkgdir}${_filepkgpath}" "${pkgdir}/${file}"
+ ln -sf /${file} "${pkgdir}${_filepkgpath}"
done
- # some more
- install -m755 -d ${pkgdir}/etc/java-7-openjdk/{cursors,management,security}
- install -m644 ${pkgdir}${_jvmdir}/jre/lib/images/cursors/cursors.properties \
- ${pkgdir}/etc/java-7-openjdk/cursors/
- pushd ${pkgdir}${_jvmdir}/jre/lib/images/cursors/
- ln -vsf /etc/java-7-openjdk/cursors/cursors.properties .
- popd
- mv ${pkgdir}${_jvmdir}/jre/lib/management/jmxremote.password.template \
- ${pkgdir}${_jvmdir}/jre/lib/management/jmxremote.password
- mv ${pkgdir}${_jvmdir}/jre/lib/management/snmp.acl.template \
- ${pkgdir}${_jvmdir}/jre/lib/management/snmp.acl
- install -m644 ${pkgdir}${_jvmdir}/jre/lib/management/{management.properties,jmxremote.access,jmxremote.password,snmp.acl} \
- ${pkgdir}/etc/java-7-openjdk/management/
- pushd ${pkgdir}${_jvmdir}/jre/lib/management
- ln -vsf /etc/java-7-openjdk/management/{management.properties,jmxremote.access,jmxremote.password,snmp.acl} .
- popd
- install -m644 ${pkgdir}${_jvmdir}/jre/lib/security/{java.policy,java.security,nss.cfg} \
- ${pkgdir}/etc/java-7-openjdk/security/
- pushd ${pkgdir}${_jvmdir}/jre/lib/security
- ln -vsf /etc/java-7-openjdk/security/{java.policy,java.security,nss.cfg} .
- popd
- install -m644 ${pkgdir}${_jvmdir}/jre/lib/fontconfig.bfc ${pkgdir}/etc/java-7-openjdk/
- install -m644 ${pkgdir}${_jvmdir}/jre/lib/${_JARCH}/jvm.cfg ${pkgdir}/etc/java-7-openjdk/
- pushd ${pkgdir}${_jvmdir}/jre/lib/${_JARCH}/
- ln -vsf /etc/java-7-openjdk/jvm.cfg .
- popd
}
-
+
package_jre7-openjdk() {
- pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs - Full Java runtime environment - needed for executing Java GUI and Webstart programs"
+ pkgdesc='OpenJDK Java 7 full runtime environment'
depends=('jre7-openjdk-headless' 'xdg-utils' 'hicolor-icon-theme')
optdepends=('icedtea-web-java7: web browser plugin + Java Web Start'
'alsa-lib: for basic sound support'
@@ -258,108 +224,121 @@ package_jre7-openjdk() {
'libpulse: for advanced sound support'
'gtk2: for the Gtk+ look and feel - desktop usage'
'libxtst: linked in xawt/libmawt.so - desktop usage')
- install=jre7-openjdk.install
provides=('java-runtime=7')
conflicts=('openjdk6')
-
- mv ${srcdir}/tmp-desktop-jre/* ${pkgdir}
+ install=jre7-openjdk.install
+
+ cd "${srcdir}/${_imgdir}/jre"
+
+ for f in ${_nonheadless[@]}; do
+ install -D ${f} "${pkgdir}${_jvmdir}/jre/${f}"
+ done
+
# Link binaries into /usr/bin
- pushd ${pkgdir}${_jvmdir}/jre/bin
- install -m755 -d ${pkgdir}/usr/bin/
+ pushd "${pkgdir}${_jvmdir}/jre/bin"
+ install -d -m755 "${pkgdir}/usr/bin/"
+ for file in *; do
+ ln -sf ${_jvmdir}/jre/bin/${file} "${pkgdir}/usr/bin"
+ done
+ popd
+
+ # Man pages
+ pushd "${pkgdir}${_jvmdir}/jre/bin"
+ install -d -m 755 "${pkgdir}"/usr/share/man/{,ja/}man1/
for file in *; do
- ln -sf ${_jvmdir}/jre/bin/${file} ${pkgdir}/usr/bin
+ install -m 644 "${srcdir}/${_imgdir}/man/man1/${file}.1" \
+ "${pkgdir}/usr/share/man/man1/${file}.1"
+ install -m 644 "${srcdir}/${_imgdir}/man/ja/man1/${file}.1" \
+ "${pkgdir}/usr/share/man/ja/man1/${file}.1"
done
popd
-
- cd "${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image/jre"
# Install icons and menu entries
for s in 16 24 32 48 ; do
- install -m755 -d ${pkgdir}/usr/share/icons/hicolor/${s}x${s}/apps/
+ install -d -m755 "${pkgdir}/usr/share/icons/hicolor/${s}x${s}/apps/"
install -m644 ../../../openjdk/jdk/src/solaris/classes/sun/awt/X11/java-icon${s}.png \
- ${pkgdir}/usr/share/icons/hicolor/${s}x${s}/apps/java.png
+ "${pkgdir}/usr/share/icons/hicolor/${s}x${s}/apps/java.png"
done
-
+
# Install desktop files.
- install -m755 -d ${pkgdir}/usr/share/applications
- install -m644 ${srcdir}/icedtea-${_icedtea_ver}/policytool.desktop ${pkgdir}/usr/share/applications
+ install -d -m755 "${pkgdir}/usr/share/applications"
+ install -m644 "${srcdir}/icedtea-${_icedtea_ver}/policytool.desktop" "${pkgdir}/usr/share/applications"
# link license
- install -m755 -d ${pkgdir}/usr/share/licenses
+ install -d -m755 "${pkgdir}/usr/share/licenses"
ln -sf /usr/share/licenses/${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}"
}
package_jdk7-openjdk() {
- pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs - SDK"
+ pkgdesc='OpenJDK Java 7 development kit'
depends=('jre7-openjdk')
provides=('java-environment=7')
conflicts=('java-environment')
replaces=('openjdk6')
backup=(etc/profile.d/jdk.sh etc/profile.d/jdk.csh)
- cd "${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image"
+ cd "${srcdir}/${_imgdir}"
# Main files
- install -m755 -d ${pkgdir}${_jvmdir}
+ install -d -m755 "${pkgdir}${_jvmdir}"
- cp -a include lib ${pkgdir}${_jvmdir}
+ cp -a include lib "${pkgdir}${_jvmdir}"
# 'bin' files
pushd bin
- install -m755 -d ${pkgdir}${_jvmdir}/bin/ \
- ${pkgdir}/usr/bin/ \
- ${pkgdir}/usr/share/man/{,ja/}man1/
+ install -d -m755 "${pkgdir}${_jvmdir}/bin/" \
+ "${pkgdir}"/usr/bin/ \
+ "${pkgdir}"/usr/share/man/{,ja/}man1/
# 'java-rmi.cgi' will be handled separately as it should not be in the PATH and has no man page
for b in $(ls | grep -v java-rmi.cgi); do
if [ -e ../jre/bin/${b} ]; then
# Provide a link of the jre binary in the jdk/bin/ directory
- ln -s ../jre/bin/${b} ${pkgdir}${_jvmdir}/bin/${b}
+ ln -s ../jre/bin/${b} "${pkgdir}${_jvmdir}/bin/${b}"
else
# Copy binary to jdk/bin/
- install -m755 ${b} ${pkgdir}${_jvmdir}/bin/${b}
+ install -m755 ${b} "${pkgdir}${_jvmdir}/bin/${b}"
# Copy man page
- install -m644 ../man/man1/${b}.1 ${pkgdir}/usr/share/man/man1/${b}.1
- install -m644 ../man/ja/man1/${b}.1 ${pkgdir}/usr/share/man/ja/man1/${b}.1
+ install -m644 ../man/man1/${b}.1 "${pkgdir}/usr/share/man/man1/${b}.1"
+ install -m644 ../man/ja/man1/${b}.1 "${pkgdir}/usr/share/man/ja/man1/${b}.1"
# Link from /bin/
- ln -s ${_jvmdir}/bin/${b} ${pkgdir}/usr/bin/${b}
+ ln -s ${_jvmdir}/bin/${b} "${pkgdir}/usr/bin/${b}"
fi
done
popd
- # Install desktop files.
- install -m755 -d ${pkgdir}/usr/share/applications
- install -m644 ${srcdir}/icedtea-${_icedtea_ver}/jconsole.desktop ${pkgdir}/usr/share/applications
-
# Handling 'java-rmi.cgi' separately
- install -m755 -D bin/java-rmi.cgi ${pkgdir}${_jvmdir}/bin/java-rmi.cgi
+ install -D -m755 bin/java-rmi.cgi "${pkgdir}${_jvmdir}/bin/java-rmi.cgi"
+
+ # Install desktop files.
+ install -d -m755 "${pkgdir}/usr/share/applications"
+ install -m644 "${srcdir}/icedtea-${_icedtea_ver}/jconsole.desktop" "${pkgdir}/usr/share/applications"
# Set some variables
- install -m755 -d ${pkgdir}/etc/profile.d/
- install -m755 ${srcdir}/${pkgname}.profile ${pkgdir}/etc/profile.d/jdk.sh
- install -m755 ${srcdir}/${pkgname}.profile.csh ${pkgdir}/etc/profile.d/jdk.csh
+ install -d -m755 "${pkgdir}/etc/profile.d/"
+ install -m755 "${srcdir}/${pkgname}.profile" "${pkgdir}/etc/profile.d/jdk.sh"
+ install -m755 "${srcdir}/${pkgname}.profile.csh" "${pkgdir}/etc/profile.d/jdk.csh"
# Temporarily fixing FS#35141
- chmod go+r ${pkgdir}${_jvmdir}/lib/sa-jdi.jar
+ chmod go+r "${pkgdir}${_jvmdir}/lib/sa-jdi.jar"
# link license
- install -m755 -d ${pkgdir}/usr/share/licenses
+ install -d -m755 "${pkgdir}/usr/share/licenses"
ln -sf /usr/share/licenses/${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}"
}
package_openjdk7-src() {
- pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs - sources"
+ pkgdesc='OpenJDK Java 7 sources'
replaces=('openjdk6-src')
-
- install -D ${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image/src.zip \
- ${pkgdir}${_jvmdir}/src.zip
+
+ install -D "${srcdir}/${_imgdir}/src.zip" "${pkgdir}${_jvmdir}/src.zip"
}
package_openjdk7-doc() {
- pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs - documentation"
+ pkgdesc='OpenJDK Java 7 documentation'
- install -m755 -d ${pkgdir}/usr/share/doc/openjdk7-doc
- for i in ${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/docs/*; do
- cp -a $i ${pkgdir}/usr/share/doc/openjdk7-doc/
+ install -d -m755 "${pkgdir}/usr/share/doc/openjdk7-doc"
+ for i in "${srcdir}"/icedtea-${_icedtea_ver}/openjdk.build/docs/*; do
+ cp -a $i "${pkgdir}/usr/share/doc/openjdk7-doc/"
done
}
diff --git a/extra/java7-openjdk/giflib_5.1.diff b/extra/java7-openjdk/giflib_5.1.diff
new file mode 100644
index 000000000..a9361573c
--- /dev/null
+++ b/extra/java7-openjdk/giflib_5.1.diff
@@ -0,0 +1,14 @@
+--- openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c.orig 2014-05-27 22:17:19.766866065 +0200
++++ openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c 2014-05-27 22:16:35.452894426 +0200
+@@ -310,7 +310,11 @@
+ free(pBitmapBits);
+ free(pOldBitmapBits);
+
++#if GIFLIB_MAJOR >= 5
++ DGifCloseFile(gif, NULL);
++#else
+ DGifCloseFile(gif);
++#endif
+
+ return 1;
+ }
diff --git a/extra/kdemultimedia-kmix/PKGBUILD b/extra/kdemultimedia-kmix/PKGBUILD
index 9d20fbd9a..c415bbcf1 100644
--- a/extra/kdemultimedia-kmix/PKGBUILD
+++ b/extra/kdemultimedia-kmix/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 214912 2014-06-10 17:55:11Z svenstaro $
+# $Id: PKGBUILD 215125 2014-06-14 15:26:06Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdemultimedia-kmix
pkgver=4.13.2
-pkgrel=1
+pkgrel=2
pkgdesc="KDE volume control program"
url='http://kde.org/applications/multimedia/kmix/'
arch=('i686' 'x86_64')
@@ -12,12 +12,20 @@ groups=('kde' 'kdemultimedia')
depends=('kdebase-runtime')
makedepends=('cmake' 'automoc4')
install="${pkgname}.install"
-source=("http://download.kde.org/stable/${pkgver}/src/kmix-${pkgver}.tar.xz")
-sha1sums=('03f676426a9afbc9b0395239d8950319e786a019')
+source=("http://download.kde.org/stable/${pkgver}/src/kmix-${pkgver}.tar.xz"
+ 'use-qdbus-qt4.patch')
+sha1sums=('03f676426a9afbc9b0395239d8950319e786a019'
+ 'f89a076c5a29c51d213864e27d07baf5400ece03')
-build() {
- cd "${srcdir}"
+prepare() {
mkdir build
+
+ cd kmix-${pkgver}
+ # FS#40786
+ patch -p1 -i "${srcdir}"/use-qdbus-qt4.patch
+}
+
+build() {
cd build
cmake ../kmix-${pkgver} \
-DCMAKE_BUILD_TYPE=Release \
@@ -27,6 +35,6 @@ build() {
}
package() {
- cd "${srcdir}"/build
+ cd build
make DESTDIR="${pkgdir}" install
}
diff --git a/extra/kdemultimedia-kmix/use-qdbus-qt4.patch b/extra/kdemultimedia-kmix/use-qdbus-qt4.patch
new file mode 100644
index 000000000..462a25cf6
--- /dev/null
+++ b/extra/kdemultimedia-kmix/use-qdbus-qt4.patch
@@ -0,0 +1,59 @@
+--- kmix-4.13.2/apps/kmixremote~ 2014-06-14 15:17:06.856474667 +0000
++++ kmix-4.13.2/apps/kmixremote 2014-06-14 15:17:44.759594763 +0000
+@@ -28,7 +28,7 @@
+ # Prints the mixer DBUS ID's on the console. leaving out the "/Mixers/" prefix
+ function listMixers
+ {
+- qdbus org.kde.kmix /Mixers org.freedesktop.DBus.Properties.Get org.kde.KMix.MixSet mixers | cut -f3 -d/
++ qdbus-qt4 org.kde.kmix /Mixers org.freedesktop.DBus.Properties.Get org.kde.KMix.MixSet mixers | cut -f3 -d/
+ errorCode=$?
+ if test $errorCode != 0; then
+ echo "Error $errorCode listing mixers. KMix is not running."
+@@ -38,7 +38,7 @@
+ # Prints the mixer control DBUS ID's of the given mixer on the console. leaving out the "/Mixers/" prefix
+ function listControls
+ {
+- qdbus org.kde.kmix $1 org.freedesktop.DBus.Properties.Get org.kde.KMix.Mixer controls | cut -f4 -d/
++ qdbus-qt4 org.kde.kmix $1 org.freedesktop.DBus.Properties.Get org.kde.KMix.Mixer controls | cut -f4 -d/
+ errorCode=$?
+ if test $errorCode != 0; then
+ echo "Error $errorCode listing controls. KMix is not running."
+@@ -47,8 +47,8 @@
+
+ command=""
+
+-if ! type qdbus >/dev/null 2>&1 ; then
+- exit_with_error "$0 requires qdbus, but it cannot be found. Please install or check \$PATH"
++if ! type qdbus-qt4 >/dev/null 2>&1 ; then
++ exit_with_error "$0 requires qdbus-qt4, but it cannot be found. Please install or check \$PATH"
+ fi
+
+ # Read args
+@@ -58,8 +58,8 @@
+ if test -z "$arg"; then
+ break
+ elif test "x--master" = "x$arg"; then
+- mixer=`qdbus org.kde.kmix /Mixers org.kde.KMix.MixSet.currentMasterMixer`
+- control=`qdbus org.kde.kmix /Mixers org.kde.KMix.MixSet.currentMasterControl`
++ mixer=`qdbus-qt4 org.kde.kmix /Mixers org.kde.KMix.MixSet.currentMasterMixer`
++ control=`qdbus-qt4 org.kde.kmix /Mixers org.kde.KMix.MixSet.currentMasterControl`
+ elif test "x--help" = "x$arg" -o "x-h" = "x$arg"; then
+ usage
+ exit 0
+@@ -113,13 +113,13 @@
+ # --- EXECUTE PHASE --------------------------------------------------------------------------------------------------
+ if test "xget" = "x$command"; then
+ # GET
+- qdbus org.kde.kmix $targetControl org.freedesktop.DBus.Properties.Get org.kde.KMix.Control volume
++ qdbus-qt4 org.kde.kmix $targetControl org.freedesktop.DBus.Properties.Get org.kde.KMix.Control volume
+ elif test "xset" = "x$command"; then
+ # SET
+- qdbus org.kde.kmix $targetControl org.freedesktop.DBus.Properties.Set org.kde.KMix.Control volume $genericArg
++ qdbus-qt4 org.kde.kmix $targetControl org.freedesktop.DBus.Properties.Set org.kde.KMix.Control volume $genericArg
+ elif test "xmute" = "x$command"; then
+ # MUTE
+- qdbus org.kde.kmix $targetControl org.freedesktop.DBus.Properties.Set org.kde.KMix.Control mute $genericArg
++ qdbus-qt4 org.kde.kmix $targetControl org.freedesktop.DBus.Properties.Set org.kde.KMix.Control mute $genericArg
+ else
+ exit_with_error "No such command '$command'"
+ fi
diff --git a/extra/khtml/PKGBUILD b/extra/khtml/PKGBUILD
index 1e05987e5..ae352247e 100644
--- a/extra/khtml/PKGBUILD
+++ b/extra/khtml/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 214178 2014-06-04 09:11:37Z andrea $
+# $Id: PKGBUILD 215165 2014-06-14 19:17:17Z andyrtr $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=khtml
pkgver=4.100.0
-pkgrel=1
+pkgrel=2
pkgdesc='KHtml'
arch=('i686' 'x86_64')
url='https://projects.kde.org/projects/frameworks/khtml'
@@ -16,6 +16,8 @@ md5sums=('c9b04036e1b1b3ac9f253962386c6b0e')
prepare() {
mkdir -p build
+ #fix build with giflib 5.1.0 - taken from BLFS
+ sed -i "/DGifCloseFile/s:file:&, NULL:g" khtml-$pkgver/src/imload/decoders/gifloader.cpp
}
build() {
diff --git a/extra/libcdr/PKGBUILD b/extra/libcdr/PKGBUILD
index d5f74de72..6f4234bdf 100644
--- a/extra/libcdr/PKGBUILD
+++ b/extra/libcdr/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 211320 2014-04-18 17:28:23Z andyrtr $
+# $Id: PKGBUILD 215146 2014-06-14 19:16:52Z andyrtr $
# Maintainer: AndyRTR <andyrtr@archlinux.org>
# Contributor: megadriver <megadriver at gmx dot com>
# Contributor: Luca Bennati <lucak3 AT gmail DOT com>
pkgname=libcdr
-pkgver=0.0.16
-pkgrel=2
+pkgver=0.1.0
+pkgrel=1
pkgdesc="CorelDraw file format importer library for LibreOffice"
arch=('i686' 'x86_64')
url="http://www.freedesktop.org/wiki/Software/libcdr/"
license=('GPL2' 'LGPL2.1' 'MPL')
-depends=('libwpd' 'lcms2' 'icu')
-makedepends=('libwpg' 'boost')
+depends=('libwpd' 'lcms2' 'icu' 'librevenge')
+makedepends=('libwpg' 'boost' 'doxygen')
source=(http://dev-www.libreoffice.org/src/$pkgname-$pkgver.tar.xz)
-md5sums=('b494bbaf48a0d5f90a525e6ea37bc096')
+md5sums=('71f1f54a418694b6e46c3e9633899c12')
build() {
cd $pkgname-$pkgver
diff --git a/extra/libetonyek/PKGBUILD b/extra/libetonyek/PKGBUILD
index e56dc4a5b..a5d3dd44c 100644
--- a/extra/libetonyek/PKGBUILD
+++ b/extra/libetonyek/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 211265 2014-04-18 12:27:05Z andyrtr $
+# $Id: PKGBUILD 215147 2014-06-14 19:16:53Z andyrtr $
# Maintainer: AndyRTR <andyrtr@archlinux.org>
# Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
# Contributor: Yue
pkgname=libetonyek
-pkgver=0.0.4
+pkgver=0.1.1
pkgrel=1
pkgdesc='Library and a set of tools for reading and converting Apple Keynote presentations'
arch=('i686' 'x86_64')
url='http://www.freedesktop.org/wiki/Software/libetonyek/'
license=('MPL')
-depends=('libxml2' 'gperf' 'zlib' 'libwpd' 'boost-libs')
-makedepends=('boost' 'cppunit')
+depends=('libxml2' 'zlib' 'libwpd' 'boost-libs' 'librevenge')
+makedepends=('boost' 'cppunit' 'gperf' 'doxygen')
source=(http://dev-www.libreoffice.org/src/$pkgname-$pkgver.tar.xz)
-md5sums=('9d7c8e52e2d20e1fa270c75fd78f3417')
+md5sums=('7adbc34bb4a33e26688c862e154a0d29')
build() {
cd $pkgname-$pkgver
diff --git a/extra/libgadu/PKGBUILD b/extra/libgadu/PKGBUILD
index cc426a5c0..ca9696c5f 100644
--- a/extra/libgadu/PKGBUILD
+++ b/extra/libgadu/PKGBUILD
@@ -1,33 +1,27 @@
-# $Id: PKGBUILD 213856 2014-05-30 15:47:45Z andrea $
+# $Id: PKGBUILD 215223 2014-06-16 21:36:27Z andrea $
# Maintainer:
# Contributor: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Mateusz Herych <heniekk@gmail.com>
pkgname=libgadu
-pkgver=1.11.4
+pkgver=1.12.0
pkgrel=1
pkgdesc="This library implements the client side of the Gadu-Gadu protocol"
arch=('i686' 'x86_64')
url="http://libgadu.net/"
license=('LGPL2.1')
-depends=('openssl' 'zlib')
+depends=('gnutls' 'protobuf-c')
source=("http://github.com/wojtekka/libgadu/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('feef622126e21601798c7e4497890ca3')
+md5sums=('e4569a0ed26136c4634fa8c4013910e3')
build() {
cd ${pkgname}-${pkgver}
./configure --prefix=/usr \
- --disable-static \
- --enable-shared \
- --with-pthread
+ --disable-tests \
+ --disable-static
make
}
-check() {
- cd ${pkgname}-${pkgver}
- make check
-}
-
package() {
cd ${pkgname}-${pkgver}
make DESTDIR="${pkgdir}" install
diff --git a/extra/libgdiplus/PKGBUILD b/extra/libgdiplus/PKGBUILD
index 4ff97ce93..c97d63999 100644
--- a/extra/libgdiplus/PKGBUILD
+++ b/extra/libgdiplus/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 211855 2014-04-28 10:32:20Z jgc $
+# $Id: PKGBUILD 215166 2014-06-14 19:17:18Z andyrtr $
# Maintainer: Daniel Isenmann <daniel@archlinux.org>
pkgname=libgdiplus
pkgver=2.10.9
-pkgrel=4
+pkgrel=5
pkgdesc="An Open Source Implementation of the GDI+ API"
arch=(i686 x86_64)
license=('MPL' 'LGPL')
@@ -13,12 +13,14 @@ source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}
libpng15.patch
libgdiplus0-giflib5.patch
libgdiplus-2.10.9-gold.patch
- libgdiplus-2.10.9-freetype25.patch)
+ libgdiplus-2.10.9-freetype25.patch
+ libgdiplus-2.10.9-giflib-5.1.0.patch)
md5sums=('b4615c14584b5d73cbb9757c28887654'
'a2d143676bbaceeb88b4c34069e93986'
'ad97558c721106eea03c7808b501814b'
'95fb92750c131ce9287419c3ac5fcb76'
- '6ee484dde02ea89aded1287c0a8d4bad')
+ '6ee484dde02ea89aded1287c0a8d4bad'
+ '8c0a975b12a011b21e4216c44be1416e')
prepare() {
cd ${pkgname}-${pkgver}
@@ -26,6 +28,7 @@ prepare() {
patch -Np1 -i ../libgdiplus0-giflib5.patch
patch -Np1 -i ../libgdiplus-2.10.9-gold.patch
patch -Np1 -i ../libgdiplus-2.10.9-freetype25.patch
+ patch -Np1 -i ../libgdiplus-2.10.9-giflib-5.1.0.patch
sed -i -e 's/-L\${libjpeg_prefix}\/lib -ljpeg/-ljpeg/' configure
}
diff --git a/extra/libgdiplus/libgdiplus-2.10.9-giflib-5.1.0.patch b/extra/libgdiplus/libgdiplus-2.10.9-giflib-5.1.0.patch
new file mode 100644
index 000000000..39d3c7a06
--- /dev/null
+++ b/extra/libgdiplus/libgdiplus-2.10.9-giflib-5.1.0.patch
@@ -0,0 +1,30 @@
+diff -rupN a/src/gifcodec.c b/src/gifcodec.c
+--- a/src/gifcodec.c 2011-12-02 18:23:12.000000000 +0100
++++ b/src/gifcodec.c 2014-06-01 13:20:17.027203704 +0200
+@@ -581,7 +581,7 @@ gdip_load_gif_image (void *stream, GpIma
+ }
+
+ FreeExtensionMono(&global_extensions);
+- DGifCloseFile (gif);
++ DGifCloseFile (gif, NULL);
+
+ *image = result;
+ return Ok;
+@@ -597,7 +597,7 @@ error:
+
+ if (gif != NULL) {
+ FreeExtensionMono (&global_extensions);
+- DGifCloseFile (gif);
++ DGifCloseFile (gif, NULL);
+ }
+
+ *image = NULL;
+@@ -923,7 +923,7 @@ gdip_save_gif_image (void *stream, GpIma
+ }
+ }
+
+- EGifCloseFile (fp);
++ EGifCloseFile (fp, NULL);
+
+ return Ok;
+
diff --git a/extra/libmspub/PKGBUILD b/extra/libmspub/PKGBUILD
index caf12ac46..e9fbf2fd9 100644
--- a/extra/libmspub/PKGBUILD
+++ b/extra/libmspub/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 211321 2014-04-18 17:28:24Z andyrtr $
+# $Id: PKGBUILD 215148 2014-06-14 19:16:54Z andyrtr $
# Maintainer: AndyRTR <andyrtr@archlinux.org>
# Contributor: Simone Sclavi 'Ito' <darkhado@gmail.com>
pkgname=libmspub
-pkgver=0.0.6
-pkgrel=2
+pkgver=0.1.0
+pkgrel=1
pkgdesc="Microsoft Publisher file format parser library (latest snapshost)"
arch=('i686' 'x86_64')
url="http://www.freedesktop.org/wiki/Software/libmspub/"
license=('GPL2' 'LGPL2.1' 'MPL')
-depends=('libwpd' 'icu')
+depends=('libwpd' 'icu' 'librevenge')
makedepends=('libwpg' 'boost' 'doxygen')
source=(http://dev-www.libreoffice.org/src/${pkgname}-${pkgver}.tar.xz)
-md5sums=('96a1f176abd683c6b1b02a08847c0616')
+md5sums=('d6d9239a7bb95df55300334afd99ceed')
build() {
cd ${pkgname}-${pkgver}
diff --git a/extra/libodfgen/PKGBUILD b/extra/libodfgen/PKGBUILD
index f826f4be8..86bccacff 100644
--- a/extra/libodfgen/PKGBUILD
+++ b/extra/libodfgen/PKGBUILD
@@ -1,18 +1,19 @@
-# $Id$
+# $Id: PKGBUILD 215149 2014-06-14 19:16:55Z andyrtr $
+# Maintainer: AndyRTR <andyrtr@archlinux.org>
# Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
# Contributor: Yue
pkgname=libodfgen
-pkgver=0.0.4
+pkgver=0.1.1
pkgrel=1
pkgdesc='Library for generating documents in Open Document Format'
arch=('i686' 'x86_64')
url='http://sf.net/p/libwpd/libodfgen/'
license=('MPL')
-depends=('libwpd' 'zlib')
-makedepends=('boost' 'libwpg' 'libetonyek')
+depends=('libwpd' 'zlib' 'librevenge')
+makedepends=('boost' 'libwpg' 'libetonyek' 'doxygen')
source=(http://dev-www.libreoffice.org/src/$pkgname-$pkgver.tar.bz2)
-md5sums=('e5483d1f0b71e64c367c1194b54b0f53')
+md5sums=('c22c83c17cda0754382ada4e116594b7')
build() {
cd $pkgname-$pkgver
diff --git a/extra/libreoffice-fresh/PKGBUILD b/extra/libreoffice-fresh/PKGBUILD
index 7319ff8bf..bf25df390 100644
--- a/extra/libreoffice-fresh/PKGBUILD
+++ b/extra/libreoffice-fresh/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 213923 2014-05-31 15:05:40Z bpiotrowski $
+# $Id: PKGBUILD 215151 2014-06-14 19:16:58Z andyrtr $
# Maintainer: AndyRTR <andyrtr@archlinux.org>
# Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
pkgbase=libreoffice-fresh
pkgname=('libreoffice-fresh-sdk' 'libreoffice-fresh')
-_LOver=4.3.0.0.beta1
+_LOver=4.3.0.0.beta2-buildfix1
pkgver=4.3.0
-pkgrel=0.7
+pkgrel=0.8
arch=('i686' 'x86_64')
license=('LGPL3')
url="http://www.libreoffice.org/"
@@ -20,7 +20,8 @@ makedepends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python>=3.4' 'libwpd>=0.9.2' 'lib
'gperf' 'kdelibs' 'gconf' 'gtk3' 'cppunit' 'beanshell2' 'vigra' 'clucene'
'junit' 'libmythes' 'libwpg' 'mesa' 'java-environment' 'postgresql-libs'
'bluez-libs' 'harfbuzz-icu' 'gdb' 'doxygen' 'libatomic_ops' 'mdds' 'glew'
- 'apr' 'serf' 'chrpath' 'ttf-liberation')
+ 'apr' 'serf' 'chrpath' 'ttf-liberation'
+ 'valgrind')
#_mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}"
_mirror="http://dev-builds.libreoffice.org/pre-releases/src"
@@ -54,15 +55,15 @@ source=(${_mirror}/libreoffice{,-help,-translations}-${_LOver}.tar.xz{,.asc}
${_additional_source_url}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
${_additional_source_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll
- ${_additional_source_url}/libmwaw-0.2.0.tar.bz2
- ${_additional_source_url}/libfreehand-0.0.0.tar.bz2
+ ${_additional_source_url}/libmwaw-0.3.1.tar.bz2
+ ${_additional_source_url}/libfreehand-0.1.0.tar.bz2
${_additional_source_url}/Firebird-2.5.2.26540-0.tar.bz2
- ${_additional_source_url}/libe-book-0.0.3.tar.bz2
- ${_additional_source_url}/libabw-0.0.2.tar.bz2
- ${_additional_source_url}/language-subtag-registry-2014-03-27.tar.bz2
+ ${_additional_source_url}/libe-book-0.1.1.tar.bz2
+ ${_additional_source_url}/libabw-0.1.0.tar.bz2
+ ${_additional_source_url}/language-subtag-registry-2014-04-10.tar.bz2
${_additional_source_url}/8ac8ae9829c4fefd1ae9f715f95d4e0b-libgltf.tar.gz
${_additional_source_url}/CoinMP-1.7.6.tgz
- # do not use system glm, LibO patxhes it!
+ # do not use system glm, LibO patches it!
${_additional_source_url}/bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip
${_additional_source_url}/collada2gltf-master-6258611a6a.tar.bz2
${_additional_source_url}/OpenCOLLADA-master-6509aa13af.tar.bz2
@@ -97,18 +98,66 @@ noextract=(d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2
36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2
0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
- libmwaw-0.2.0.tar.bz2
- libfreehand-0.0.0.tar.bz2
+ libmwaw-0.3.1.tar.bz2
+ libfreehand-0.1.0.tar.bz2
Firebird-2.5.2.26540-0.tar.bz2
- libe-book-0.0.3.tar.bz2
- libabw-0.0.2.tar.bz2
- language-subtag-registry-2014-03-27.tar.bz2
+ libe-book-0.1.1.tar.bz2
+ libabw-0.1.0.tar.bz2
+ language-subtag-registry-2014-04-10.tar.bz2
8ac8ae9829c4fefd1ae9f715f95d4e0b-libgltf.tar.gz
CoinMP-1.7.6.tgz
bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip
collada2gltf-master-6258611a6a.tar.bz2
OpenCOLLADA-master-6509aa13af.tar.bz2
510c3f8504bfb8cc8c8fc5d0fac74055-libgltf.tar.bz2)
+md5sums=('d4dc0ed333569336519dfbddcbb1b329'
+ 'SKIP'
+ 'b009798fa57feea21924cdc6a4a6212a'
+ 'SKIP'
+ '4c502724049b9dd50eaee81ec7b1896b'
+ 'SKIP'
+ 'd6eef4b4cacb2183f2bf265a5a03a354'
+ '1f24ab1d39f4a51faf22244c94a6203f'
+ '35c94d2df8893241173de1d16b6034c0'
+ '798b2ffdc8bcfe7bca2cf92b62caf685'
+ 'a7983f859eafb2677d7ff386a023bc40'
+ 'e8e197d628436490886d17cffa108fe3'
+ '8ab049135b2d15313da5d9f0656894a1'
+ '2c9b0f83ed5890af02c0df1c1776f39b'
+ '048751f3271906db5126ab76870444c4'
+ 'eeb2c7ddf0d302fba4bfc6e97eac9624'
+ '39bb3fcea1514f1369fcfc87542390fd'
+ '3404ab6b1792ae5f16bbd603bd1e1d03'
+ '97b2d4dba862397f446b217e2b623e71'
+ 'f94d9870737518e3b597f9265f4e9803'
+ '8ce2fcd72becf06c41f7201d15373ed9'
+ 'd8bd5eed178db6e2b18eeed243f85aa8'
+ '3bdf40c0d199af31923e900d082ca2dd'
+ 'ace6ab49184e329db254e454a010f56d'
+ 'db60e4fde8dd6d6807523deb71ee34dc'
+ 'ba2930200c9f019c2d93a8c88c651a0f'
+ 'ae330b9493bd4503ac390106ff6060d7'
+ '22f8a85daf4a012180322e1f52a7563b'
+ '7681383be6ce489d84c1c74f4e7f9643'
+ '36271d3fa0d9dec1632029b6d7aac925'
+ '0168229624cfac409e766913506961a8'
+ '17410483b5b5f267aa18b7e00b65e6e0'
+ '185d60944ea767075d27247c3162b3bc'
+ '6f1ac4a0e24131c422e1e91f07718fb6'
+ '5f029fef73e42a2c2ae4524a7513f97d'
+ '21154d2004e025c8a3666625b0357bb5'
+ 'c25a881d21abc5b4da19205db513cc22'
+ '9317e967c8fa8ff50e049744c4b33c87'
+ '49c94710f7858b1969d74ff72e6aac84'
+ '8ac8ae9829c4fefd1ae9f715f95d4e0b'
+ '1cce53bf4b40ae29790d2c5c9f8b1129'
+ 'bae83fa5dc7f081768daace6e199adc3'
+ 'c8a8be5829ceffacfe1d68d078f5c442'
+ '4ca8a6ef0afeefc864e9ef21b9f14bd6'
+ '510c3f8504bfb8cc8c8fc5d0fac74055'
+ '07d2bf5ad839a394cca008b3ec6e7bb1'
+ '4195735a80876ae812fca5736b50192a'
+ 'e7e4b3e70e99e5cba8f8dfcacf3b0d87')
prepare() {
cd libreoffice-$_LOver
@@ -232,6 +281,8 @@ build() {
touch src.downloaded
make
+ # use this if i686 fails
+ #make || make CppunitTest_sw_ooxmlsdrexport VALGRIND=memcheck
mkdir ${srcdir}/fakeinstall
make DESTDIR=${srcdir}/fakeinstall distro-pack-install
@@ -353,52 +404,3 @@ package_libreoffice-fresh() {
chrpath -d ${pkgdir}/usr/lib/libreoffice/program/libCgl.so.1
chrpath -d ${pkgdir}/usr/lib/libreoffice/program/libClp.so.1
}
-
-md5sums=('c98ff0989252558dc21b71ec5e32049f'
- 'SKIP'
- '5b3b55d75a9659dace93900c3e88d6a9'
- 'SKIP'
- '507657907ee417631287c79deb44cfc8'
- 'SKIP'
- 'd6eef4b4cacb2183f2bf265a5a03a354'
- '1f24ab1d39f4a51faf22244c94a6203f'
- '35c94d2df8893241173de1d16b6034c0'
- '798b2ffdc8bcfe7bca2cf92b62caf685'
- 'a7983f859eafb2677d7ff386a023bc40'
- 'e8e197d628436490886d17cffa108fe3'
- '8ab049135b2d15313da5d9f0656894a1'
- '2c9b0f83ed5890af02c0df1c1776f39b'
- '048751f3271906db5126ab76870444c4'
- 'eeb2c7ddf0d302fba4bfc6e97eac9624'
- '39bb3fcea1514f1369fcfc87542390fd'
- '3404ab6b1792ae5f16bbd603bd1e1d03'
- '97b2d4dba862397f446b217e2b623e71'
- 'f94d9870737518e3b597f9265f4e9803'
- '8ce2fcd72becf06c41f7201d15373ed9'
- 'd8bd5eed178db6e2b18eeed243f85aa8'
- '3bdf40c0d199af31923e900d082ca2dd'
- 'ace6ab49184e329db254e454a010f56d'
- 'db60e4fde8dd6d6807523deb71ee34dc'
- 'ba2930200c9f019c2d93a8c88c651a0f'
- 'ae330b9493bd4503ac390106ff6060d7'
- '22f8a85daf4a012180322e1f52a7563b'
- '7681383be6ce489d84c1c74f4e7f9643'
- '36271d3fa0d9dec1632029b6d7aac925'
- '0168229624cfac409e766913506961a8'
- '17410483b5b5f267aa18b7e00b65e6e0'
- '185d60944ea767075d27247c3162b3bc'
- 'd794625f156a9fb1c53b3f8a8aa13b5e'
- '496dd00028afcc19f896b01394769043'
- '21154d2004e025c8a3666625b0357bb5'
- '2f1ceaf2ac8752ed278e175447d9b978'
- '40fa48e03b1e28ae0325cc34b35bc46d'
- '504af523f5d1a5590bbeb6a4b55e8a97'
- '8ac8ae9829c4fefd1ae9f715f95d4e0b'
- '1cce53bf4b40ae29790d2c5c9f8b1129'
- 'bae83fa5dc7f081768daace6e199adc3'
- 'c8a8be5829ceffacfe1d68d078f5c442'
- '4ca8a6ef0afeefc864e9ef21b9f14bd6'
- '510c3f8504bfb8cc8c8fc5d0fac74055'
- '07d2bf5ad839a394cca008b3ec6e7bb1'
- '4195735a80876ae812fca5736b50192a'
- 'e7e4b3e70e99e5cba8f8dfcacf3b0d87')
diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD
index 46901fd8a..c17ab4573 100644
--- a/extra/libreoffice/PKGBUILD
+++ b/extra/libreoffice/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 212157 2014-05-09 14:51:00Z andyrtr $
+# $Id: PKGBUILD 215150 2014-06-14 19:16:57Z andyrtr $
# Maintainer: AndyRTR <andyrtr@archlinux.org>
# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
@@ -20,23 +20,22 @@ pkgname=('libreoffice-common'
'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built)
_LOver=4.2.4.2
pkgver=4.2.4
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
license=('LGPL3')
url="http://www.libreoffice.org/"
makedepends=( # makedepends
'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'apache-ant'
'gperf' 'kdelibs' 'gconf' 'gtk3' 'cppunit' 'beanshell2' 'vigra'
- 'clucene' 'junit' 'libmythes' 'libwpg' 'mesa' 'clucene'
+ 'clucene' 'junit' 'libmythes' 'mesa' 'clucene'
'java-environment' 'postgresql-libs' 'bluez-libs' 'harfbuzz-icu'
'gdb' 'doxygen' 'libatomic_ops' 'mdds'
# the runtime dependencies
- "curl>=7.20.0" "hunspell>=1.2.8" "python>=3.4" 'libwpd>=0.9.2'
- 'libwps' 'libxaw' "neon>=0.28.6" 'pango' 'nspr' 'libjpeg' 'libxrandr'
+ "curl>=7.20.0" "hunspell>=1.2.8" "python>=3.4"
+ 'libxaw' "neon>=0.28.6" 'pango' 'nspr' 'libjpeg' 'libxrandr'
'libgl' 'dbus-glib' 'libxslt' 'librsvg' 'redland' 'icu'
'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' 'graphite'
- 'lcms2' 'poppler>=0.24.0' 'libvisio' 'libetonyek' 'libodfgen'
- 'libcdr' 'libmspub'
+ 'lcms2' 'poppler>=0.24.0'
'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info'
'gtk2' 'orbit2' 'translate-toolkit' 'xdg-utils' #'telepathy-glib'
'gst-plugins-base-libs' 'glu' 'ttf-liberation' # to satisfy regression tests
@@ -82,6 +81,14 @@ source=(${_mirror}/${pkgbase}{,-help,-translations}-${_LOver}.tar.xz{,.asc}
${_additional_source_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll
${_additional_source_url}/libmwaw-0.2.0.tar.bz2
+ ${_additional_source_url}/libcdr-0.0.15.tar.bz2
+ ${_additional_source_url}/libetonyek-0.0.4.tar.bz2
+ ${_additional_source_url}/libmspub-0.0.6.tar.bz2
+ ${_additional_source_url}/libodfgen-0.0.4.tar.bz2
+ ${_additional_source_url}/libvisio-0.0.31.tar.bz2
+ ${_additional_source_url}/a3dcac551fae5ebbec16e844810828c4-libwpd-0.9.9.tar.bz2
+ ${_additional_source_url}/b85436266b2ac91d351ab5684b181151-libwpg-0.2.2.tar.bz2
+ ${_additional_source_url}/46eb0e7f213ad61bd5dee0c494132cb0-libwps-0.2.9.tar.bz2
${_additional_source_url}/libfreehand-0.0.0.tar.bz2
${_additional_source_url}/Firebird-2.5.2.26540-0.tar.bz2
${_additional_source_url}/libe-book-0.0.3.tar.bz2
@@ -120,6 +127,14 @@ noextract=(15cb8c0803064faef0c4ddf5bc5ca279-boost_1_54_0.tar.bz2
0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
libmwaw-0.2.0.tar.bz2
+ libcdr-0.0.15.tar.bz2
+ libetonyek-0.0.4.tar.bz2
+ libmspub-0.0.6.tar.bz2
+ libodfgen-0.0.4.tar.bz2
+ libvisio-0.0.31.tar.bz2
+ a3dcac551fae5ebbec16e844810828c4-libwpd-0.9.9.tar.bz2
+ b85436266b2ac91d351ab5684b181151-libwpg-0.2.2.tar.bz2
+ 46eb0e7f213ad61bd5dee0c494132cb0-libwps-0.2.9.tar.bz2
libfreehand-0.0.0.tar.bz2
Firebird-2.5.2.26540-0.tar.bz2
libe-book-0.0.3.tar.bz2
@@ -159,6 +174,14 @@ md5sums=('698a482f0cacd8b5eba9865fdd8a5403'
'17410483b5b5f267aa18b7e00b65e6e0'
'185d60944ea767075d27247c3162b3bc'
'd794625f156a9fb1c53b3f8a8aa13b5e'
+ 'fbcd8619fc6646f41d527c1329102998'
+ '3c50bc60394d1f2675fbf9bd22581363'
+ '1120705cd0f0d9bd5506360bf57b6c2e'
+ 'e5483d1f0b71e64c367c1194b54b0f53'
+ '82628333418f101a20cd21f980cf9f40'
+ 'a3dcac551fae5ebbec16e844810828c4'
+ 'b85436266b2ac91d351ab5684b181151'
+ '46eb0e7f213ad61bd5dee0c494132cb0'
'496dd00028afcc19f896b01394769043'
'21154d2004e025c8a3666625b0357bb5'
'2f1ceaf2ac8752ed278e175447d9b978'
@@ -256,20 +279,20 @@ build() {
--enable-ext-nlpsolver \
--without-fonts\
--without-afms\
- --with-system-libcdr \
+ --without-system-libcdr \
--with-system-mdds\
--without-myspell-dicts \
- --with-system-libvisio \
+ --without-system-libvisio \
--without-system-libcmis \
- --with-system-libmspub \
+ --without-system-libmspub \
--without-system-libexttextcat \
--without-system-orcus \
--without-system-liblangtag \
--without-system-jfreereport \
--without-system-apache-commons \
- --with-system-libodfgen \
+ --without-system-libodfgen \
--without-system-libmwaw \
- --with-system-libetonyek \
+ --without-system-libetonyek \
--without-system-libfreehand \
--without-system-firebird \
--with-system-libatomic-ops \
@@ -282,8 +305,9 @@ build() {
--with-system-beanshell \
--with-system-cppunit\
--with-system-graphite\
- --with-system-libwpg \
- --with-system-libwps \
+ --without-system-libwpd \
+ --without-system-libwpg \
+ --without-system-libwps \
--with-system-redland\
--without-system-npapi-headers \
--with-ant-home="/usr/share/apache-ant"\
@@ -306,7 +330,7 @@ build() {
touch src.downloaded
#./download
- make
+ make build
# fake installation to create split file lists
mkdir $srcdir/fakeinstall
make DESTDIR=${srcdir}/fakeinstall distro-pack-install # -o build -o check
@@ -323,9 +347,7 @@ package_libreoffice-common() {
depends=('libreoffice-langpack' "hunspell>=1.2.8" "python>=3.3" "neon>=0.28.6"
'dbus-glib' 'librsvg' 'libcups' 'nss' 'libsm' 'redland' 'hyphen'
'graphite' 'clucene' 'lcms2' "poppler>=0.24.0" 'icu'
- #'telepathy-glib' # (calc telepathy-glib libtubeslo.so)
- 'libodfgen' 'libvisio' 'harfbuzz-icu' 'hicolor-icon-theme' 'glu'
- 'libmspub' 'libcdr'
+ 'harfbuzz-icu' 'hicolor-icon-theme' 'glu'
'desktop-file-utils' 'shared-mime-info' 'xdg-utils')
optdepends=('libreoffice-langpack: additional language support'
'java-runtime: adds java support'
@@ -334,7 +356,6 @@ package_libreoffice-common() {
'beanshell2: interactive java -- good for prototyping/macros'
'vigra: C++ computer vision library, usable in Basebmp'
'libmspack: library for Microsoft compression formats for use in FontOOo'
- 'libwpg: library for importing and converting Corel WordPerfect(tm) Graphics images and for MS visual import'
'sane: for scanner access'
'unixodbc: adds ODBC database support'
'gst-plugins-base-libs: + some gstr-plugins to support multimedia content, e.g. in impress'
@@ -528,7 +549,7 @@ package_libreoffice-gnome() {
package_libreoffice-impress() {
pkgdesc="Presentation Application for LibreOffice."
install=libreoffice-impress.install
- depends=('libreoffice-common' 'libetonyek')
+ depends=('libreoffice-common')
groups=('libreoffice')
replaces=('libreoffice')
@@ -649,8 +670,7 @@ package_libreoffice-sdk-doc() {
package_libreoffice-writer() {
pkgdesc="Word Processor Application for LibreOffice."
install=libreoffice-writer.install
- depends=('libreoffice-common' 'libwpd>=0.9.2' 'libwps' 'libxml2')
- optdepends=('libwpg: library for importing and converting Corel WordPerfect(tm) Graphics images')
+ depends=('libreoffice-common' 'libxml2')
groups=('libreoffice')
replaces=('libreoffice')
diff --git a/extra/libreoffice/PKGBUILD.43 b/extra/libreoffice/PKGBUILD.43
deleted file mode 100644
index 0ab501c1a..000000000
--- a/extra/libreoffice/PKGBUILD.43
+++ /dev/null
@@ -1,725 +0,0 @@
-# $Id: PKGBUILD 211574 2014-04-20 12:55:34Z andyrtr $
-# Maintainer: AndyRTR <andyrtr@archlinux.org>
-# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
-
-pkgbase="libreoffice"
-pkgname=('libreoffice-common'
- 'libreoffice-base'
- 'libreoffice-calc'
- 'libreoffice-draw'
- 'libreoffice-gnome'
- 'libreoffice-impress'
- 'libreoffice-kde4'
- 'libreoffice-math'
- 'libreoffice-sdk'
- 'libreoffice-sdk-doc'
- 'libreoffice-writer'
- 'libreoffice-en-US'
- 'libreoffice-postgresql-connector'
- 'libreoffice-extension-wiki-publisher'
- 'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built)
-_LOver=4.3.0.0.alpha1
-pkgver=4.3.0
-pkgrel=0.1
-arch=('i686' 'x86_64')
-license=('LGPL3')
-url="http://www.libreoffice.org/"
-makedepends=( # makedepends
- 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'apache-ant'
- 'gperf' 'kdelibs' 'gconf' 'gtk3' 'cppunit' 'beanshell2' 'vigra'
- 'clucene' 'junit' 'libmythes' 'libwpg' 'mesa' 'clucene'
- 'java-environment' 'postgresql-libs' 'bluez-libs' 'harfbuzz-icu'
- 'gdb' 'doxygen' 'libatomic_ops' 'glew' 'apr' 'serf'
- # the runtime dependencies
- "curl>=7.20.0" "hunspell>=1.2.8" "python>=3.4" 'libwpd>=0.9.2'
- 'libwps' 'libxaw' "neon>=0.28.6" 'pango' 'nspr' 'libjpeg' 'libxrandr'
- 'libgl' 'dbus-glib' 'libxslt' 'librsvg' 'redland' #"icu>=52.1"
- 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' 'graphite'
- 'lcms2' 'poppler>=0.24.0' 'libvisio' 'libetonyek' 'libodfgen'
- 'libcdr' 'libmspub'
- 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info'
- 'gtk2' 'orbit2' 'translate-toolkit' 'xdg-utils' #'telepathy-glib'
- 'gst-plugins-base-libs' 'glu' 'ttf-liberation' # to satisfy regression tests
- 'git')
-# there's only one single static library in libreoffice-sdk,
-# the next build that removes it may lead to trouble if people may use it
-# -rw-r--r-- 1 root root 5,1K 12. Okt 23:34 /usr/lib/libreoffice/sdk/lib/libsalcpprt.a
-# options=('staticlibs')
-
-# http://download.documentfoundation.org/mirrors/all.html
-# http://wiki.documentfoundation.org/Mirrors
-
-#_mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}"
-_mirror="http://dev-builds.libreoffice.org/pre-releases/src"
-_additional_source_url="http://dev-www.libreoffice.org/src"
-_additional_source_url2="http://dev-www.libreoffice.org/extern"
-source=(${_mirror}/${pkgbase}{,-help,-translations}-${_LOver}.tar.xz{,.asc}
- ${_additional_source_url}/d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2
- ${_additional_source_url}/9e96ed4c1d99c0d14ac03c140f9f346c-icu4c-52_1-src.tgz
- ${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
- ${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
- ${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
- ${_additional_source_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
- ${_additional_source_url}/e8e197d628436490886d17cffa108fe3-commons-logging-1.1.3-src.tar.gz
- ${_additional_source_url}/8ab049135b2d15313da5d9f0656894a1-commons-lang3-3.3.1-src.tar.gz
- ${_additional_source_url}/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
- ${_additional_source_url}/048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip
- ${_additional_source_url}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
- ${_additional_source_url}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
- ${_additional_source_url}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
- ${_additional_source_url}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
- ${_additional_source_url}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
- ${_additional_source_url}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
- ${_additional_source_url}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
- ${_additional_source_url}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
- ${_additional_source_url}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
- ${_additional_source_url}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
- ${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
- ${_additional_source_url}/47203e7cade74e5c385aa812f21e7932-mdds_0.10.2.tar.bz2
- ${_additional_source_url}/ae330b9493bd4503ac390106ff6060d7-libexttextcat-3.4.3.tar.bz2
- ${_additional_source_url}/22f8a85daf4a012180322e1f52a7563b-libcmis-0.4.1.tar.gz
- ${_additional_source_url}/7681383be6ce489d84c1c74f4e7f9643-liborcus-0.7.0.tar.bz2
- ${_additional_source_url}/36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2
- ${_additional_source_url}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
- ${_additional_source_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
- ${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll
- ${_additional_source_url}/libmwaw-0.2.0.tar.bz2
- ${_additional_source_url}/libfreehand-0.0.0.tar.bz2
- ${_additional_source_url}/Firebird-2.5.2.26540-0.tar.bz2
- ${_additional_source_url}/libe-book-0.0.3.tar.bz2
- ${_additional_source_url}/libabw-0.0.2.tar.bz2
- ${_additional_source_url}/language-subtag-registry-2014-03-27.tar.bz2
- ${_additional_source_url}/8ac8ae9829c4fefd1ae9f715f95d4e0b-libgltf.tar.gz
- ${_additional_source_url}/CoinMP-1.7.6.tgz
- ${_additional_source_url}/bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip # don't use system glm! LibO patches it!
- make-pyuno-work-with-system-wide-module-install.diff
- libreoffice-common.sh libreoffice-common.csh
- prevent_KDE_Qt_from_interfering_with_the_session_manager.diff)
-noextract=(d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2
- 9e96ed4c1d99c0d14ac03c140f9f346c-icu4c-52_1-src.tgz
- 185d60944ea767075d27247c3162b3bc-unowinreg.dll
- 47203e7cade74e5c385aa812f21e7932-mdds_0.10.2.tar.bz2
- 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
- 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
- ae330b9493bd4503ac390106ff6060d7-libexttextcat-3.4.3.tar.bz2
- 22f8a85daf4a012180322e1f52a7563b-libcmis-0.4.1.tar.gz
- 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
- a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
- e8e197d628436490886d17cffa108fe3-commons-logging-1.1.3-src.tar.gz
- 8ab049135b2d15313da5d9f0656894a1-commons-lang3-3.3.1-src.tar.gz
- 2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
- 048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip
- eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
- 39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
- 3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
- 97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
- f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
- 8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
- d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
- 3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
- ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
- db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
- ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
- 7681383be6ce489d84c1c74f4e7f9643-liborcus-0.7.0.tar.bz2
- 36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2
- 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
- 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
- libmwaw-0.2.0.tar.bz2
- libfreehand-0.0.0.tar.bz2
- Firebird-2.5.2.26540-0.tar.bz2
- libe-book-0.0.3.tar.bz2
- libabw-0.0.2.tar.bz2
- language-subtag-registry-2014-03-27.tar.bz2
- 8ac8ae9829c4fefd1ae9f715f95d4e0b-libgltf.tar.gz
- CoinMP-1.7.6.tgz
- bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip)
-md5sums=('6eab0996f37263f687bfcf511d14d747'
- 'SKIP'
- '848577e3ccdd4c1083824a9b56db8151'
- 'SKIP'
- '7ba0e71d7ed2900caa44c462efc53c49'
- 'SKIP'
- 'd6eef4b4cacb2183f2bf265a5a03a354'
- '9e96ed4c1d99c0d14ac03c140f9f346c'
- '1f24ab1d39f4a51faf22244c94a6203f'
- '35c94d2df8893241173de1d16b6034c0'
- '798b2ffdc8bcfe7bca2cf92b62caf685'
- 'a7983f859eafb2677d7ff386a023bc40'
- 'e8e197d628436490886d17cffa108fe3'
- '8ab049135b2d15313da5d9f0656894a1'
- '2c9b0f83ed5890af02c0df1c1776f39b'
- '048751f3271906db5126ab76870444c4'
- 'eeb2c7ddf0d302fba4bfc6e97eac9624'
- '39bb3fcea1514f1369fcfc87542390fd'
- '3404ab6b1792ae5f16bbd603bd1e1d03'
- '97b2d4dba862397f446b217e2b623e71'
- 'f94d9870737518e3b597f9265f4e9803'
- '8ce2fcd72becf06c41f7201d15373ed9'
- 'd8bd5eed178db6e2b18eeed243f85aa8'
- '3bdf40c0d199af31923e900d082ca2dd'
- 'ace6ab49184e329db254e454a010f56d'
- 'db60e4fde8dd6d6807523deb71ee34dc'
- 'ba2930200c9f019c2d93a8c88c651a0f'
- '47203e7cade74e5c385aa812f21e7932'
- 'ae330b9493bd4503ac390106ff6060d7'
- '22f8a85daf4a012180322e1f52a7563b'
- '7681383be6ce489d84c1c74f4e7f9643'
- '36271d3fa0d9dec1632029b6d7aac925'
- '0168229624cfac409e766913506961a8'
- '17410483b5b5f267aa18b7e00b65e6e0'
- '185d60944ea767075d27247c3162b3bc'
- 'd794625f156a9fb1c53b3f8a8aa13b5e'
- '496dd00028afcc19f896b01394769043'
- '21154d2004e025c8a3666625b0357bb5'
- '2f1ceaf2ac8752ed278e175447d9b978'
- '40fa48e03b1e28ae0325cc34b35bc46d'
- '504af523f5d1a5590bbeb6a4b55e8a97'
- '8ac8ae9829c4fefd1ae9f715f95d4e0b'
- '1cce53bf4b40ae29790d2c5c9f8b1129'
- 'bae83fa5dc7f081768daace6e199adc3'
- '07d2bf5ad839a394cca008b3ec6e7bb1'
- '4195735a80876ae812fca5736b50192a'
- 'e7e4b3e70e99e5cba8f8dfcacf3b0d87'
- 'fa2109339289663cb8ea7cf27cc22f4e')
-
-prepare() {
-
- cd libreoffice-$_LOver
-#return 1
-
- # move external sources into place
- mkdir ${srcdir}/ext_sources && pushd ${srcdir}/ext_sources
- for source in "${noextract[@]}"; do
- ln -s ${srcdir}/$source .
- done
- popd
-
- # unowinreg.dll must be a file not a symlink or the result will become a broken symlink
- # /usr/share/libreoffice/sdk/classes/win/unowinreg.dll -> /build/libreoffice/src/185d60944ea767075d27247c3162b3bc-unowinreg.dll
- rm ${srcdir}/ext_sources/185d60944ea767075d27247c3162b3bc-unowinreg.dll
- cp -f ${srcdir}/185d60944ea767075d27247c3162b3bc-unowinreg.dll ${srcdir}/ext_sources
-
- # fix not upstreamable pyuno paths - patch taken from Debian
- patch -Np1 -i ${srcdir}/make-pyuno-work-with-system-wide-module-install.diff
-
- # fix some startup issues with kde4 integration
- # https://bugs.archlinux.org/task/39819 - https://bugs.freedesktop.org/show_bug.cgi?id=77128
-# patch -Np1 -i ${srcdir}/prevent_KDE_Qt_from_interfering_with_the_session_manager.diff
-
- #use the CFLAGS but remove the LibO overridden ones
- for i in $CFLAGS; do
- case "$i" in
- -O?|-pipe|-Wall|-g|-fexceptions) continue;;
- esac
- ARCH_FLAGS="$ARCH_FLAGS $i"
- done
-
-
- # qt4 fix
- sed -i "s:qmake:qmake-qt4:g" configure.ac
-}
-
-build() {
- cd libreoffice-$_LOver
-
- #autoconf -f
-
- # non-SMP test build
- #export MAKEFLAGS="-j1"
- #./configure --with-build-version="${_LOver} Arch Linux build-${pkgrel}" --with-vendor="Arch Linux" \
-
- ./autogen.sh --with-build-version="${_LOver} Arch Linux build-${pkgrel}" --with-vendor="Arch Linux" \
- --enable-split-app-modules \
- --with-parallelism=${MAKEFLAGS/-j/} \
- --with-external-tar="${srcdir}/ext_sources" \
- --disable-fetch-external \
- --disable-verbose \
- --enable-release-build \
- --prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \
- --libdir=/usr/lib --mandir=/usr/share/man \
- --with-lang="" \
- --enable-crashdump \
- --enable-avahi \
- --enable-dbus \
- --enable-evolution2\
- --enable-gio\
- --disable-gnome-vfs\
- --disable-kde\
- --enable-kde4\
- --enable-gtk3 \
- --enable-gstreamer \
- --disable-gstreamer-0-10 \
- --enable-lockdown\
- --enable-opencl \
- --enable-opengl \
- --enable-openssl \
- --enable-odk\
- --enable-orcus \
- --enable-python=system \
- --enable-scripting-beanshell \
- --enable-scripting-javascript \
- --disable-telepathy \
- --enable-ext-wiki-publisher \
- --enable-ext-nlpsolver \
- --without-fonts\
- --with-system-apr \
- --with-system-libcdr \
- --without-system-mdds\
- --without-myspell-dicts \
- --with-system-libvisio \
- --without-system-libcmis \
- --with-system-libmspub \
- --without-system-libexttextcat \
- --without-system-orcus \
- --without-system-liblangtag \
- --without-system-jfreereport \
- --without-system-apache-commons \
- --with-system-libodfgen \
- --without-system-libmwaw \
- --with-system-libetonyek \
- --without-system-libfreehand \
- --without-system-firebird \
- --with-system-libatomic-ops \
- --without-system-libebook \
- --without-system-libabw \
- --with-system-dicts \
- --with-external-dict-dir=/usr/share/hunspell \
- --with-external-hyph-dir=/usr/share/hyphen \
- --with-external-thes-dir=/usr/share/mythes \
- --with-system-beanshell \
- --with-system-cppunit\
- --with-system-graphite\
- --with-system-glew \
- --without-system-glm \
- --with-system-libwpg \
- --with-system-libwps \
- --with-system-redland\
- --with-system-serf \
- --without-system-npapi-headers \
- --with-ant-home="/usr/share/apache-ant"\
- --without-system-boost\
- --without-system-icu \
- --with-system-cairo\
- --with-system-libs\
- --with-system-mythes\
- --with-system-headers\
- --without-system-hsqldb \
- --with-alloc=system\
- --with-system-clucene \
- --disable-dependency-tracking \
- --enable-hardlink-deliver #--help
-
-# --enable-mergelibs=<all/yes> \ # https://bugs.archlinux.org/task/34414
-# --without-ppds\ # breaks spadmin permission
-
-#--enable-split-opt-features Split file lists for some optional features, .e.g. pyuno, testtool
-
- touch src.downloaded
- #./download
- make
- # fake installation to create split file lists
- mkdir $srcdir/fakeinstall
- make DESTDIR=${srcdir}/fakeinstall distro-pack-install # -o build -o check
-}
-
-#check() {
-# cd ${srcdir}/build
-# make check
-#}
-
-package_libreoffice-common() {
- pkgdesc="Common files for LibreOffice - a productivity suite that is compatible with other major office suites"
- install=libreoffice-common.install
- depends=('libreoffice-langpack' "hunspell>=1.2.8" "python>=3.3" "neon>=0.28.6"
- 'dbus-glib' 'librsvg' 'libcups' 'nss' 'libsm' 'redland' 'hyphen'
- 'graphite' 'clucene' 'lcms2' "poppler>=0.24.0" #"icu>=52.1"
- #'telepathy-glib' # (calc telepathy-glib libtubeslo.so)
- 'libodfgen' 'libvisio' 'harfbuzz-icu' 'hicolor-icon-theme' 'glu'
- 'libmspub' 'libcdr' 'glew' # 'apr' 'serf' ?
- 'desktop-file-utils' 'shared-mime-info' 'xdg-utils')
- optdepends=('libreoffice-langpack: additional language support'
- 'java-runtime: adds java support'
- 'pstoedit: translates PostScript and PDF graphics into other vector formats'
- 'libmythes: for use in thesaurus'
- 'beanshell2: interactive java -- good for prototyping/macros'
- 'vigra: C++ computer vision library, usable in Basebmp'
- 'libmspack: library for Microsoft compression formats for use in FontOOo'
- 'libwpg: library for importing and converting Corel WordPerfect(tm) Graphics images and for MS visual import'
- 'sane: for scanner access'
- 'unixodbc: adds ODBC database support'
- 'gst-plugins-base-libs: + some gstr-plugins to support multimedia content, e.g. in impress'
- 'gtk2: for browser plugin'
- 'libpaper: takes care of papersize')
- backup=(etc/libreoffice/sofficerc
- etc/libreoffice/bootstraprc
- etc/libreoffice/psprint.conf
- etc/profile.d/libreoffice-common.sh
- etc/profile.d/libreoffice-common.csh)
- groups=('libreoffice')
- provides=('go-openoffice' 'libreoffice-extension-pdfimport' 'libreoffice-extension-presenter-screen'
- 'libreoffice-scripting-beanshell' 'libreoffice-scripting-javascript' 'libreoffice-extension-scripting-python'
- 'libreoffice-extension-report-builder')
- conflicts=('go-openoffice')
- replaces=('go-openoffice' 'openoffice-base' 'libreoffice' 'libreoffice-extension-pdfimport' 'libreoffice-extension-presenter-screen'
- 'libreoffice-scripting-beanshell' 'libreoffice-scripting-javascript' 'libreoffice-extension-scripting-python'
- 'libreoffice-extension-report-builder' 'libreoffice-extension-presentation-minimizer' 'libreoffice-extension-presentation-minimizer')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/common_list.txt`; do
- install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/common_list.txt`; do
- dirname=`dirname $file`
- # check if directory has been already been created - some are missing like manpages
- [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
- # mv file from fakeinstall to pkgdir
- mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-
- # put configuration files into place
- install -dm755 ${pkgdir}/etc/libreoffice
- install -m644 ${pkgdir}/usr/lib/libreoffice/program/{bootstraprc,sofficerc} ${pkgdir}/etc/libreoffice/
- install -m644 ${pkgdir}/usr/lib/libreoffice/share/psprint/psprint.conf ${pkgdir}/etc/libreoffice/
- # install dummy links to make them found by LibO
- cd ${pkgdir}/usr/lib/libreoffice/program/
- ln -vsf /etc/libreoffice/{bootstraprc,sofficerc} .
- cd ${pkgdir}/usr/lib/libreoffice/share/psprint/
- ln -vsf /etc/libreoffice/psprint.conf .
-
- # allow to preset desired VLC
- install -dm755 ${pkgdir}/etc/profile.d
- install -m755 ${srcdir}/libreoffice-common.{sh,csh} ${pkgdir}/etc/profile.d/
-
- # move bash-completion files to its new place
- install -dm755 ${pkgdir}/usr/share/bash-completion/completions
- mv ${pkgdir}/etc/bash_completion.d/libreoffice.sh ${pkgdir}/usr/share/bash-completion/completions/libreoffice.sh
- rm -rf ${pkgdir}/etc/bash_completion.d
-
- # make pyuno find its modules
- install -dm755 ${pkgdir}/usr/lib/python3.4/site-packages
- ln -svf /usr/lib/libreoffice/program/uno.py ${pkgdir}/usr/lib/python3.4/site-packages/uno.py
- ln -svf /usr/lib/libreoffice/program/unohelper.py ${pkgdir}/usr/lib/python3.4/site-packages/unohelper.py
-
- # workaround all packages now depend on that file
- cp ${srcdir}/fakeinstall/usr/lib/libreoffice/share/registry/writer.xcd ${pkgdir}/usr/lib/libreoffice/share/registry/writer.xcd
- # workaround lowriter depending on a lib that's part of calc
- # https://bugs.archlinux.org/task/39038 - https://bugs.freedesktop.org/show_bug.cgi?id=75506
-# cp ${srcdir}/fakeinstall/usr/lib/libreoffice/program/libtubeslo.so ${pkgdir}/usr/lib/libreoffice/program/libtubeslo.so
-
- # add missing files from Beanshell provider
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/orig/gid_Module_Optional_Extensions_Script_Provider_For_BS`; do
- install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/orig/gid_Module_Optional_Extensions_Script_Provider_For_BS`; do
- dirname=`dirname $file`
- # check if directory has been already been created - some are missing like manpages
- [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
- # mv file from fakeinstall to pkgdir
- mv ${srcdir}/fakeinstall${file} ${pkgdir}$file || /bin/true # some double file entries make it fail
- done
-}
-
-package_libreoffice-base() {
- pkgdesc="GUI database front-end for LibreOffice. Allows creation and management of databases through a GUI."
- install=libreoffice-base.install
- depends=('libreoffice-common')
- optdepends=('libreoffice-postgresql-connector')
- groups=('libreoffice')
- replaces=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/base_list.txt`; do
- install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/base_list.txt`; do
- dirname=`dirname $file`
- # check if directory has been already been created - some are missing like manpages
- [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
- # mv file from fakeinstall to pkgdir
- mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-postgresql-connector() {
- pkgdesc="A PostgreSQL connector for the database front-end for LibreOffice"
- depends=('libreoffice-base' 'postgresql-libs')
- groups=('libreoffice')
- replaces=('libreoffice')
-
- # workaround double entries in the file list
- mv ${srcdir}/libreoffice-$_LOver/file-lists/postgresql_list.txt ${srcdir}/libreoffice-$_LOver/file-lists/postgresql_list.txt.orig
- sort ${srcdir}/libreoffice-$_LOver/file-lists/postgresql_list.txt.orig | uniq 1>& ${srcdir}/libreoffice-$_LOver/file-lists/postgresql_list.txt
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/postgresql_list.txt`; do
- install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/postgresql_list.txt`; do
- dirname=`dirname $file`
- # check if directory has been already been created - some are missing like manpages
- [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
- # mv file from fakeinstall to pkgdir
- mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-calc() {
- pkgdesc="Spreadsheet application for LibreOffice."
- install=libreoffice-calc.install
- depends=('libreoffice-common' 'lpsolve')
- #depends=('libreoffice-writer' 'lpsolve' ) # some hidden uno linking to parts of the writer pkg - https://bugs.archlinux.org/task/34332
- groups=('libreoffice')
- replaces=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/calc_list.txt`; do
- install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/calc_list.txt`; do
- dirname=`dirname $file`
- # check if directory has been already been created - some are missing like manpages
- [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
- # mv file from fakeinstall to pkgdir
- mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
- # workaround lowriter depending on a lib that's part of calc
- # https://bugs.archlinux.org/task/39038 - https://bugs.freedesktop.org/show_bug.cgi?id=75506
-# rm -vf ${pkgdir}/usr/lib/libreoffice/program/libtubeslo.so
-}
-
-package_libreoffice-draw() {
- pkgdesc="Drawing Application for LibreOffice."
- install=libreoffice-draw.install
- depends=('libreoffice-common')
- groups=('libreoffice')
- replaces=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/draw_list.txt`; do
- install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/draw_list.txt`; do
- dirname=`dirname $file`
- # check if directory has been already been created - some are missing like manpages
- [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
- # mv file from fakeinstall to pkgdir
- mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-gnome() {
- pkgdesc="Plug-in for LibreOffice that enables integration into the Gnome and other gtk desktop environment."
- depends=('libreoffice-common' 'gconf')
- optdepends=('gtk3: for gtk3 Gnome integration'
- 'gtk2: for older gtk2 desktop integration')
- groups=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/gnome_list.txt`; do
- install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/gnome_list.txt`; do
- dirname=`dirname $file`
- # check if directory has been already been created - some are missing like manpages
- [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
- # mv file from fakeinstall to pkgdir
- mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-impress() {
- pkgdesc="Presentation Application for LibreOffice."
- install=libreoffice-impress.install
- depends=('libreoffice-common' 'libetonyek')
- groups=('libreoffice')
- replaces=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/impress_list.txt`; do
- install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/impress_list.txt`; do
- dirname=`dirname $file`
- # check if directory has been already been created - some are missing like manpages
- [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
- # mv file from fakeinstall to pkgdir
- mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-kde4() {
- pkgdesc="Plug-in for LibreOffice that enables integration into the KDE4 desktop environment."
- depends=('libreoffice-common' 'kdelibs')
- optdepends=()
- backup=()
- groups=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/kde4_list.txt`; do
- install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/kde4_list.txt`; do
- dirname=`dirname $file`
- # check if directory has been already been created - some are missing like manpages
- [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
- # mv file from fakeinstall to pkgdir
- mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-
- # one file (libkde4be1lo.so) is part of kde_list.txt
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/kde_list.txt`; do
- install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/kde_list.txt`; do
- dirname=`dirname $file`
- # check if directory has been already been created - some are missing like manpages
- [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
- # mv file from fakeinstall to pkgdir
- mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-math() {
- pkgdesc="Equation Editor Application for LibreOffice."
- depends=('libreoffice-common')
- groups=('libreoffice')
- replaces=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/math_list.txt`; do
- install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/math_list.txt`; do
- dirname=`dirname $file`
- # check if directory has been already been created - some are missing like manpages
- [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
- # mv file from fakeinstall to pkgdir
- mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-sdk() {
- pkgdesc="Software Development Kit for LibreOffice."
- depends=('libreoffice-common' 'gcc-libs' 'sh' 'make' 'zip' 'gcc' 'java-environment')
- groups=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/sdk_list.txt`; do
- install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/sdk_list.txt`; do
- dirname=`dirname $file`
- # check if directory has been already been created - some are missing like manpages
- [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
- # mv file from fakeinstall to pkgdir
- mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-
- # fix environment path to keep compatibility with other java-environments
-# sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" ${pkgdir}/usr/lib/libreoffice/sdk/setsdkenv_unix.{sh,csh}
- sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" ${pkgdir}/usr/lib/libreoffice/sdk/setsdkenv_unix.sh
-}
-
-package_libreoffice-sdk-doc() {
- pkgdesc="Software Development Kit documentation for LibreOffice"
- depends=('libreoffice-common' 'libreoffice-sdk')
- groups=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/sdk_doc_list.txt`; do
- install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/sdk_doc_list.txt`; do
- dirname=`dirname $file`
- # check if directory has been already been created - some are missing like manpages
- [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
- # mv file from fakeinstall to pkgdir
- mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-
- #fix permissions
- find ${pkgdir}/usr/lib/libreoffice/sdk/examples -type f -exec chmod -x {} \;
-}
-
-package_libreoffice-writer() {
- pkgdesc="Word Processor Application for LibreOffice."
- install=libreoffice-writer.install
- depends=('libreoffice-common' 'libwpd>=0.9.2' 'libwps' 'libxml2')
- optdepends=('libwpg: library for importing and converting Corel WordPerfect(tm) Graphics images')
- groups=('libreoffice')
- replaces=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/writer_list.txt`; do
- install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/writer_list.txt`; do
- dirname=`dirname $file`
- # check if directory has been already been created - some are missing like manpages
- [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
- # mv file from fakeinstall to pkgdir
- mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-
- # for workaround this file belongs now to common
- rm -vf ${pkgdir}/usr/lib/libreoffice/share/registry/writer.xcd
-}
-
-package_libreoffice-en-US() {
- pkgdesc="English (US) language pack for LibreOffice"
- #arch=('any')
- provides=('openoffice-en-US' 'libreoffice-langpack')
- replaces=(openoffice-en-US)
- conflicts=(openoffice-en-US)
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/lang_en_US_list.txt`; do
- install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/lang_en_US_list.txt`; do
- dirname=`dirname $file`
- # check if directory has been already been created - some are missing like manpages
- [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
- # mv file from fakeinstall to pkgdir
- mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-extension-wiki-publisher() {
-
- pkgdesc="This extension enables you to create Wiki articles on MediaWiki servers without having to know the syntax of the MediaWiki markup language"
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
- install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
- unzip -q ${srcdir}/libreoffice-$_LOver/workdir/Extension/wiki-publisher.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/wiki-publisher
-}
-
-package_libreoffice-extension-nlpsolver() {
-
- pkgdesc="This extension integrates into Calc and offers new Solver engines to use for optimizing nonlinear programming models"
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
- install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
- unzip -q ${srcdir}/libreoffice-$_LOver/workdir/Extension/nlpsolver.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/nlpsolver
-}
diff --git a/extra/libvisio/PKGBUILD b/extra/libvisio/PKGBUILD
index f130c0c2a..a0a0fd634 100644
--- a/extra/libvisio/PKGBUILD
+++ b/extra/libvisio/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 211312 2014-04-18 17:28:15Z andyrtr $
+# $Id: PKGBUILD 215152 2014-06-14 19:16:59Z andyrtr $
# Maintainer: AndyRTR <andyrtr@archlinux.org>
# Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
# Contributor: ponsfoot <cabezon dot hashimoto at gmail dot com>
# Contributor: philacs
pkgname=libvisio
-pkgver=0.0.31
-pkgrel=3
+pkgver=0.1.0
+pkgrel=1
pkgdesc='Library providing ability to interpret and import visio diagrams'
arch=('i686' 'x86_64')
url='http://www.freedesktop.org/wiki/Software/libvisio'
license=('LGPL')
-depends=('libwpd' 'libwpg' 'libxml2' 'gperf' 'icu')
-makedepends=('boost')
+depends=('libwpd' 'libwpg' 'libxml2' 'icu' 'librevenge')
+makedepends=('boost' 'gperf' 'doxygen')
source=(http://dev-www.libreoffice.org/src/$pkgname-$pkgver.tar.xz)
-md5sums=('12ceec054cdec55b4dc9fc931507d1cd')
+md5sums=('41e156acfd269dcaf99b37a1d979b746')
build() {
cd $pkgname-$pkgver
diff --git a/extra/libwebp/PKGBUILD b/extra/libwebp/PKGBUILD
index 64efd9b1d..0a17f3716 100644
--- a/extra/libwebp/PKGBUILD
+++ b/extra/libwebp/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 205027 2014-02-03 10:02:57Z heftig $
+# $Id: PKGBUILD 215167 2014-06-14 19:17:19Z andyrtr $
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
# Contributor: Alexander Rødseth <rodseth@gmail.com>
# Contributor: Jon Nordby <jononor@gmail.com>
pkgname=libwebp
pkgver=0.4.0
-pkgrel=1
+pkgrel=2
pkgdesc="WebP library and conversion tools"
arch=(x86_64 i686)
url="https://developers.google.com/speed/webp/"
@@ -13,8 +13,15 @@ license=(BSD)
depends=(libpng libjpeg libtiff giflib)
makedepends=(freeglut mesa glu)
optdepends=('freeglut: vwebp viewer')
-source=("http://webp.googlecode.com/files/$pkgname-$pkgver.tar.gz")
-sha256sums=('31913577e96386556855b41d210736449445fe96cfbe9289014e9b8afa944d69')
+source=("http://webp.googlecode.com/files/$pkgname-$pkgver.tar.gz"
+ "libwebp-0.4.0-giflib-5.1.0.patch")
+sha256sums=('31913577e96386556855b41d210736449445fe96cfbe9289014e9b8afa944d69'
+ '466fb04887b7fba1be95bb409bd01c23c2855dc2b9471cf5cd6de1822e55ed86')
+
+prepare() {
+ cd "$srcdir/$pkgname-$pkgver"
+ patch -p1 -i "$srcdir"/libwebp-0.4.0-giflib-5.1.0.patch
+}
build() {
cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/libwebp/libwebp-0.4.0-giflib-5.1.0.patch b/extra/libwebp/libwebp-0.4.0-giflib-5.1.0.patch
new file mode 100644
index 000000000..efb06370a
--- /dev/null
+++ b/extra/libwebp/libwebp-0.4.0-giflib-5.1.0.patch
@@ -0,0 +1,12 @@
+diff -rupN a/examples/gif2webp.c b/examples/gif2webp.c
+--- a/examples/gif2webp.c 2013-12-20 09:48:07.000000000 +0100
++++ b/examples/gif2webp.c 2014-06-01 13:28:31.790564455 +0200
+@@ -644,7 +644,7 @@ int main(int argc, const char *argv[]) {
+ DisplayGifError(gif, gif_error);
+ }
+ if (gif != NULL) {
+- DGifCloseFile(gif);
++ DGifCloseFile(gif, NULL);
+ }
+
+ return !ok;
diff --git a/extra/libwpd/PKGBUILD b/extra/libwpd/PKGBUILD
index f9ea447f6..5d1810f35 100644
--- a/extra/libwpd/PKGBUILD
+++ b/extra/libwpd/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 198267 2013-10-30 13:49:48Z allan $
+# $Id: PKGBUILD 215153 2014-06-14 19:17:00Z andyrtr $
# Maintainer: AndyRTR <andyrtr@archlinux.org>
pkgname=libwpd
-pkgver=0.9.9
+pkgver=0.10.0
pkgrel=1
pkgdesc="Library for importing WordPerfect (tm) documents"
arch=('i686' 'x86_64')
url="http://libwpd.sourceforge.net/"
license=('LGPL')
-depends=('gcc-libs' 'zlib')
-makedepends=('libgsf>=1.14.26')
+depends=('gcc-libs' 'zlib' 'librevenge')
+makedepends=('libgsf>=1.14.26' 'doxygen')
options=('!emptydirs')
source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.xz)
-md5sums=('6b74a863c957563924546e16cc833591')
+md5sums=('f7abb9b3ea96faf02ae019af68b1f07c')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/libwpg/PKGBUILD b/extra/libwpg/PKGBUILD
index 5916e389b..12cac2fda 100644
--- a/extra/libwpg/PKGBUILD
+++ b/extra/libwpg/PKGBUILD
@@ -1,16 +1,17 @@
-# $Id: PKGBUILD 197095 2013-10-21 18:43:22Z andyrtr $
+# $Id: PKGBUILD 215154 2014-06-14 19:17:01Z andyrtr $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=libwpg
-pkgver=0.2.2
-pkgrel=2
+pkgver=0.3.0
+pkgrel=1
pkgdesc="Library for importing and converting Corel WordPerfect(tm) Graphics images."
arch=('i686' 'x86_64')
url="http://libwpg.sourceforge.net/"
license=('LGPL')
-depends=('libwpd' 'perl')
+depends=('libwpd' 'perl' 'librevenge')
+makedepends=('doxygen')
source=("http://downloads.sourceforge.net/libwpg/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('b85436266b2ac91d351ab5684b181151')
+md5sums=('17da9770cb8b317b7633f9807b32b71a')
build() {
cd ${pkgname}-${pkgver}
diff --git a/extra/libwps/PKGBUILD b/extra/libwps/PKGBUILD
index 0d814405b..f9f545220 100644
--- a/extra/libwps/PKGBUILD
+++ b/extra/libwps/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 198268 2013-10-30 13:50:09Z allan $
+# $Id: PKGBUILD 215155 2014-06-14 19:17:02Z andyrtr $
# Maintainer: AndyRTR <andyrtr@archlinux.org>
# Contributor: Robert McCathie <archaur at rmcc dot com dot au>
pkgname=libwps
-pkgver=0.2.9
+pkgver=0.3.0
pkgrel=1
pkgdesc="a Microsoft Works file word processor format import filter library"
arch=('i686' 'x86_64')
url="http://libwps.sourceforge.net/"
license=('LGPL')
-depends=('libwpd>=0.9.6')
-makedepends=('boost')
+depends=('libwpd' 'librevenge')
+makedepends=('boost' 'doxygen')
source=("http://downloads.sourceforge.net/project/libwps/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2")
-md5sums=('46eb0e7f213ad61bd5dee0c494132cb0')
+md5sums=('d4d77d08b9048bae3b8ec8df11f80efd')
build() {
cd "$srcdir/$pkgname-$pkgver"
@@ -26,4 +26,3 @@ package() {
cd "$srcdir/$pkgname-$pkgver"
make DESTDIR="$pkgdir" install
}
-
diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD
index 8d4deedb1..d0f39ed27 100644
--- a/extra/live-media/PKGBUILD
+++ b/extra/live-media/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 212078 2014-05-06 14:16:45Z giovanni $
+# $Id: PKGBUILD 215086 2014-06-13 13:39:00Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Gilles CHAUVIN <gcnweb@gmail.com>
pkgname=live-media
-pkgver=2014.04.23
+pkgver=2014.05.27
pkgrel=1
pkgdesc="A set of C++ libraries for multimedia streaming"
arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ url="http://live555.com/liveMedia"
depends=('gcc-libs')
options=('staticlibs')
source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz")
-md5sums=('f549f364374e2eec1000bc0ce31d6e74')
+md5sums=('69f877ac5464b6488f7af425d59f84d4')
build() {
cd ${srcdir}/live
diff --git a/extra/llvm/PKGBUILD b/extra/llvm/PKGBUILD
index bd2649240..4c3cfbcff 100644
--- a/extra/llvm/PKGBUILD
+++ b/extra/llvm/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 212366 2014-05-14 06:58:53Z foutrelis $
+# $Id: PKGBUILD 215216 2014-06-16 18:49:57Z foutrelis $
# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
# Contributor: Sebastian Nowicki <sebnow@gmail.com>
@@ -11,9 +11,9 @@
pkgname=('llvm' 'llvm-libs' 'llvm-ocaml' 'clang' 'clang-analyzer'
'clang-tools-extra')
-pkgver=3.4.1
+pkgver=3.4.2
_base_ver=3.4
-pkgrel=2
+pkgrel=1
arch=('i686' 'x86_64')
url="http://llvm.org/"
license=('custom:University of Illinois/NCSA Open Source License')
@@ -24,21 +24,19 @@ source=(http://llvm.org/releases/$pkgver/llvm-$pkgver.src.tar.gz{,.sig}
http://llvm.org/releases/$_base_ver/clang-tools-extra-$_base_ver.src.tar.gz{,.sig}
http://llvm.org/releases/$_base_ver/compiler-rt-$_base_ver.src.tar.gz{,.sig}
clang-3.3-use-gold-linker.patch
- clang-3.4-max_align_t.patch
clang-3.4-fstack-protector-strong.patch
llvm-3.4-provide-cmake-modules.patch
llvm-Config-config.h
llvm-Config-llvm-config.h)
-sha256sums=('7d28bb6eca243a2bb6d65a05743ab915b57958a7770277364e93534b63eef93a'
+sha256sums=('17038d47069ad0700c063caed76f0c7259628b0e79651ce2b540d506f2f1efd7'
'SKIP'
- 'ab83f30951b34d75729026e0e73c180a728a140f2a02cbb8915805051a9d6bb7'
+ '5ba6f5772f8d00f445209356a7daf83c5bca2da5acd10de517ad2359ae95bc10'
'SKIP'
'ba85187551ae97fe1c8ab569903beae5ff0900e21233e5eb5389f6ceab1028b4'
'SKIP'
'f37c89b1383ce462d47537a0245ac798600887a9be9f63073e16b79ed536ab5c'
'SKIP'
'8240adda155d7961eeb5d07ed50ead10cb7125f70283dff7f1c9fee9df3cea09'
- '0f0cbff69af54e83383385abbdeb1fee23e6e69427f8530060c492c0b07c2bbe'
'7a2a1ddc94f67e643c1ab74601ec07deb6d5d344d4b19ed17c900afb2f6f2863'
'b6bb154d5ec998328e818bb09acfc6229e41367ba45cea7cc5b2dd2a7c835cf5'
'312574e655f9a87784ca416949c505c452b819fad3061f2cde8aced6540a19a3'
@@ -67,10 +65,6 @@ prepare() {
# Make -flto work; use ld.gold instead of the default linker
patch -d tools/clang -Np1 -i "$srcdir/clang-3.3-use-gold-linker.patch"
- # Teach Clang to provide ::max_align_t in C11 and C++11 modes (FS#40229)
- # http://reviews.llvm.org/rL201729
- patch -d tools/clang -Np0 -i "$srcdir/clang-3.4-max_align_t.patch"
-
# Add command line option -fstack-protector-strong
# http://reviews.llvm.org/rL201120
patch -d tools/clang -Np0 -i "$srcdir/clang-3.4-fstack-protector-strong.patch"
@@ -128,8 +122,8 @@ package_llvm() {
mv "$srcdir/clang" tools
# The runtime library goes into llvm-libs
- mv "$pkgdir/usr/lib/libLLVM-$pkgver.so" "$srcdir"
- rm "$pkgdir/usr/lib/libLLVM-$_base_ver.so"
+ mv "$pkgdir/usr/lib/libLLVM-$pkgver.so" "$srcdir/"
+ mv "$pkgdir/usr/lib/libLLVM-$_base_ver.so" "$srcdir/"
# OCaml bindings go to a separate package
rm -rf "$srcdir"/{ocaml,ocamldoc}
@@ -174,8 +168,11 @@ package_llvm-libs() {
pkgdesc="Low Level Virtual Machine (runtime library)"
depends=('gcc-libs' 'zlib' 'libffi' 'ncurses')
- install -D "$srcdir/libLLVM-$pkgver.so" "$pkgdir/usr/lib/libLLVM-$pkgver.so"
- ln -s libLLVM-$pkgver.so "$pkgdir/usr/lib/libLLVM-$_base_ver.so"
+ install -d "$pkgdir/usr/lib"
+ cp -P \
+ "$srcdir/libLLVM-$pkgver.so" \
+ "$srcdir/libLLVM-$_base_ver.so" \
+ "$pkgdir/usr/lib/"
install -Dm644 "$srcdir/llvm-$pkgver/LICENSE.TXT" \
"$pkgdir/usr/share/licenses/$pkgname/LICENSE"
diff --git a/extra/llvm/clang-3.4-max_align_t.patch b/extra/llvm/clang-3.4-max_align_t.patch
deleted file mode 100644
index a41f37e93..000000000
--- a/extra/llvm/clang-3.4-max_align_t.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Index: lib/Headers/stddef.h
-===================================================================
---- lib/Headers/stddef.h (revision 201728)
-+++ lib/Headers/stddef.h (revision 201729)
-@@ -84,6 +84,16 @@
- #endif
- #endif
-
-+#if __STDC_VERSION__ >= 201112L || __cplusplus >= 201103L
-+typedef struct {
-+ long long __clang_max_align_nonce1
-+ __attribute__((__aligned__(__alignof__(long long))));
-+ long double __clang_max_align_nonce2
-+ __attribute__((__aligned__(__alignof__(long double))));
-+} max_align_t;
-+#define __CLANG_MAX_ALIGN_T_DEFINED
-+#endif
-+
- #define offsetof(t, d) __builtin_offsetof(t, d)
-
- #endif /* __STDDEF_H */
-Index: test/Headers/c11.c
-===================================================================
---- test/Headers/c11.c (revision 201728)
-+++ test/Headers/c11.c (revision 201729)
-@@ -22,6 +22,10 @@
- #define __STDC_WANT_LIB_EXT1__ 1
- #include <stddef.h>
- rsize_t x = 0;
-+_Static_assert(sizeof(max_align_t) >= sizeof(long long), "");
-+_Static_assert(alignof(max_align_t) >= alignof(long long), "");
-+_Static_assert(sizeof(max_align_t) >= sizeof(long double), "");
-+_Static_assert(alignof(max_align_t) >= alignof(long double), "");
-
- // If we are freestanding, then also check RSIZE_MAX (in a hosted implementation
- // we will use the host stdint.h, which may not yet have C11 support).
diff --git a/extra/maxima/PKGBUILD b/extra/maxima/PKGBUILD
index dc75187ec..ffd775d2b 100644
--- a/extra/maxima/PKGBUILD
+++ b/extra/maxima/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 213411 2014-05-23 10:44:10Z juergen $
+# $Id: PKGBUILD 215196 2014-06-16 11:02:24Z juergen $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Damir Perisa <damir@archlinux.org>
pkgname=maxima
pkgver=5.33.0
-pkgrel=3
+pkgrel=4
pkgdesc="A sophisticated computer algebra system"
arch=('i686' 'x86_64')
license=('GPL')
url="http://maxima.sourceforge.net"
-depends=('sbcl=1.1.18' 'texinfo' 'sh')
+depends=('sbcl=1.2.0' 'texinfo' 'sh')
makedepends=('python2')
optdepends=('gnuplot: plotting capabilities' 'rlwrap: readline support via /usr/bin/rmaxima' 'tk: graphical xmaxima interface')
# needs rebuild when bash changes version
diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD
index e6fbefd30..08ce53503 100644
--- a/extra/mesa/PKGBUILD
+++ b/extra/mesa/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 214387 2014-06-08 19:01:03Z lcarlier $
+# $Id: PKGBUILD 215218 2014-06-16 18:52:23Z foutrelis $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
pkgbase=mesa
pkgname=('opencl-mesa' 'ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa' 'mesa-libgl')
pkgver=10.2.1
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'dri3proto' 'presentproto'
'libxshmfence' 'libxxf86vm' 'libxdamage' 'libvdpau' 'wayland' 'elfutils' 'llvm' 'systemd'
diff --git a/extra/mkvtoolnix/PKGBUILD b/extra/mkvtoolnix/PKGBUILD
index 0dc6f95cb..39c13e6c2 100644
--- a/extra/mkvtoolnix/PKGBUILD
+++ b/extra/mkvtoolnix/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 211782 2014-04-26 08:25:50Z giovanni $
+# $Id: PKGBUILD 215084 2014-06-13 13:21:08Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: xduugu <xduugu@gmx.com>
pkgbase=mkvtoolnix
pkgname=('mkvtoolnix-cli' 'mkvtoolnix-gtk')
-pkgver=6.9.1
+pkgver=7.0.0
pkgrel=1
arch=('i686' 'x86_64')
license=('GPL')
@@ -12,7 +12,7 @@ url="http://www.bunkus.org/videotools/mkvtoolnix/index.html"
makedepends=('libmatroska' 'flac' 'libvorbis' 'file' 'wxgtk'
'boost-libs' 'lzo2' 'xdg-utils' 'boost' 'ruby')
source=("http://www.bunkus.org/videotools/${pkgbase}/sources/${pkgbase}-${pkgver}.tar.xz")
-md5sums=('428e4609aabfe2f967e8ae4d7be55e15')
+md5sums=('ddd5ce6288d2fdaa6b79cb6d7bfffb04')
prepare() {
cd "${srcdir}/${pkgbase}-${pkgver}"
diff --git a/extra/perl-net-dns/PKGBUILD b/extra/perl-net-dns/PKGBUILD
index 64f3ae18b..2c8d0960f 100644
--- a/extra/perl-net-dns/PKGBUILD
+++ b/extra/perl-net-dns/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 215054 2014-06-12 03:05:13Z fyan $
+# $Id: PKGBUILD 215099 2014-06-14 03:49:47Z fyan $
# Maintainer: Felix Yan <felixonmars@gmail.com>
pkgname=perl-net-dns
-pkgver=0.76_2
+pkgver=0.77
pkgrel=1
pkgdesc="Perl Module: Interface to the DNS resolver"
arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ optdepends=('perl-io-socket-inet6: IPv6 support'
'perl-socket6: IPv6 support')
options=('!emptydirs')
source=(http://www.cpan.org/authors/id/N/NL/NLNETLABS/Net-DNS-$pkgver.tar.gz)
-sha1sums=('93a79f281c2a731020959cc28630fa20128b18d0')
+sha1sums=('e2264580ba9fa1d13104d41239c317570de9807e')
build() {
cd Net-DNS-${pkgver}
diff --git a/extra/php-apcu/PKGBUILD b/extra/php-apcu/PKGBUILD
index aeb0286ba..0d6a166df 100644
--- a/extra/php-apcu/PKGBUILD
+++ b/extra/php-apcu/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 207394 2014-03-08 15:50:15Z pierre $
+# $Id: PKGBUILD 215109 2014-06-14 10:57:01Z pierre $
# Maintainer: Pierre Schmitz <pierre@archlinux.de>
pkgname=php-apcu
-pkgver=4.0.4
-pkgrel=1
+pkgver=4.0.6
+pkgrel=2
arch=('i686' 'x86_64')
pkgdesc='A userland caching module for PHP'
url='http://pecl.php.net/package/APCu'
@@ -14,7 +14,7 @@ provides=("php-apc=${pkgver}")
license=('PHP')
source=("http://pecl.php.net/get/apcu-$pkgver.tgz")
backup=('etc/php/conf.d/apcu.ini')
-md5sums=('a7696b1c351d9bd1592b7840701f5bf7')
+md5sums=('cf7f1a751c4f3ecd1bb8f985be4de09b')
build() {
cd $srcdir/apcu-$pkgver
@@ -23,17 +23,18 @@ build() {
make
}
-# check() {
-# cd $srcdir/apcu-$pkgver
-# printf "n\n" | make test
-# echo
-# }
+check() {
+ cd $srcdir/apcu-$pkgver
+ export NO_INTERACTION=1
+ make test
+ echo
+}
package() {
cd $srcdir/apcu-$pkgver
make INSTALL_ROOT=$pkgdir install
echo ';extension=apcu.so' > apcu.ini
install -D -m644 apcu.ini $pkgdir/etc/php/conf.d/apcu.ini
- install -D -m644 apc.php $pkgdir/usr/share/php-apcu/apc.php
+ install -D -m644 apc.php $pkgdir/usr/share/webapps/php-apcu/apc.php
install -D -m644 INSTALL $pkgdir/usr/share/doc/php-apcu/install.txt
}
diff --git a/extra/php-xcache/PKGBUILD b/extra/php-xcache/PKGBUILD
index 22393296e..cb0bccb8f 100644
--- a/extra/php-xcache/PKGBUILD
+++ b/extra/php-xcache/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 196293 2013-10-11 06:26:09Z pierre $
+# $Id: PKGBUILD 215107 2014-06-14 10:56:09Z pierre $
# Maintainer: Pierre Schmitz <pierre@archlinux.de>
pkgname=php-xcache
pkgver=3.1.0
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
pkgdesc='A PHP opcode cacher'
url='http://xcache.lighttpd.net/'
@@ -22,11 +22,12 @@ build() {
make
}
-# check() {
-# cd $srcdir/xcache-$pkgver
-# printf "n\n" | make test
-# echo
-# }
+check() {
+ cd $srcdir/xcache-$pkgver
+ export NO_INTERACTION=1
+ make test
+ echo
+}
package() {
cd $srcdir/xcache-$pkgver
@@ -34,8 +35,8 @@ package() {
install -Dm644 $srcdir/xcache.ini $pkgdir/etc/php/conf.d/xcache.ini
- install -dm755 $pkgdir/usr/share/php-xcache/admin
- cp -r htdocs/* $pkgdir/usr/share/php-xcache/admin/
+ install -dm755 $pkgdir/usr/share/webapps/php-xcache
+ cp -r htdocs/* $pkgdir/usr/share/webapps/php-xcache/
install -Dm644 COPYING $pkgdir/usr/share/licenses/php-xcache/COPYING
}
diff --git a/extra/pyqt4/PKGBUILD b/extra/pyqt4/PKGBUILD
index a859d46b4..2a6635557 100644
--- a/extra/pyqt4/PKGBUILD
+++ b/extra/pyqt4/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 208888 2014-03-28 06:10:07Z fyan $
+# $Id: PKGBUILD 215219 2014-06-16 21:35:22Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
# Contributor: riai <riai@bigfoot.com> Ben <ben@benmazer.net>
pkgbase=pyqt4
pkgname=('pyqt4-common' 'python-pyqt4' 'python2-pyqt4')
-pkgver=4.10.4
+pkgver=4.11
pkgrel=2
arch=('i686' 'x86_64')
url='http://www.riverbankcomputing.com/software/pyqt/intro'
@@ -13,13 +13,13 @@ license=('GPL')
makedepends=('python-sip' 'python-dbus' 'python2-sip' 'phonon' 'mesa'
'python2-opengl' 'qt-assistant-compat' 'qtwebkit' 'python2-dbus')
source=("http://downloads.sourceforge.net/pyqt/PyQt-x11-gpl-${pkgver}.tar.gz")
-md5sums=('20940f6b2c957269cdd02d0efe537515')
+md5sums=('8b991f95fec9582cdcc1bf1f4ac02406')
build() {
cp -r PyQt-x11-gpl-${pkgver} Py2Qt-x11-gpl-${pkgver}
cd PyQt-x11-gpl-${pkgver}
- python configure.py \
+ python configure-ng.py \
--confirm-license \
--qsci-api \
-q /usr/bin/qmake-qt4
@@ -31,7 +31,7 @@ build() {
### Python2 version ###
cd ../Py2Qt-x11-gpl-${pkgver}
- python2 configure.py \
+ python2 configure-ng.py \
--confirm-license \
-v /usr/share/sip \
--qsci-api \
@@ -51,8 +51,8 @@ package_pyqt4-common(){
provides=("pyqt-common=${pkgver}")
cd PyQt-x11-gpl-${pkgver}
- make -C pyrcc DESTDIR="${pkgdir}" install
- make -C pylupdate DESTDIR="${pkgdir}" install
+ make -C pyrcc INSTALL_ROOT="${pkgdir}" install
+ make -C pylupdate INSTALL_ROOT="${pkgdir}" install
install -Dm644 PyQt4.api "${pkgdir}"/usr/share/qt4/qsci/api/python/PyQt4.api
}
diff --git a/extra/pyqt5/PKGBUILD b/extra/pyqt5/PKGBUILD
index dbfe4e387..45bb2a420 100644
--- a/extra/pyqt5/PKGBUILD
+++ b/extra/pyqt5/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 208890 2014-03-28 06:38:37Z fyan $
+# $Id: PKGBUILD 215132 2014-06-14 15:46:49Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Yichao Yu <yyc1992@gmail.com>
# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
@@ -7,8 +7,8 @@
pkgbase=pyqt5
pkgname=pyqt5
pkgname=('pyqt5-common' 'python-pyqt5' 'python2-pyqt5')
-pkgver=5.2.1
-pkgrel=2
+pkgver=5.3
+pkgrel=1
arch=('i686' 'x86_64')
url="http://riverbankcomputing.co.uk/software/pyqt/intro"
license=('GPL')
@@ -16,7 +16,7 @@ makedepends=('python-sip' 'python2-sip' 'python-opengl' 'python2-opengl'
'python2-dbus' 'python-dbus' 'qt5-multimedia' 'qt5-tools'
'qt5-svg' 'qt5-serialport')
source=("http://downloads.sourceforge.net/project/pyqt/PyQt5/PyQt-${pkgver}/PyQt-gpl-${pkgver}.tar.gz")
-md5sums=('8ab34b17b7d76ad613ff3af3c59e0c20')
+md5sums=('1e00c13e3627a3568d7f7dbc608c6525')
build() {
cp -r PyQt-gpl-${pkgver} Py2Qt-gpl-${pkgver}
diff --git a/extra/refind-efi/PKGBUILD b/extra/refind-efi/PKGBUILD
index 7bbaa00d2..25f94332c 100644
--- a/extra/refind-efi/PKGBUILD
+++ b/extra/refind-efi/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 213910 2014-05-31 11:41:33Z tpowa $
+# $Id: PKGBUILD 215215 2014-06-16 18:49:42Z tpowa $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Contributor: Keshav Amburay <(the ddoott ridikulus ddoott rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
@@ -13,7 +13,7 @@ _USE_GNU_EFI="1"
#######
pkgname="refind-efi"
-pkgver="0.8.1"
+pkgver="0.8.2"
pkgrel="1"
pkgdesc="Rod Smith's fork of rEFIt UEFI Boot Manager"
url="http://www.rodsbooks.com/refind/index.html"
@@ -31,6 +31,9 @@ install="${pkgname}.install"
source=("http://downloads.sourceforge.net/refind/refind-src-${pkgver}.zip"
'refind_linux.conf')
+md5sums=('3752afeca886c9c9d9176490a35cd1f5'
+ '12ce3e22a216e7b25c253478a34713b4')
+
if [[ "${_USE_GNU_EFI}" == "1" ]]; then
pkgdesc="${pkgdesc} - Built with GNU-EFI libs"
@@ -57,8 +60,6 @@ else
fi
-md5sums=('9bb5181bab8700a32a6ab835a131e5c5'
- '12ce3e22a216e7b25c253478a34713b4')
_setup_tianocore_env_vars() {
diff --git a/extra/sbcl/PKGBUILD b/extra/sbcl/PKGBUILD
index 84d742016..1bdc20c58 100644
--- a/extra/sbcl/PKGBUILD
+++ b/extra/sbcl/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 213412 2014-05-23 10:44:45Z juergen $
+# $Id: PKGBUILD 215191 2014-06-16 09:52:50Z juergen $
# Contributor: John Proctor <jproctor@prium.net>
# Contributor: Daniel White <daniel@whitehouse.id.au>
# Maintainer: Juergen Hoetzel <juergen@archlinux.org>
# Contributor: Leslie Polzer (skypher)
pkgname=sbcl
-pkgver=1.1.18
+pkgver=1.2.0
pkgrel=1
pkgdesc="Steel Bank Common Lisp"
url="http://www.sbcl.org/"
@@ -17,7 +17,7 @@ makedepends=('sbcl')
install=sbcl.install
source=("http://downloads.sourceforge.net/project/sbcl/sbcl/$pkgver/$pkgname-$pkgver-source.tar.bz2"
"arch-fixes.lisp")
-md5sums=('4dc4e8d8a5111ee4a689ab1a5db65f7d'
+md5sums=('9d370876cd190f952fbfd421784f8003'
'7ac0c1936547f4278198b8bf7725204d')
diff --git a/extra/sip/PKGBUILD b/extra/sip/PKGBUILD
index 366383dd3..6b0fbcaca 100644
--- a/extra/sip/PKGBUILD
+++ b/extra/sip/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 208863 2014-03-27 14:43:43Z fyan $
+# $Id: PKGBUILD 215130 2014-06-14 15:40:02Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
# Contributor: riai <riai@bigfoot.com>, Ben <ben@benmazer.net>
pkgbase=sip
pkgname=('sip' 'python-sip' 'python2-sip')
-pkgver=4.15.5
-pkgrel=2
+pkgver=4.16.1
+pkgrel=1
arch=('i686' 'x86_64')
url='http://www.riverbankcomputing.com/software/sip/intro'
license=('custom:"sip"')
makedepends=('python' 'python2')
source=("http://downloads.sourceforge.net/pyqt/${pkgbase}-${pkgver}.tar.gz")
-md5sums=('4c95447c7b0391b7f183cf9f92ae9bc6')
+md5sums=('e41fecec1b35b7b9d158aed464786813')
build() {
cp -r ${pkgbase}-${pkgver} python2-${pkgbase}-${pkgver}
diff --git a/extra/tracker/PKGBUILD b/extra/tracker/PKGBUILD
index f645a6718..7584569ac 100644
--- a/extra/tracker/PKGBUILD
+++ b/extra/tracker/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 212168 2014-05-09 17:03:34Z jgc $
+# $Id: PKGBUILD 215169 2014-06-14 19:17:22Z andyrtr $
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Alexander Fehr <pizzapunk gmail com>
@@ -6,7 +6,7 @@
pkgbase=tracker
pkgname=(tracker libtracker-sparql)
pkgver=1.0.1
-pkgrel=1
+pkgrel=2
pkgdesc="All-in-one indexer, search tool and metadata database"
arch=(i686 x86_64)
license=(GPL)
@@ -17,8 +17,15 @@ makedepends=(libgee libsecret upower libexif exempi
taglib libvorbis flac vala libgxps libnautilus-extension libmediaart)
url="http://www.gnome.org"
options=('!emptydirs')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver:0:3}/$pkgbase-$pkgver.tar.xz)
-sha256sums=('76e7918e62526a8209f9c9226f82abe592a6332826ac7c12e6e405063181e889')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver:0:3}/$pkgbase-$pkgver.tar.xz
+ tracker-1.0.1-giflib-5.1.0.patch)
+sha256sums=('76e7918e62526a8209f9c9226f82abe592a6332826ac7c12e6e405063181e889'
+ 'b5440e8129256a315f932229e9a25a3586b9dfdc3505bd2c018351573345b0bc')
+
+prepare() {
+ cd $pkgbase-$pkgver
+ patch -p1 -i ../tracker-1.0.1-giflib-5.1.0.patch
+}
build() {
cd $pkgbase-$pkgver
diff --git a/extra/tracker/tracker-1.0.1-giflib-5.1.0.patch b/extra/tracker/tracker-1.0.1-giflib-5.1.0.patch
new file mode 100644
index 000000000..d6fa2d64a
--- /dev/null
+++ b/extra/tracker/tracker-1.0.1-giflib-5.1.0.patch
@@ -0,0 +1,12 @@
+diff -rupN a/src/tracker-extract/tracker-extract-gif.c b/src/tracker-extract/tracker-extract-gif.c
+--- a/src/tracker-extract/tracker-extract-gif.c 2014-05-08 15:48:22.000000000 +0200
++++ b/src/tracker-extract/tracker-extract-gif.c 2014-06-01 13:35:37.407254708 +0200
+@@ -684,7 +684,7 @@ tracker_extract_get_metadata (TrackerExt
+
+ g_free (uri);
+
+- if (DGifCloseFile (gifFile) != GIF_OK) {
++ if (DGifCloseFile (gifFile, NULL) != GIF_OK) {
+ #if GIFLIB_MAJOR < 5
+ print_gif_error ();
+ #else /* GIFLIB_MAJOR < 5 */
diff --git a/extra/vc/PKGBUILD b/extra/vc/PKGBUILD
index 5ac53741f..683abbadd 100644
--- a/extra/vc/PKGBUILD
+++ b/extra/vc/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 197134 2013-10-22 12:37:05Z andrea $
+# $Id: PKGBUILD 215221 2014-06-16 21:35:56Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: PedsXing <pedsxing at gmx dot net>
pkgname=vc
-pkgver=0.7.3
-pkgrel=3
+pkgver=0.7.4
+pkgrel=1
pkgdesc="A library to ease explicit vectorization of C++ code"
url='http://code.compeng.uni-frankfurt.de/projects/vc/'
arch=('x86_64' 'i686')
license=('LGPL3')
makedepends=('cmake')
-options=('staticlibs')
-source=("http://code.compeng.uni-frankfurt.de/attachments/download/174/Vc-${pkgver}.tar.gz")
-md5sums=('a55e2871a33dbcbbe444c22ccef47dbd')
+options=('staticlibs') # only builds a static library
+source=("http://code.compeng.uni-frankfurt.de/attachments/download/183/Vc-${pkgver}.tar.gz")
+md5sums=('b11f0c6925f64a4ce178d3b8f0c282f8')
prepare() {
mkdir build
@@ -26,10 +26,10 @@ build() {
make
}
-check() {
- cd build
- make test
-}
+#check() {
+# cd build
+# make test
+#}
package() {
cd build
diff --git a/extra/vice/PKGBUILD b/extra/vice/PKGBUILD
index 7068e569c..376ecb759 100644
--- a/extra/vice/PKGBUILD
+++ b/extra/vice/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 205562 2014-02-07 16:53:54Z giovanni $
+# $Id: PKGBUILD 215170 2014-06-14 19:17:24Z andyrtr $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
pkgname=vice
pkgver=2.4
-pkgrel=5
+pkgrel=6
pkgdesc="The Versatile Commodore 8-bit Emulator"
arch=('i686' 'x86_64')
license=('GPL')
@@ -17,12 +17,14 @@ source=("http://downloads.sourceforge.net/project/vice-emu/releases/${pkgname}-$
'vice-2.4-x11video.patch'
'vice-2.4-no-fc-cache-no-lib64.patch'
'vice-2.4-notexi-notxt.patch'
- 'vice-2.4-zlib-1.2.7.patch')
+ 'vice-2.4-zlib-1.2.7.patch'
+ 'vice-2.4-giflib-5.1.0.patch')
md5sums=('b017647a0c159bbe43cdb81762d1c577'
'99931efcb779734c9df069e94f0b38a5'
'b0d1392664decd3169740baf90661710'
'877f93db1550ea81386aae7c3b578442'
- '9d9f62f05a967a5926df496e86404148')
+ '9d9f62f05a967a5926df496e86404148'
+ '94563e3023d804341f1d252c0e6d1384')
prepare() {
cd ${pkgname}-${pkgver}
@@ -31,6 +33,7 @@ prepare() {
patch -Np1 -i "${srcdir}/vice-2.4-no-fc-cache-no-lib64.patch"
patch -Np1 -i "${srcdir}/vice-2.4-notexi-notxt.patch"
patch -Np1 -i "${srcdir}/vice-2.4-zlib-1.2.7.patch"
+ patch -Np1 -i "${srcdir}/vice-2.4-giflib-5.1.0.patch"
sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.in
diff --git a/extra/vice/vice-2.4-giflib-5.1.0.patch b/extra/vice/vice-2.4-giflib-5.1.0.patch
new file mode 100644
index 000000000..be1caa898
--- /dev/null
+++ b/extra/vice/vice-2.4-giflib-5.1.0.patch
@@ -0,0 +1,39 @@
+diff -rupN a/src/gfxoutputdrv/gifdrv.c b/src/gfxoutputdrv/gifdrv.c
+--- a/src/gfxoutputdrv/gifdrv.c 2012-07-25 23:46:05.000000000 +0000
++++ b/src/gfxoutputdrv/gifdrv.c 2014-06-01 11:48:40.493722851 +0000
+@@ -114,7 +114,7 @@ static int gifdrv_open(screenshot_t *scr
+ if (EGifPutScreenDesc(sdata->fd, screenshot->width, screenshot->height, 8, 0, gif_colors) == GIF_ERROR ||
+ EGifPutImageDesc(sdata->fd, 0, 0, screenshot->width, screenshot->height, 0, NULL) == GIF_ERROR)
+ {
+- EGifCloseFile(sdata->fd);
++ EGifCloseFile(sdata->fd, NULL);
+ VICE_FreeMapObject(gif_colors);
+ lib_free(sdata->data);
+ lib_free(sdata->ext_filename);
+@@ -145,7 +145,7 @@ static int gifdrv_close(screenshot_t *sc
+
+ sdata = screenshot->gfxoutputdrv_data;
+
+- EGifCloseFile(sdata->fd);
++ EGifCloseFile(sdata->fd, NULL);
+ VICE_FreeMapObject(gif_colors);
+
+ /* for some reason giflib will create a file with unexpected
+@@ -184,7 +184,7 @@ static char *gifdrv_memmap_ext_filename;
+
+ static int gifdrv_close_memmap(void)
+ {
+- EGifCloseFile(gifdrv_memmap_fd);
++ EGifCloseFile(gifdrv_memmap_fd, NULL);
+ VICE_FreeMapObject(gif_colors);
+ lib_free(gifdrv_memmap_ext_filename);
+
+@@ -231,7 +231,7 @@ static int gifdrv_open_memmap(const char
+ if (EGifPutScreenDesc(gifdrv_memmap_fd, x_size, y_size, 8, 0, gif_colors) == GIF_ERROR ||
+ EGifPutImageDesc(gifdrv_memmap_fd, 0, 0, x_size, y_size, 0, NULL) == GIF_ERROR)
+ {
+- EGifCloseFile(gifdrv_memmap_fd);
++ EGifCloseFile(gifdrv_memmap_fd, NULL);
+ VICE_FreeMapObject(gif_colors);
+ lib_free(gifdrv_memmap_ext_filename);
+ return -1;
diff --git a/extra/windowmaker/PKGBUILD b/extra/windowmaker/PKGBUILD
index 08a557b18..4fa5e3a6a 100644
--- a/extra/windowmaker/PKGBUILD
+++ b/extra/windowmaker/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 204765 2014-01-26 14:35:19Z andyrtr $
+# $Id: PKGBUILD 215171 2014-06-14 19:17:25Z andyrtr $
# Maintainer: Daniel Isenmann <daniel@archlinux.org>
# Contributor: Judd Vinet <jvinet@zeroflux.org>
pkgname=windowmaker
pkgver=0.95.5
-pkgrel=3
+pkgrel=4
pkgdesc="An X11 window manager with a NEXTSTEP look and feel"
arch=('i686' 'x86_64')
url="http://www.windowmaker.org/"
@@ -12,14 +12,20 @@ license=('GPL' 'custom')
depends=('libxinerama' 'libxrandr' 'libxmu' 'libpng' 'libxpm' 'libxft' 'libtiff' 'giflib')
source=(http://windowmaker.org/pub/source/release/WindowMaker-$pkgver.tar.gz
wmaker.desktop
- wm-giflib.patch)
+ wm-giflib.patch
+ giflib_510.diff)
md5sums=('19e9cc256ccb7075ff82f4b809df3a0a'
'2fba97bebfd691836b92b8f0db79ff13'
- '05d8e98fb579f2fa5a097b629374e6b8')
+ '05d8e98fb579f2fa5a097b629374e6b8'
+ '9eee694ecec55a5185e421bac9170344')
prepare() {
cd WindowMaker-$pkgver
- patch -Np0 -i ../wm-giflib.patch
+ #patch -Np0 -i ../wm-giflib.patch
+
+ # patch taken from NetBSD
+ patch -Np0 -i ../giflib_510.diff
+
autoreconf -fi
# fix some paths FS#3080 - ckeck also Gentoo ebuild
diff --git a/extra/windowmaker/giflib_510.diff b/extra/windowmaker/giflib_510.diff
new file mode 100644
index 000000000..ffc6ec779
--- /dev/null
+++ b/extra/windowmaker/giflib_510.diff
@@ -0,0 +1,54 @@
+$NetBSD: patch-wrlib_gif.c,v 1.2 2014/05/16 09:29:39 tron Exp $
+
+Fix build with giflib 5.1 and newer.
+
+--- wrlib/gif.c.orig 2013-09-12 22:43:54.000000000 +0100
++++ wrlib/gif.c 2014-05-16 10:10:04.000000000 +0100
+@@ -52,6 +52,7 @@
+ unsigned char rmap[256];
+ unsigned char gmap[256];
+ unsigned char bmap[256];
++ int gif_error;
+
+ if (index < 0)
+ index = 0;
+@@ -59,10 +60,10 @@
+ /* default error message */
+ RErrorCode = RERR_BADINDEX;
+
+- gif = DGifOpenFileName(file);
++ gif = DGifOpenFileName(file, &gif_error);
+
+ if (!gif) {
+- switch (GifLastError()) {
++ switch (gif_error) {
+ case D_GIF_ERR_OPEN_FAILED:
+ RErrorCode = RERR_OPEN;
+ break;
+@@ -77,7 +78,7 @@
+ }
+
+ if (gif->SWidth < 1 || gif->SHeight < 1) {
+- DGifCloseFile(gif);
++ DGifCloseFile(gif, NULL);
+ RErrorCode = RERR_BADIMAGEFILE;
+ return NULL;
+ }
+@@ -199,7 +200,7 @@
+ /* yuck! */
+ goto did_not_get_any_errors;
+ giferr:
+- switch (GifLastError()) {
++ switch (gif->Error) {
+ case D_GIF_ERR_OPEN_FAILED:
+ RErrorCode = RERR_OPEN;
+ break;
+@@ -220,7 +221,7 @@
+ free(buffer);
+
+ if (gif)
+- DGifCloseFile(gif);
++ DGifCloseFile(gif, NULL);
+
+ return image;
+ }
diff --git a/extra/xcb-util-renderutil/PKGBUILD b/extra/xcb-util-renderutil/PKGBUILD
index b6efdc470..a73f9ff35 100644
--- a/extra/xcb-util-renderutil/PKGBUILD
+++ b/extra/xcb-util-renderutil/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 198494 2013-10-30 15:12:17Z allan $
+# $Id: PKGBUILD 215097 2014-06-13 17:16:50Z andyrtr $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
pkgname=xcb-util-renderutil
-pkgver=0.3.8
+pkgver=0.3.9
pkgrel=1
pkgdesc="Utility libraries for XC Binding - Convenience functions for the Render extension"
arch=('i686' 'x86_64')
@@ -13,22 +13,22 @@ depends=('libxcb>=1.7')
makedepends=('xorg-util-macros')
source=("http://xcb.freedesktop.org/dist/${pkgname}-${pkgver}.tar.bz2"
'LICENSE')
-md5sums=('b346ff598ee093c141f836fbc0f8f721'
- '2672c2e72dedb40f773e989dd622f298')
+sha256sums=('c6e97e48fb1286d6394dddb1c1732f00227c70bd1bedb7d1acabefdd340bea5b'
+ 'ded299aa179dcf0d885bf89274a4db77a530e03f9f5e7cf1c3c4ef1d60e914b9')
build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd ${pkgname}-${pkgver}
./configure --prefix=/usr --disable-static
make
}
check() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd ${pkgname}-${pkgver}
make check
}
package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd ${pkgname}-${pkgver}
make DESTDIR="${pkgdir}" install
install -D -m644 "${srcdir}/LICENSE" \
diff --git a/extra/xf86-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD
index a72065549..7513ad375 100644
--- a/extra/xf86-video-intel/PKGBUILD
+++ b/extra/xf86-video-intel/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 209836 2014-04-05 17:16:44Z lcarlier $
+# $Id: PKGBUILD 215142 2014-06-14 17:44:53Z andyrtr $
# Maintainer: AndyRTR <andyrtr@archlinux.org>
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=xf86-video-intel
-pkgver=2.99.911
-pkgrel=2
+pkgver=2.99.912
+pkgrel=1
arch=(i686 x86_64)
url="http://xorg.freedesktop.org/"
license=('custom')
@@ -23,16 +23,8 @@ provides=('xf86-video-intel-uxa' 'xf86-video-intel-sna')
conflicts=('xorg-server<1.15.0' 'X-ABI-VIDEODRV_VERSION<15' 'X-ABI-VIDEODRV_VERSION>=16'
'xf86-video-intel-sna' 'xf86-video-intel-uxa' 'xf86-video-i810' 'xf86-video-intel-legacy')
groups=('xorg-drivers' 'xorg')
-source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2
- sna-avoid-discarding-damage.patch)
-sha256sums=('4e7a68491bcc4d49912c5ec3ee688badce3f929ce1b7618ede9d8001827270d6'
- '122637d66a70d40b098b0bb732000c8227ea1dd155af0c71f605f87934822dcb')
-
-prepare() {
- cd ${pkgname}-${pkgver}
- # Fix FS#39747 (merged upstream)
- patch -Np1 -i ../sna-avoid-discarding-damage.patch
-}
+source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('7c8ffc492d59f34cac64093deb70717b4d9223cf416ecc6fa016ab2e8bde9501')
build() {
cd ${pkgname}-${pkgver}
diff --git a/extra/xf86-video-intel/sna-avoid-discarding-damage.patch b/extra/xf86-video-intel/sna-avoid-discarding-damage.patch
deleted file mode 100644
index 8e97ee591..000000000
--- a/extra/xf86-video-intel/sna-avoid-discarding-damage.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-From 3310ee89c1f1a663de5f5b12b8125809a213996f Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Sat, 05 Apr 2014 11:18:31 +0000
-Subject: sna: Avoid discarding damage when applying WHOLE hint to pixmap migration
-
-Once again, we must be careful when promoting from a region to whole
-pixmap migration that we do not discard required damage.
-
-Fixes regression from
-commit 27ac9f574f65cbd535751c925e9b2e2d7c8a6b3a [2.99.911]
-Author: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Thu Feb 27 08:33:52 2014 +0000
-
- sna: Avoid promoting region-to-whole migration and discarding damage
-
-Reported-by: gedgon@gmail.com
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=77063
-Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
----
-diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
-index 0116d54..71ba34d 100644
---- a/src/sna/sna_accel.c
-+++ b/src/sna/sna_accel.c
-@@ -2500,7 +2500,10 @@ sna_drawable_move_region_to_cpu(DrawablePtr drawable,
- flags |= MOVE_INPLACE_HINT;
- }
-
-- if (flags & MOVE_WHOLE_HINT && priv->gpu_damage == NULL)
-+ if ((flags & (MOVE_WHOLE_HINT | MOVE_READ)) == (MOVE_WHOLE_HINT | MOVE_READ))
-+ return _sna_pixmap_move_to_cpu(pixmap, flags);
-+
-+ if (flags & MOVE_WHOLE_HINT && priv->gpu_damage == NULL && priv->cpu_damage == NULL)
- return _sna_pixmap_move_to_cpu(pixmap, flags);
-
- if (priv->gpu_damage == NULL &&
-@@ -2527,22 +2530,18 @@ sna_drawable_move_region_to_cpu(DrawablePtr drawable,
- return _sna_pixmap_move_to_cpu(pixmap, flags);
- }
-
-- if ((flags & MOVE_READ) == 0 &&
-- priv->gpu_damage &&
-- region_subsumes_damage(region, priv->gpu_damage)) {
-- DBG(("%s: region [(%d, %d), (%d, %d)] subsumes damage [(%d,%d), (%d, %d)]\n",
-+ if (flags & MOVE_WHOLE_HINT) {
-+ DBG(("%s: region (%d, %d), (%d, %d) marked with WHOLE hint, pixmap %dx%d\n",
- __FUNCTION__,
- region->extents.x1,
- region->extents.y1,
- region->extents.x2,
- region->extents.y2,
-- priv->gpu_damage->extents.x1,
-- priv->gpu_damage->extents.y1,
-- priv->gpu_damage->extents.x2,
-- priv->gpu_damage->extents.y2));
-+ pixmap->drawable.width,
-+ pixmap->drawable.height));
- if (dx | dy)
- RegionTranslate(region, -dx, -dy);
-- return _sna_pixmap_move_to_cpu(pixmap, flags);
-+ return _sna_pixmap_move_to_cpu(pixmap, flags | MOVE_READ);
- }
-
- if (priv->move_to_gpu && !priv->move_to_gpu(sna, priv, MOVE_READ)) {
-@@ -4471,17 +4470,19 @@ try_upload_tiled_x(PixmapPtr pixmap, RegionRec *region,
- if (wedged(sna))
- return false;
-
-- DBG(("%s: bo? %d, can map? %d\n", __FUNCTION__,
-- priv->gpu_bo != NULL,
-- priv->gpu_bo ? kgem_bo_can_map__cpu(&sna->kgem, priv->gpu_bo, true) : 0));
--
- replaces = region->data == NULL &&
- w >= pixmap->drawable.width &&
- h >= pixmap->drawable.height;
-
-+ DBG(("%s: bo? %d, can map? %d, replaces? %d\n", __FUNCTION__,
-+ priv->gpu_bo != NULL,
-+ priv->gpu_bo ? kgem_bo_can_map__cpu(&sna->kgem, priv->gpu_bo, true) : 0,
-+ replaces));
-+
- if (priv->gpu_bo && (replaces || priv->gpu_bo->proxy)) {
- DBG(("%s: discarding cached upload proxy\n", __FUNCTION__));
- sna_pixmap_free_gpu(sna, priv);
-+ replaces = true; /* Mark it all GPU damaged afterwards */
- }
- assert(priv->gpu_bo == NULL || priv->gpu_bo->proxy == NULL);
-
-@@ -4616,8 +4617,11 @@ sna_put_zpixmap_blt(DrawablePtr drawable, GCPtr gc, RegionPtr region,
- return true;
-
- hint = MOVE_WRITE;
-- if (w == pixmap->drawable.width && h*stride > 4096)
-+ if (w == pixmap->drawable.width && (h+1)*stride > 65536) {
-+ DBG(("%s: large upload (%d bytes), marking WHOLE_HINT\n",
-+ __FUNCTION__, h*stride));
- hint |= MOVE_WHOLE_HINT;
-+ }
-
- if (!sna_drawable_move_region_to_cpu(&pixmap->drawable, region, hint))
- return false;
---
-cgit v0.9.0.2-2-gbebe
-