summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--kernels/linux-libre-lts-knock/0001-x86-x32-Correct-invalid-use-of-user-timespec-in-the-.patch80
-rw-r--r--kernels/linux-libre-lts-knock/PKGBUILD17
-rw-r--r--kernels/linux-libre-rt/PKGBUILD12
-rw-r--r--libre-multilib/lib32-mesa-libcl/PKGBUILD7
-rw-r--r--libre-multilib/pcsx2-libre/PKGBUILD22
-rw-r--r--libre-multilib/wine-libre/PKGBUILD16
-rw-r--r--libre-testing/linux-libre/0001-quirk-asm_volatile_goto.patch51
-rw-r--r--libre-testing/linux-libre/0001-x86-x32-Correct-invalid-use-of-user-timespec-in-the-.patch80
-rw-r--r--libre-testing/linux-libre/ChangeLog23
-rw-r--r--libre-testing/linux-libre/PKGBUILD22
-rw-r--r--libre/acpi_call-libre-lts/PKGBUILD12
-rw-r--r--libre/blender-libre/PKGBUILD88
-rw-r--r--libre/calibre-libre/PKGBUILD20
-rw-r--r--libre/calibre-libre/desktop_integration.patch21
-rw-r--r--libre/cups-filters-libre/PKGBUILD8
-rw-r--r--libre/ecasound-libre/PKGBUILD6
-rw-r--r--libre/enscript/PKGBUILD32
-rw-r--r--libre/epdfview-libre/PKGBUILD56
-rw-r--r--libre/epdfview-libre/epdfview-0.1.8-glib2-headers.patch (renamed from libre/epdfview-libre/glib2_headers.patch)5
-rw-r--r--libre/epdfview-libre/epdfview-0.1.8-modern-cups.patch74
-rw-r--r--libre/epdfview-libre/epdfview-0.1.8-swap-the-blue-and-red-channel.patch (renamed from libre/epdfview-libre/0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch)0
-rw-r--r--libre/epdfview-libre/epdfview.desktop.patch11
-rw-r--r--libre/filesystem/PKGBUILD5
-rw-r--r--libre/grub/PKGBUILD2
-rw-r--r--libre/gst-plugins-bad-libre/PKGBUILD8
-rw-r--r--libre/gummiboot/PKGBUILD2
-rw-r--r--libre/hardinfo/PKGBUILD4
-rw-r--r--libre/icecat-adblock-plus/PKGBUILD35
-rw-r--r--libre/icecat-firebug/PKGBUILD30
-rw-r--r--libre/icecat-noscript/PKGBUILD6
-rw-r--r--libre/icecat-raismth/PKGBUILD28
-rw-r--r--libre/icecat-spell-ru/PKGBUILD31
-rw-r--r--libre/icedove-l10n/PKGBUILD191
-rw-r--r--libre/icedove-libre/PKGBUILD22
-rw-r--r--libre/iceweasel-adblock-plus/PKGBUILD35
-rw-r--r--libre/iceweasel-firebug/PKGBUILD30
-rw-r--r--libre/iceweasel-l10n/PKGBUILD251
-rw-r--r--libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch4
-rw-r--r--libre/iceweasel-libre/PKGBUILD24
-rw-r--r--libre/iceweasel-libre/libre.patch435
-rw-r--r--libre/iceweasel-noscript/PKGBUILD6
-rw-r--r--libre/iceweasel-raismth/PKGBUILD28
-rw-r--r--libre/iceweasel-spell-ru/PKGBUILD31
-rw-r--r--libre/jquery-ui/PKGBUILD31
-rw-r--r--libre/jquery/PKGBUILD29
-rw-r--r--libre/kdebase-konqueror-libre/PKGBUILD6
-rw-r--r--libre/kdebase-runtime-libre/PKGBUILD8
-rw-r--r--libre/kdelibs-libre/PKGBUILD6
-rw-r--r--libre/kdenetwork-kopete-libre/PKGBUILD6
-rw-r--r--libre/kdepim-libre/PKGBUILD6
-rw-r--r--libre/kdeutils-ark-libre/PKGBUILD6
-rw-r--r--libre/libretools/PKGBUILD6
-rw-r--r--libre/linux-libre-api-headers/PKGBUILD12
-rw-r--r--libre/linux-libre-lts/0001-x86-x32-Correct-invalid-use-of-user-timespec-in-the-.patch80
-rw-r--r--libre/linux-libre-lts/PKGBUILD17
-rw-r--r--libre/linux-libre/ChangeLog23
-rw-r--r--libre/lsb-release/PKGBUILD2
-rw-r--r--libre/lsb-release/lsb-release.install2
-rw-r--r--libre/mate-document-viewer-libre/PKGBUILD4
-rw-r--r--libre/mate-file-archiver-libre/PKGBUILD4
-rw-r--r--libre/mesa-libcl/PKGBUILD4
-rw-r--r--libre/mkisolinux/PKGBUILD2
-rw-r--r--libre/mkpxelinux/PKGBUILD2
-rw-r--r--libre/mksyslinux/PKGBUILD2
-rw-r--r--libre/mozilla-searchplugins/PKGBUILD8
-rw-r--r--libre/mozilla-searchplugins/duckduckgo-html.xml17
-rw-r--r--libre/mozilla-searchplugins/duckduckgo-lite.xml17
-rw-r--r--libre/netsurf-libre/PKGBUILD14
-rw-r--r--libre/netsurf-libre/netsurf.install1
-rw-r--r--libre/netsurf-libre/netsurf.sh2
-rw-r--r--libre/openimageio/PKGBUILD2
-rw-r--r--libre/openshadinglanguage/PKGBUILD100
-rw-r--r--libre/openshadinglanguage/llvm.patch331
-rw-r--r--libre/psi/PKGBUILD4
-rw-r--r--libre/psi/parabola.patch5
-rw-r--r--libre/reflector/PKGBUILD2
-rw-r--r--libre/syslinux/PKGBUILD2
-rw-r--r--libre/tp_smapi-libre-lts/PKGBUILD4
-rw-r--r--libre/usermin/PKGBUILD2
-rw-r--r--libre/vim/PKGBUILD227
-rw-r--r--libre/vim/gvim.desktop63
-rw-r--r--libre/vim/gvim.install11
-rw-r--r--libre/vim/parabola.vim27
-rw-r--r--libre/vim/vimrc16
-rw-r--r--libre/webmin/PKGBUILD2
-rw-r--r--libre/xsp/PKGBUILD2
-rw-r--r--nonprism/bti-nonprism/PKGBUILD24
-rw-r--r--nonprism/bti-nonprism/nonprism.patch222
-rw-r--r--nonprism/claws-mail-nonprism/PKGBUILD6
-rw-r--r--nonprism/darktable-nonprism/PKGBUILD17
-rw-r--r--nonprism/duplicity-nonprism/PKGBUILD17
-rw-r--r--nonprism/duplicity-nonprism/gpg-encode.patch216
-rw-r--r--nonprism/evolution-data-server-nonprism/PKGBUILD6
-rw-r--r--nonprism/grilo-plugins-nonprism/PKGBUILD27
-rw-r--r--nonprism/icedove-libre-nonprism/PKGBUILD22
-rw-r--r--nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD6
-rw-r--r--nonprism/kdepim-runtime-nonprism/PKGBUILD6
-rw-r--r--nonprism/pidgin-nonprism/PKGBUILD15
-rw-r--r--nonprism/pidgin-nonprism/pidgin-2.10.8-fix-login-issues-with-certain-xmpp-servers.patch145
-rw-r--r--pcr/gnuhealth/PKGBUILD8
-rw-r--r--pcr/ocsync/PKGBUILD21
-rw-r--r--pcr/owncloud-app-roundcube/PKGBUILD20
-rw-r--r--pcr/owncloud-client/PKGBUILD17
-rw-r--r--pcr/pdsh/PKGBUILD33
-rw-r--r--pcr/perspectives-server/PKGBUILD51
-rw-r--r--pcr/perspectives-server/perspectives-server.conf17
-rw-r--r--pcr/perspectives-server/perspectives-server.cron7
-rw-r--r--pcr/perspectives-server/perspectives-server.install27
-rw-r--r--pcr/perspectives-server/perspectives-server.service14
-rw-r--r--pcr/python-lirc/PKGBUILD28
-rw-r--r--pcr/python2-sql/PKGBUILD20
-rw-r--r--pcr/roundcube-carddav/PKGBUILD24
-rw-r--r--pcr/roundcube-rcguard-plugin-git/PKGBUILD32
-rw-r--r--pcr/trytond-account-invoice/PKGBUILD6
-rw-r--r--pcr/trytond-account-product/PKGBUILD2
-rw-r--r--pcr/trytond-account/PKGBUILD7
-rw-r--r--pcr/trytond-calendar/PKGBUILD9
-rw-r--r--pcr/trytond-company/PKGBUILD7
-rw-r--r--pcr/trytond-country/PKGBUILD7
-rw-r--r--pcr/trytond-currency/PKGBUILD7
-rw-r--r--pcr/trytond-party/PKGBUILD7
-rw-r--r--pcr/trytond-product/PKGBUILD7
-rw-r--r--pcr/trytond-stock-lot/PKGBUILD7
-rw-r--r--pcr/trytond-stock/PKGBUILD9
-rw-r--r--pcr/trytond/PKGBUILD10
-rw-r--r--pcr/ums/PKGBUILD63
-rw-r--r--pcr/youtube-dl-current/PKGBUILD4
-rw-r--r--~emulatorman/nodejs-grunt-cli/PKGBUILD25
-rw-r--r--~emulatorman/nodejs-grunt-cli/nodejs-grunt-cli.install63
-rw-r--r--~emulatorman/nodejs-grunt/PKGBUILD30
130 files changed, 2753 insertions, 1553 deletions
diff --git a/kernels/linux-libre-lts-knock/0001-x86-x32-Correct-invalid-use-of-user-timespec-in-the-.patch b/kernels/linux-libre-lts-knock/0001-x86-x32-Correct-invalid-use-of-user-timespec-in-the-.patch
deleted file mode 100644
index 3f1bccc80..000000000
--- a/kernels/linux-libre-lts-knock/0001-x86-x32-Correct-invalid-use-of-user-timespec-in-the-.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 2def2ef2ae5f3990aabdbe8a755911902707d268 Mon Sep 17 00:00:00 2001
-From: PaX Team <pageexec@freemail.hu>
-Date: Thu, 30 Jan 2014 16:59:25 -0800
-Subject: [PATCH] x86, x32: Correct invalid use of user timespec in the kernel
-
-The x32 case for the recvmsg() timout handling is broken:
-
- asmlinkage long compat_sys_recvmmsg(int fd, struct compat_mmsghdr __user *mmsg,
- unsigned int vlen, unsigned int flags,
- struct compat_timespec __user *timeout)
- {
- int datagrams;
- struct timespec ktspec;
-
- if (flags & MSG_CMSG_COMPAT)
- return -EINVAL;
-
- if (COMPAT_USE_64BIT_TIME)
- return __sys_recvmmsg(fd, (struct mmsghdr __user *)mmsg, vlen,
- flags | MSG_CMSG_COMPAT,
- (struct timespec *) timeout);
- ...
-
-The timeout pointer parameter is provided by userland (hence the __user
-annotation) but for x32 syscalls it's simply cast to a kernel pointer
-and is passed to __sys_recvmmsg which will eventually directly
-dereference it for both reading and writing. Other callers to
-__sys_recvmmsg properly copy from userland to the kernel first.
-
-The bug was introduced by commit ee4fa23c4bfc ("compat: Use
-COMPAT_USE_64BIT_TIME in net/compat.c") and should affect all kernels
-since 3.4 (and perhaps vendor kernels if they backported x32 support
-along with this code).
-
-Note that CONFIG_X86_X32_ABI gets enabled at build time and only if
-CONFIG_X86_X32 is enabled and ld can build x32 executables.
-
-Other uses of COMPAT_USE_64BIT_TIME seem fine.
-
-This addresses CVE-2014-0038.
-
-Signed-off-by: PaX Team <pageexec@freemail.hu>
-Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
-Cc: <stable@vger.kernel.org> # v3.4+
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
----
- net/compat.c | 9 ++-------
- 1 file changed, 2 insertions(+), 7 deletions(-)
-
-diff --git a/net/compat.c b/net/compat.c
-index dd32e34..f50161f 100644
---- a/net/compat.c
-+++ b/net/compat.c
-@@ -780,21 +780,16 @@ asmlinkage long compat_sys_recvmmsg(int fd, struct compat_mmsghdr __user *mmsg,
- if (flags & MSG_CMSG_COMPAT)
- return -EINVAL;
-
-- if (COMPAT_USE_64BIT_TIME)
-- return __sys_recvmmsg(fd, (struct mmsghdr __user *)mmsg, vlen,
-- flags | MSG_CMSG_COMPAT,
-- (struct timespec *) timeout);
--
- if (timeout == NULL)
- return __sys_recvmmsg(fd, (struct mmsghdr __user *)mmsg, vlen,
- flags | MSG_CMSG_COMPAT, NULL);
-
-- if (get_compat_timespec(&ktspec, timeout))
-+ if (compat_get_timespec(&ktspec, timeout))
- return -EFAULT;
-
- datagrams = __sys_recvmmsg(fd, (struct mmsghdr __user *)mmsg, vlen,
- flags | MSG_CMSG_COMPAT, &ktspec);
-- if (datagrams > 0 && put_compat_timespec(&ktspec, timeout))
-+ if (datagrams > 0 && compat_put_timespec(&ktspec, timeout))
- datagrams = -EFAULT;
-
- return datagrams;
---
-1.8.5.3
-
diff --git a/kernels/linux-libre-lts-knock/PKGBUILD b/kernels/linux-libre-lts-knock/PKGBUILD
index d008ca244..e0dceb622 100644
--- a/kernels/linux-libre-lts-knock/PKGBUILD
+++ b/kernels/linux-libre-lts-knock/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 204934 2014-01-31 16:13:52Z bpiotrowski $
+# $Id: PKGBUILD 205955 2014-02-14 20:17:56Z andyrtr $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Maintainer: Thomas Baechler <thomas@archlinux.org>
# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
@@ -10,11 +10,11 @@
pkgbase=linux-libre-lts-knock # Build stock -LIBRE-LTS-KNOCK kernel
#pkgbase=linux-libre-custom # Build kernel with a different name
_basekernel=3.10
-_sublevel=28
+_sublevel=30
_knockpatchver=${_basekernel}
pkgver=${_basekernel}.${_sublevel}
-pkgrel=1.1
-_lxopkgver=${_basekernel}.28 # nearly always the same as pkgver
+pkgrel=1
+_lxopkgver=${_basekernel}.30 # nearly always the same as pkgver
arch=('i686' 'x86_64' 'mips64el')
url="http://linux-libre.fsfla.org/"
license=('GPL2')
@@ -32,10 +32,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
'boot-logo.patch'
'change-default-console-loglevel.patch'
'criu-no-expert.patch'
- '0001-x86-x32-Correct-invalid-use-of-user-timespec-in-the-.patch'
"http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.xz")
md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c'
- '1eeedf694bd64b34a031ac27549bc7a3'
+ 'fa8d8ba21bf5a6fad7edea6b158fd05c'
'26380d6f05471ef8e065a77d87588009'
'f22e0a6a7634902f5a00eb25ad677c65'
'6550ba0e23b7729cd9db2475bde8fac2'
@@ -45,8 +44,7 @@ md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c'
'04b21c79df0a952c22d681dd4f4562df'
'f3def2cefdcbb954c21d8505d23cc83c'
'd50c1ac47394e9aec637002ef3392bd1'
- '336d2c4afd7ee5f2bdf0dcb1a54df4b2'
- 'cec0d90f5d3fae8752b0020c6b785954')
+ '8e0bb5cbd34b0e7391049eba25d135be')
if [ "$CARCH" != "mips64el" ]; then
# don't use the Loongson-specific patches on non-mips64el arches.
unset source[${#source[@]}-1]
@@ -81,9 +79,6 @@ prepare() {
# patch from fedora
patch -Np1 -i "${srcdir}/criu-no-expert.patch"
- # CVE-2014-0038
- patch -Np1 -i "${srcdir}/0001-x86-x32-Correct-invalid-use-of-user-timespec-in-the-.patch"
-
if [ "$CARCH" == "mips64el" ]; then
sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre-lts-knock|" Makefile
sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \
diff --git a/kernels/linux-libre-rt/PKGBUILD b/kernels/linux-libre-rt/PKGBUILD
index 1e0b6dd5c..863bfd637 100644
--- a/kernels/linux-libre-rt/PKGBUILD
+++ b/kernels/linux-libre-rt/PKGBUILD
@@ -9,12 +9,12 @@
pkgbase=linux-libre-rt # Build stock -LIBRE-RT kernel
#pkgbase=linux-libre-custom # Build kernel with a different name
_basekernel=3.12
-_releasever=8
-_rtpatchver=rt11
+_releasever=10
+_rtpatchver=rt15
_pkgver=${_basekernel}.${_releasever}
pkgver=${_basekernel}.${_releasever}_${_rtpatchver}
pkgrel=1
-_lxopkgver=${_basekernel}.8 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.10 # nearly always the same as pkgver
arch=('i686' 'x86_64' 'mips64el')
url="http://linux-libre.fsfla.org/"
license=('GPL2')
@@ -40,8 +40,8 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
'rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-notification-fails.patch'
"http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
md5sums=('254f59707b6676b59ce5ca5c3c698319'
- '392f920129940c4f83c7d204468213f3'
- '4fcc03762fbc78465951b57ccd0b5a9b'
+ 'fb31503633d3378480cacde9d164b3ca'
+ '400e066dbfd3a7c8eb2da558a1047ba8'
'e40789b1e59136235827a3b3bf40c121'
'bf542c4038d3e7d0da4c92bac0466198'
'82496e68851d1960543a07ba51cdb44a'
@@ -56,7 +56,7 @@ md5sums=('254f59707b6676b59ce5ca5c3c698319'
'cec0bb8981936eab2943b2009b7a6fff'
'88d9cddf9e0050a76ec4674f264fb2a1'
'cb9016630212ef07b168892fbcfd4e5d'
- '0569e96c071703cc244f1ea7ee87d40a')
+ '88c9ba7ea767ed8ae2d3cb5d887e2e70')
if [ "$CARCH" != "mips64el" ]; then
# don't use the Loongson-specific patches on non-mips64el arches.
unset source[${#source[@]}-1]
diff --git a/libre-multilib/lib32-mesa-libcl/PKGBUILD b/libre-multilib/lib32-mesa-libcl/PKGBUILD
index 77a06620d..b42ffa874 100644
--- a/libre-multilib/lib32-mesa-libcl/PKGBUILD
+++ b/libre-multilib/lib32-mesa-libcl/PKGBUILD
@@ -5,8 +5,8 @@ pkgbase=mesa
_pkgname=libcl
pkgname=lib32-$pkgbase-$_pkgname
_pkgflag=libre
-pkgver=10.0.2
-pkgrel=2
+pkgver=10.0.3
+pkgrel=1
pkgdesc='Mesa 3-D OpenCL library (32-bit)'
url=http://${pkgbase}3d.sourceforge.net
license=(MIT Khronos LGPL)
@@ -17,6 +17,7 @@ depends=(
)
optdepends='opencl-headers: headers necessary for OpenCL development'
makedepends=(
+ gcc-multilib
lib32-clang
dri2proto
glproto
@@ -29,7 +30,7 @@ provides=(lib32-$_pkgname-$_pkgflag lib32-$_pkgname lib32-opencl-nvidia lib32-op
conflicts=(lib32-$_pkgname-$_pkgflag lib32-$_pkgname lib32-opencl-nvidia lib32-opencl-nvidia-304xx)
replaces=(lib32-$_pkgname-$_pkgflag lib32-$_pkgname lib32-opencl-nvidia lib32-opencl-nvidia-304xx)
source=ftp://ftp.freedesktop.org/pub/$pkgbase/${pkgver%.0}/${pkgbase^}Lib-$pkgver.tar.bz2
-sha512sums=15741b916e6338645a28961fb7a731f8c2a33afe11e91c0bd144f9d9afca96837c9caf7fb2fd769aedbeba2b8b12443e7a7eb8ab6cd2270024308ca11e88ff24
+sha512sums=e864c4d63336977b2917d83926331163198d47023228cc71f47c67251f675102dbab4551e032aa1dfcb4cbda1f98f15ff4565acef54a33ed8c50af32f52a52da
build() {
cd $srcdir/${pkgbase^}-$pkgver
diff --git a/libre-multilib/pcsx2-libre/PKGBUILD b/libre-multilib/pcsx2-libre/PKGBUILD
index 9331100aa..1be2e2cb6 100644
--- a/libre-multilib/pcsx2-libre/PKGBUILD
+++ b/libre-multilib/pcsx2-libre/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 103474 2014-01-06 14:09:29Z alucryd $
+# $Id: PKGBUILD 105845 2014-02-16 10:30:11Z alucryd $
# Maintainer: Maxime Gauduin <alucryd@gmail.com>
# Contributor: josephgbr <rafael.f.f1@gmail.com>
# Contributor: vEX <vex@niechift.com>
_pkgname=pcsx2
pkgname=$_pkgname-libre
-pkgver=1.1.0.r5797
+pkgver=1.2.2
pkgrel=1
pkgdesc='A Sony PlayStation 2 emulator, without nonfree nvidia-cg-toolkit support'
arch=('i686' 'x86_64')
url='http://www.pcsx2.net'
-license=('GPL')
-makedepends=('cmake' 'sparsehash' 'svn')
+license=('GPL2' 'GPL3' 'LGPL2.1' 'LGPL3')
+makedepends=('cmake' 'sparsehash')
if [[ $CARCH == "i686" ]]; then
depends=('glew' 'libaio' 'libcanberra' 'libjpeg-turbo' 'portaudio' 'sdl2' 'soundtouch' 'wxgtk2.8')
elif [[ $CARCH == "x86_64" ]]; then
@@ -21,11 +21,17 @@ provides=("$_pkgname=$pkgver")
conflicts=("$_pkgname")
replaces=("$_pkgname")
options=('!emptydirs')
-source=("${_pkgname}::svn+http://pcsx2.googlecode.com/svn/trunk/#revision=${pkgver#*r}")
-sha256sums=('SKIP')
+source=("https://github.com/PCSX2/pcsx2/archive/v${pkgver}.tar.gz")
+sha256sums=('4fccef58098d099ffe955fadd5ceee78ed063ab585b8772f4242fd6dc5fd2d23')
+
+prepare() {
+ cd ${_pkgname}-${pkgver}
+ # remove Cg shader on ZZogl plugin
+ sed -i '\|zzogl-pg-cg| s|^|#|' plugins/CMakeLists.txt
+}
build() {
- cd ${_pkgname}
+ cd ${_pkgname}-${pkgver}
if [[ -d build ]]; then
rm -rf build
@@ -45,7 +51,7 @@ build() {
}
package() {
- cd ${_pkgname}/build
+ cd ${_pkgname}-${pkgver}/build
if [[ $CARCH == "x86_64" ]]; then
depends=('lib32-glew' 'lib32-libaio' 'lib32-libcanberra' 'lib32-libjpeg-turbo' 'lib32-portaudio' 'lib32-sdl2' 'lib32-soundtouch' 'lib32-wxgtk2.8')
diff --git a/libre-multilib/wine-libre/PKGBUILD b/libre-multilib/wine-libre/PKGBUILD
index d43177b74..89c5d4d14 100644
--- a/libre-multilib/wine-libre/PKGBUILD
+++ b/libre-multilib/wine-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 104338 2014-01-18 08:57:12Z bluewind $
+# $Id: PKGBUILD 105618 2014-02-12 02:15:42Z svenstaro $
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
# Contributor: Eduardo Romero <eduardo@archlinux.org>
@@ -7,14 +7,14 @@
_pkgname=wine
pkgname=wine-libre
-pkgver=1.7.11
-pkgrel=1
+pkgver=1.7.12
+pkgrel=2
_pkgbasever=${pkgver/rc/-rc}
source=(http://prdownloads.sourceforge.net/$_pkgname/$_pkgname-$_pkgbasever.tar.bz2{,.sign}
30-win32-aliases.conf)
-md5sums=('e0e55105e5c7ba5277023bd54ac60d44'
+md5sums=('ce32c886af1c8a4e824e8dc1a01c5703'
'SKIP'
'1ff4e467f59409272088d92173a0f801')
@@ -53,7 +53,7 @@ makedepends=(autoconf ncurses bison perl fontforge flex prelink
libxxf86vm lib32-libxxf86vm
libxml2 lib32-libxml2
libldap lib32-libldap
- lcms lib32-lcms
+ lcms2 lib32-lcms2
mpg123 lib32-mpg123
openal lib32-openal
v4l-utils lib32-v4l-utils
@@ -71,7 +71,7 @@ optdepends=(
libpng lib32-libpng
libldap lib32-libldap
gnutls lib32-gnutls
- lcms lib32-lcms
+ lcms2 lib32-lcms2
libxml2 lib32-libxml2
mpg123 lib32-mpg123
openal lib32-openal
@@ -101,6 +101,8 @@ else
replaces+=('bin32-wine')
fi
+depends=(${_depends[@]})
+
build() {
cd "$srcdir"
@@ -154,8 +156,6 @@ build() {
}
package() {
- depends=(${_depends[@]})
-
msg2 "Packaging Wine-32..."
cd "$srcdir/$_pkgname-32-build"
diff --git a/libre-testing/linux-libre/0001-quirk-asm_volatile_goto.patch b/libre-testing/linux-libre/0001-quirk-asm_volatile_goto.patch
new file mode 100644
index 000000000..c9ee40400
--- /dev/null
+++ b/libre-testing/linux-libre/0001-quirk-asm_volatile_goto.patch
@@ -0,0 +1,51 @@
+From a9f180345f5378ac87d80ed0bea55ba421d83859 Mon Sep 17 00:00:00 2001
+From: Steven Noonan <steven@uplinklabs.net>
+Date: Thu, 13 Feb 2014 07:01:07 +0000
+Subject: compiler/gcc4: Make quirk for asm_volatile_goto() unconditional
+
+I started noticing problems with KVM guest destruction on Linux
+3.12+, where guest memory wasn't being cleaned up. I bisected it
+down to the commit introducing the new 'asm goto'-based atomics,
+and found this quirk was later applied to those.
+
+Unfortunately, even with GCC 4.8.2 (which ostensibly fixed the
+known 'asm goto' bug) I am still getting some kind of
+miscompilation. If I enable the asm_volatile_goto quirk for my
+compiler, KVM guests are destroyed correctly and the memory is
+cleaned up.
+
+So make the quirk unconditional for now, until bug is found
+and fixed.
+
+Suggested-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Steven Noonan <steven@uplinklabs.net>
+Cc: Peter Zijlstra <peterz@infradead.org>
+Cc: Steven Rostedt <rostedt@goodmis.org>
+Cc: Jakub Jelinek <jakub@redhat.com>
+Cc: Richard Henderson <rth@twiddle.net>
+Cc: Andrew Morton <akpm@linux-foundation.org>
+Cc: Oleg Nesterov <oleg@redhat.com>
+Cc: <stable@vger.kernel.org>
+Link: http://lkml.kernel.org/r/1392274867-15236-1-git-send-email-steven@uplinklabs.net
+Link: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670
+Signed-off-by: Ingo Molnar <mingo@kernel.org>
+---
+diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h
+index ded4299..2507fd2 100644
+--- a/include/linux/compiler-gcc4.h
++++ b/include/linux/compiler-gcc4.h
+@@ -75,11 +75,7 @@
+ *
+ * (asm goto is automatically volatile - the naming reflects this.)
+ */
+-#if GCC_VERSION <= 40801
+-# define asm_volatile_goto(x...) do { asm goto(x); asm (""); } while (0)
+-#else
+-# define asm_volatile_goto(x...) do { asm goto(x); } while (0)
+-#endif
++#define asm_volatile_goto(x...) do { asm goto(x); asm (""); } while (0)
+
+ #ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP
+ #if GCC_VERSION >= 40400
+--
+cgit v0.9.2
diff --git a/libre-testing/linux-libre/0001-x86-x32-Correct-invalid-use-of-user-timespec-in-the-.patch b/libre-testing/linux-libre/0001-x86-x32-Correct-invalid-use-of-user-timespec-in-the-.patch
deleted file mode 100644
index 3f1bccc80..000000000
--- a/libre-testing/linux-libre/0001-x86-x32-Correct-invalid-use-of-user-timespec-in-the-.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 2def2ef2ae5f3990aabdbe8a755911902707d268 Mon Sep 17 00:00:00 2001
-From: PaX Team <pageexec@freemail.hu>
-Date: Thu, 30 Jan 2014 16:59:25 -0800
-Subject: [PATCH] x86, x32: Correct invalid use of user timespec in the kernel
-
-The x32 case for the recvmsg() timout handling is broken:
-
- asmlinkage long compat_sys_recvmmsg(int fd, struct compat_mmsghdr __user *mmsg,
- unsigned int vlen, unsigned int flags,
- struct compat_timespec __user *timeout)
- {
- int datagrams;
- struct timespec ktspec;
-
- if (flags & MSG_CMSG_COMPAT)
- return -EINVAL;
-
- if (COMPAT_USE_64BIT_TIME)
- return __sys_recvmmsg(fd, (struct mmsghdr __user *)mmsg, vlen,
- flags | MSG_CMSG_COMPAT,
- (struct timespec *) timeout);
- ...
-
-The timeout pointer parameter is provided by userland (hence the __user
-annotation) but for x32 syscalls it's simply cast to a kernel pointer
-and is passed to __sys_recvmmsg which will eventually directly
-dereference it for both reading and writing. Other callers to
-__sys_recvmmsg properly copy from userland to the kernel first.
-
-The bug was introduced by commit ee4fa23c4bfc ("compat: Use
-COMPAT_USE_64BIT_TIME in net/compat.c") and should affect all kernels
-since 3.4 (and perhaps vendor kernels if they backported x32 support
-along with this code).
-
-Note that CONFIG_X86_X32_ABI gets enabled at build time and only if
-CONFIG_X86_X32 is enabled and ld can build x32 executables.
-
-Other uses of COMPAT_USE_64BIT_TIME seem fine.
-
-This addresses CVE-2014-0038.
-
-Signed-off-by: PaX Team <pageexec@freemail.hu>
-Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
-Cc: <stable@vger.kernel.org> # v3.4+
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
----
- net/compat.c | 9 ++-------
- 1 file changed, 2 insertions(+), 7 deletions(-)
-
-diff --git a/net/compat.c b/net/compat.c
-index dd32e34..f50161f 100644
---- a/net/compat.c
-+++ b/net/compat.c
-@@ -780,21 +780,16 @@ asmlinkage long compat_sys_recvmmsg(int fd, struct compat_mmsghdr __user *mmsg,
- if (flags & MSG_CMSG_COMPAT)
- return -EINVAL;
-
-- if (COMPAT_USE_64BIT_TIME)
-- return __sys_recvmmsg(fd, (struct mmsghdr __user *)mmsg, vlen,
-- flags | MSG_CMSG_COMPAT,
-- (struct timespec *) timeout);
--
- if (timeout == NULL)
- return __sys_recvmmsg(fd, (struct mmsghdr __user *)mmsg, vlen,
- flags | MSG_CMSG_COMPAT, NULL);
-
-- if (get_compat_timespec(&ktspec, timeout))
-+ if (compat_get_timespec(&ktspec, timeout))
- return -EFAULT;
-
- datagrams = __sys_recvmmsg(fd, (struct mmsghdr __user *)mmsg, vlen,
- flags | MSG_CMSG_COMPAT, &ktspec);
-- if (datagrams > 0 && put_compat_timespec(&ktspec, timeout))
-+ if (datagrams > 0 && compat_put_timespec(&ktspec, timeout))
- datagrams = -EFAULT;
-
- return datagrams;
---
-1.8.5.3
-
diff --git a/libre-testing/linux-libre/ChangeLog b/libre-testing/linux-libre/ChangeLog
index 9020464ef..5259f3e89 100644
--- a/libre-testing/linux-libre/ChangeLog
+++ b/libre-testing/linux-libre/ChangeLog
@@ -1,8 +1,3 @@
-2013-10-20 André Silva <emulatorman@parabola.nu>
-
- * linux-libre-3.11.5-1
- * Replaced email account emulatorman@lavabit.com to emulatorman@parabola.nu.
-
2013-07-15 André Silva <emulatorman@parabola.nu>
* linux-libre-3.10.1-1
@@ -18,27 +13,27 @@
* linux-libre-3.7.1-1
* Replaced CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org" to CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="linux-libre.fsfla.org"
-2012-06-23 André Silva <emulatorman@parabola.nu>
-
- * linux-libre-3.4.4-1
- * Replaced email account andre.paulista@adinet.com.uy to emulatorman@lavabit.com.
-
2012-05-26 André Silva <emulatorman@parabola.nu>
* linux-libre-3.4-1.2
- * Disabled CONFIG_MICROCODE_INTEL and CONFIG_MICROCODE_AMD modules https://labs.parabola.nu/issues/116
+ * Disabled CONFIG_MICROCODE_INTEL and CONFIG_MICROCODE_AMD modules [3]
2012-04-24 André Silva <emulatorman@parabola.nu>
* linux-libre-3.3.3-1
- * Disabled CONFIG_STUB_POULSBO module https://labs.parabola.nu/issues/90
+ * Disabled CONFIG_STUB_POULSBO module [2]
2012-04-08 André Silva <emulatorman@parabola.nu>
* linux-libre-3.3.1-1.1
- * Disabled CONFIG_IPW2100 and CONFIG_IPW2200 modules https://labs.parabola.nu/issues/47
+ * Disabled CONFIG_IPW2100 and CONFIG_IPW2200 modules [1]
2012-03-03 André Silva <emulatorman@parabola.nu>
* linux-libre-3.2.9-2
- * Enabled CONFIG_FB_VT8623 module https://labs.parabola.nu/issues/14
+ * Enabled CONFIG_FB_VT8623 module [0]
+
+[0] https://labs.parabola.nu/issues/14
+[1] https://labs.parabola.nu/issues/47
+[2] https://labs.parabola.nu/issues/90
+[3] https://labs.parabola.nu/issues/116
diff --git a/libre-testing/linux-libre/PKGBUILD b/libre-testing/linux-libre/PKGBUILD
index c9368029f..09d3b6d49 100644
--- a/libre-testing/linux-libre/PKGBUILD
+++ b/libre-testing/linux-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 204858 2014-01-29 14:54:08Z tpowa $
+# $Id: PKGBUILD 205930 2014-02-14 08:13:44Z tpowa $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Maintainer: Thomas Baechler <thomas@archlinux.org>
# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
@@ -10,10 +10,10 @@
pkgbase=linux-libre # Build stock -LIBRE kernel
#pkgbase=linux-libre-custom # Build kernel with a different name
_basekernel=3.13
-_sublevel=1
+_sublevel=3
pkgver=${_basekernel}.${_sublevel}
-pkgrel=2
-_lxopkgver=${_basekernel}.1 # nearly always the same as pkgver
+pkgrel=1
+_lxopkgver=${_basekernel}.2 # nearly always the same as pkgver
arch=('i686' 'x86_64' 'mips64el')
url="http://linux-libre.fsfla.org/"
license=('GPL2')
@@ -37,11 +37,11 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
'0005-sunrpc-add-an-info-file-for-the-dummy-gssd-pipe.patch'
'0006-rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-no.patch'
'0001-syscalls.h-use-gcc-alias-instead-of-assembler-aliase.patch'
+ '0001-quirk-asm_volatile_goto.patch'
'i8042-fix-aliases.patch'
- '0001-x86-x32-Correct-invalid-use-of-user-timespec-in-the-.patch'
"http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.xz")
md5sums=('98a8e803e0ed08557f3cdd4d56b0ddc1'
- '312e6bf90c4de3f455669f8cccf4eddd'
+ 'de4e4158ff1711cd57196f323358d0ec'
'b6a3a3f9cac1be38384241ad58d45d46'
'3740951ae165b89a2139d45ae7d82173'
'e49ac236dfeef709f91a3d993ea7b62c'
@@ -57,9 +57,9 @@ md5sums=('98a8e803e0ed08557f3cdd4d56b0ddc1'
'd5907a721b97299f0685c583499f7820'
'a724515b350b29c53f20e631c6cf9a14'
'e6fa278c092ad83780e2dd0568e24ca6'
+ '6baa312bc166681f48e972824f3f6649'
'93dbf73af819b77f03453a9c6de2bb47'
- '336d2c4afd7ee5f2bdf0dcb1a54df4b2'
- '7710668dfdd138f3ad0b93c50455455e')
+ 'cffddbeccd11e296654374b0a1f1bbf9')
if [ "$CARCH" != "mips64el" ]; then
# don't use the Loongson-specific patches on non-mips64el arches.
unset source[${#source[@]}-1]
@@ -111,9 +111,9 @@ prepare() {
# Fix i8042 aliases
patch -p1 -i "${srcdir}/i8042-fix-aliases.patch"
-
- # Fix CVE-2014-0038
- patch -p1 -i "${srcdir}/0001-x86-x32-Correct-invalid-use-of-user-timespec-in-the-.patch"
+ # Fix compile issues
+ # http://git.kernel.org/cgit/linux/kernel/git/tip/tip.git/patch/?id=a9f180345f5378ac87d80ed0bea55ba421d83859
+ patch -Np1 -i "${srcdir}/0001-quirk-asm_volatile_goto.patch"
if [ "$CARCH" == "mips64el" ]; then
sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre|" Makefile
diff --git a/libre/acpi_call-libre-lts/PKGBUILD b/libre/acpi_call-libre-lts/PKGBUILD
index 3e14d035e..1902faf33 100644
--- a/libre/acpi_call-libre-lts/PKGBUILD
+++ b/libre/acpi_call-libre-lts/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 104847 2014-01-27 15:09:28Z alucryd $
+# $Id: PKGBUILD 105695 2014-02-14 08:30:36Z alucryd $
# Maintainer: Maxime Gauduin <alucryd@gmail.com>
# Contributor: mortzu <me@mortzu.de>
# Contributor: fnord0 <fnord0@riseup.net>
@@ -6,7 +6,7 @@
_pkgname=acpi_call-lts
pkgname=acpi_call-libre-lts
pkgver=1.1.0
-pkgrel=1
+pkgrel=2
_extramodules=extramodules-3.10-LIBRE-LTS
pkgdesc='A linux kernel module that enables calls to ACPI methods through /proc/acpi/call (built for the linux-libre-lts kernel package)'
arch=('i686' 'x86_64')
@@ -33,12 +33,12 @@ package() {
cd ${_pkgname%-*}-${pkgver}
install -dm 755 "${pkgdir}"/usr/lib/{modules/${_extramodules},modules-load.d}
- install -m 644 ${_pkgname%-*}.ko "${pkgdir}"/usr/lib/modules/${_extramodules}
+ install -m 644 ${_pkgname%-*}.ko "${pkgdir}"/usr/lib/modules/${_extramodules}/
gzip "${pkgdir}"/usr/lib/modules/${_extramodules}/${_pkgname%-*}.ko
- echo ${_pkgname%-*} > "${pkgdir}"/usr/lib/modules-load.d/${_pkgname%-*}.conf
+ echo ${_pkgname%-*} > "${pkgdir}"/usr/lib/modules-load.d/${_pkgname}.conf
- install -dm 755 "${pkgdir}"/usr/share/${_pkgname%-*}
- cp -dr --no-preserve='ownership' {examples,support} "${pkgdir}"/usr/share/${_pkgname%-*}/
+ install -dm 755 "${pkgdir}"/usr/share/${_pkgname}
+ cp -dr --no-preserve='ownership' {examples,support} "${pkgdir}"/usr/share/${_pkgname}/
}
# vim: ts=2 sw=2 et:
diff --git a/libre/blender-libre/PKGBUILD b/libre/blender-libre/PKGBUILD
index cbd87f8b2..556a44a17 100644
--- a/libre/blender-libre/PKGBUILD
+++ b/libre/blender-libre/PKGBUILD
@@ -3,7 +3,7 @@
_pkgname=blender
epoch=10
_pkgver=2.69
-pkgrel=3
+pkgrel=4
_jpgver=1.5
_pyver=3.3
@@ -24,37 +24,54 @@ arch=(
license=GPL
url=http://www.$_pkgname.org
depends=(
+ boost-libs
desktop-file-utils
ffmpeg
fftw
freetype2
+ glew
hicolor-icon-theme
jack
- #jemalloc
+ libjpeg-turbo
libpng
+ libsndfile
libtiff
+ libx11
+ libxext
+ libxi
+ libxml2
+ libxxf86vm
+ llvm-libs
+ mesa-libgl
openal
- openexr-libre
- openimageio
'opencollada=20131031'
opencolorio
- openshadinglanguage
+ openexr
+ openimageio
+ openjpeg
+ 'openshadinglanguage=1.3.3'
+ pcre
+ python
+ sdl
shared-mime-info
xdg-utils
+ zlib
)
[[ $_spn == true ]] && depends+=(libspnav)
optdepends=(
'bullet: for Rigid Bodies and Physics Simulation'
+ #'mesa-libcl: for rendering with optional Mesa OpenCL'
+ 'povray: for optional renderer with POV-Ray'
'xcftools: for import GIMP images to scene (pcr repo)'
- 'povray-libre: for optional renderer with POV-Ray'
'blender-addon-luxrender: for optional renderer and exporter with LuxRender'
'blender-addon-mitsuba: for optional renderer and exporter with Mitsuba (pcr repo)'
'blender-addon-ogre: for export to Ogre3D formats (pcr repo)'
'blender-addon-yafaray: for optional renderer with YafaRay (pcr repo)'
)
makedepends=(
- boost
+ boost # for cycles, booleans, audaspace and/or i18n
cmake
+ llvm
mesa
)
provides=($_pkgname)
@@ -63,7 +80,7 @@ conflicts=($_pkgname)
[[ $_spn == true ]] && conflicts+=($_pkgname-libre)
replaces=$_pkgname
options=(!strip)
-install=$_pkgname-libre.install
+install=$_pkgname.install
source=http://download.$_pkgname.org/source/$_pkgname-$pkgver.tar.gz
sha512sums=f4de1f5a0a7868ee509b57ef65962a6c2af4c2bc7328db6ebe7b8e05f771c06efea92977f7a64433e8383382a33dbd73cb42b2bf872e63410e55c19ddd133142
@@ -108,33 +125,84 @@ build() {
cmake ..\
-DCMAKE_BUILD_TYPE=Release\
-DCMAKE_INSTALL_PREFIX=/usr\
+ -DCYCLES_OSL=/usr\
+ -DLLVM_STATIC=OFF\
+ -DLLVM_VERSION=3.4\
-DOPENIMAGEIO_ROOT_DIR=/usr\
-DOPENJPEG_INCLUDE_DIR=/usr/include/openjpeg-$_jpgver\
+ -DOSL_INCLUDES=/usr/include/OSL\
-DPYTHON_INCLUDE_DIRS=/usr/include/python${_pyver}m\
-DPYTHON_LIBPATH=/usr/lib\
-DPYTHON_LIBRARY=python${_pyver}m\
-DPYTHON_VERSION=$_pyver\
-DSUPPORT_SSE_BUILD=$_SSE\
-DSUPPORT_SSE2_BUILD=$_SSE2\
+ -DWITH_AUDASPACE=ON\
+ -DWITH_BLENDER=ON\
+ -DWITH_BOOST=ON\
+ -DWITH_BOOST_ICU=OFF\
+ -DWITH_BUILDINFO=ON\
-DWITH_BULLET=ON\
+ -DWITH_CODEC_AVI=ON\
-DWITH_CODEC_FFMPEG=ON\
-DWITH_CODEC_SNDFILE=ON\
+ -DWITH_COMPOSITOR=ON\
-DWITH_CYCLES=ON\
-DWITH_CYCLES_CUDA_BINARIES=OFF\
-DWITH_CYCLES_OSL=ON\
+ -DWITH_CYCLES_STANDALONE=ON\
+ -DWITH_CYCLES_STANDALONE_GUI=ON\
-DWITH_FFTW3=ON\
+ -DWITH_FREESTYLE=ON\
-DWITH_GAMEENGINE=ON\
+ -DWITH_GHOST_XDND=ON\
+ -DWITH_IK_ITASC=ON\
+ -DWITH_IK_SOLVER=ON\
+ -DWITH_IMAGE_CINEON=ON\
+ -DWITH_IMAGE_DDS=ON\
+ -DWITH_IMAGE_FRAMESERVER=ON\
+ -DWITH_IMAGE_HDR=ON\
+ -DWITH_IMAGE_OPENEXR=ON\
+ -DWITH_IMAGE_OPENJPEG=ON\
-DWITH_IMAGE_REDCODE=ON\
+ -DWITH_IMAGE_TIFF=ON\
-DWITH_INPUT_NDOF=$_NDOF\
-DWITH_INSTALL_PORTABLE=OFF\
+ -DWITH_INTERNATIONAL=ON\
-DWITH_JACK=ON\
- -DWITH_JACK_DYNLOAD=OFF\
+ -DWITH_JACK_DYNLOAD=ON\
+ -DWITH_LIBMV=OFF\
+ -DWITH_LLVM=ON\
+ -DWITH_LZMA=ON\
+ -DWITH_LZO=ON\
-DWITH_MEM_JEMALLOC=OFF\
+ -DWITH_MEM_VALGRIND=OFF\
+ -DWITH_MOD_BOOLEAN=ON\
+ -DWITH_MOD_FLUID=ON\
-DWITH_MOD_OCEANSIM=ON\
+ -DWITH_MOD_REMESH=ON\
+ -DWITH_MOD_SMOKE=ON\
+ -DWITH_OPENAL=ON\
+ -DWITH_OPENIMAGEIO=ON\
-DWITH_OPENCOLLADA=ON\
+ -DWITH_OPENCOLORIO=ON\
+ -DWITH_OPENMP=ON\
-DWITH_PLAYER=ON\
+ -DWITH_PYTHON=ON\
-DWITH_PYTHON_INSTALL=OFF\
- -DWITH_SYSTEM_GLEW=ON
+ -DWITH_PYTHON_INSTALL_NUMPY=OFF\
+ -DWITH_PYTHON_MODULE=OFF\
+ -DWITH_PYTHON_SAFETY=OFF\
+ -DWITH_PYTHON_SECURITY=ON\
+ -DWITH_RAYOPTIMIZATION=ON\
+ -DWITH_SDL=ON\
+ -DWITH_STATIC_LIBS=OFF\
+ -DWITH_SYSTEM_GLEW=ON\
+ -DWITH_SYSTEM_OPENJPEG=ON\
+ -DWITH_X11_XF86VMODE=ON\
+ -DWITH_X11_XINPUT=ON
+ #-DWITH_MOD_CLOTH_ELTOPO=ON\
+ #-DWITH_SYSTEM_BULLET=ON\
make $MAKEFLAGS
make
}
diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD
index f0c72bea1..e09fe35d0 100644
--- a/libre/calibre-libre/PKGBUILD
+++ b/libre/calibre-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 105072 2014-01-31 08:04:51Z jelle $
+# $Id: PKGBUILD 105710 2014-02-14 09:37:19Z jelle $
# Maintainer: jelle van der Waa <jelle@vdwaa.nl>
# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
# Contributor: Giovanni Scafora <giovanni@archlinux.org>
@@ -9,7 +9,7 @@
_pkgname=calibre
pkgname=calibre-libre
-pkgver=1.22.0
+pkgver=1.24.0
pkgrel=1
pkgdesc="Ebook management application, with unar support"
arch=('i686' 'x86_64' 'mips64el')
@@ -30,18 +30,18 @@ install=calibre.install
source=("http://download.calibre-ebook.com/${pkgver}/calibre-${pkgver}.tar.xz"
'desktop_integration.patch'
'calibre-mount-helper')
-md5sums=('51449736b887469a7dfd70d3fae68912'
- '95ca4eb3afa7c737c8371708a23bdad9'
+md5sums=('2acb11d541bc8101ab550bfe80c79348'
+ '8e1855ce1ae254c34d12ddbc358b7a36'
'675cd87d41342119827ef706055491e7')
prepare(){
-cd "${srcdir}/${_pkgname}"
-#rm -rf src/{cherrypy,pyPdf}
-rm -rf src/cherrypy
-rm -rf resources/${pkgname}-portable.*
-sed -i -e "s/ldflags = shlex.split(ldflags)/ldflags = shlex.split(ldflags) + ['-fPIC']/" setup/extensions.py
+ cd "${srcdir}/${_pkgname}"
+ #rm -rf src/{cherrypy,pyPdf}
+ rm -rf src/cherrypy
+ rm -rf resources/${pkgname}-portable.*
+ sed -i -e "s/ldflags = shlex.split(ldflags)/ldflags = shlex.split(ldflags) + ['-fPIC']/" setup/extensions.py
-# Fix for calibre-0.8.58
+ # Fix for calibre-0.8.58
sed -i -e "s:#!usr:#!/usr:g" src/calibre/ebooks/markdown/extensions/meta.py
sed -i -e 's:\(#!/usr/bin/env[ ]\+python$\|#![ ]/usr/bin/env[ ]\+python$\|#!/usr/bin/python$\):\12:g' \
diff --git a/libre/calibre-libre/desktop_integration.patch b/libre/calibre-libre/desktop_integration.patch
index 9b20820e6..da3c7a52e 100644
--- a/libre/calibre-libre/desktop_integration.patch
+++ b/libre/calibre-libre/desktop_integration.patch
@@ -1,6 +1,6 @@
diff -aur calibre/src/calibre/linux.py calibre.new/src/calibre/linux.py
---- calibre/src/calibre/linux.py 2013-12-13 03:47:23.000000000 +0100
-+++ calibre.new/src/calibre/linux.py 2013-12-17 20:11:58.319040313 +0100
+--- calibre/src/calibre/linux.py 2014-02-07 04:19:59.000000000 +0100
++++ calibre.new/src/calibre/linux.py 2014-02-08 13:07:09.925693077 +0100
@@ -451,18 +451,6 @@
self.setup_completion()
if islinux or isbsd:
@@ -29,7 +29,7 @@ diff -aur calibre/src/calibre/linux.py calibre.new/src/calibre/linux.py
if not os.path.exists(os.path.dirname(f)):
os.makedirs(os.path.dirname(f))
if zsh.dest:
-@@ -657,71 +645,45 @@
+@@ -657,56 +645,37 @@
with TemporaryDirectory() as tdir, CurrentDir(tdir), \
PreserveMIMEDefaults():
@@ -99,12 +99,17 @@ diff -aur calibre/src/calibre/linux.py calibre.new/src/calibre/linux.py
f.write(GUI)
write_mimetypes(f)
f.close()
-- des = ('calibre-gui.desktop', 'calibre-lrfviewer.desktop',
-- 'calibre-ebook-viewer.desktop', 'calibre-ebook-edit.desktop')
+@@ -725,15 +694,9 @@
+ translators = dict(get_all_translators())
+
+ APPDATA = get_appdata()
- for x in des:
- cmd = ['xdg-desktop-menu', 'install', '--noupdate', './'+x]
- cc(' '.join(cmd), shell=True)
- self.menu_resources.append(x)
+- ak = x.partition('.')[0]
+- if ak in APPDATA and os.access(appdata, os.W_OK):
+- write_appdata(ak, APPDATA[ak], appdata, translators)
- cc(['xdg-desktop-menu', 'forceupdate'])
- f = open('calibre-mimetypes.xml', 'wb')
+ dir = os.path.join(self.opts.staging_sharedir,'../mime/packages/')
@@ -112,8 +117,4 @@ diff -aur calibre/src/calibre/linux.py calibre.new/src/calibre/linux.py
+ f = open(os.path.join(dir, 'calibre.xml'), 'wb')
f.write(MIME)
f.close()
-- self.mime_resources.append('calibre-mimetypes.xml')
-- cc('xdg-mime install ./calibre-mimetypes.xml', shell=True)
- except Exception:
- if self.opts.fatal_errors:
- raise
+ self.mime_resources.append('calibre-mimetypes.xml')
diff --git a/libre/cups-filters-libre/PKGBUILD b/libre/cups-filters-libre/PKGBUILD
index 8d35a9f13..0f1abee68 100644
--- a/libre/cups-filters-libre/PKGBUILD
+++ b/libre/cups-filters-libre/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 204369 2014-01-18 10:14:32Z andyrtr $
+# $Id: PKGBUILD 206026 2014-02-15 17:21:35Z andyrtr $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
pkgname=cups-filters-libre
_pkgname=cups-filters
-pkgver=1.0.44
-pkgrel=2
+pkgver=1.0.45
+pkgrel=1
pkgdesc="OpenPrinting CUPS Filters, without foomatic-db-nonfree recommendation"
arch=('i686' 'x86_64')
url="http://www.linuxfoundation.org/collaborate/workgroups/openprinting"
@@ -20,7 +20,7 @@ source=(http://www.openprinting.org/download/cups-filters/$_pkgname-$pkgver.tar.
provides=("${_pkgname}=${pkgver}" 'foomatic-filters')
replaces=("${_pkgname}" 'foomatic-filters')
conflicts=("${_pkgname}" 'foomatic-filters')
-md5sums=('41d853788cf8e176f952136549488d34')
+md5sums=('950c72b6fb7983f9a9fc126042e146c9')
build() {
cd $_pkgname-$pkgver
diff --git a/libre/ecasound-libre/PKGBUILD b/libre/ecasound-libre/PKGBUILD
index 3dc82648c..4c2586f5d 100644
--- a/libre/ecasound-libre/PKGBUILD
+++ b/libre/ecasound-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 204375 2014-01-18 15:02:17Z schiv $
+# $Id: PKGBUILD 205044 2014-02-03 17:11:21Z schiv $
# Maintainer: Ray Rashif <schiv@archlinux.org>
# Contributor: Eric Belanger <eric@archlinux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
@@ -7,12 +7,12 @@
_pkgname=ecasound
pkgname=ecasound-libre
pkgver=2.9.1
-pkgrel=1
+pkgrel=2
pkgdesc="Command-line multitrack audio processor, without nonfree faac recommendation"
arch=('i686' 'x86_64')
url="http://www.eca.cx/ecasound/"
license=('GPL' 'LGPL')
-depends=('audiofile' 'liblo' 'liboil' 'lilv')
+depends=('audiofile' 'liblo>=0.28' 'liboil' 'lilv')
makedepends=('python2' 'ruby')
optdepends=('python2: ecamonitor, ECI API'
'ruby: ECI API'
diff --git a/libre/enscript/PKGBUILD b/libre/enscript/PKGBUILD
deleted file mode 100644
index 281675296..000000000
--- a/libre/enscript/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 150464 2012-02-18 00:24:06Z allan $
-# Maintainer: Paul Mattal <paul@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=enscript
-pkgver=1.6.6
-pkgrel=1
-pkgdesc="Convert ASCII files to PostScript suitable for printing"
-arch=('i686' 'x86_64' 'mips64el')
-backup=('etc/enscript/enscript.cfg')
-depends=('glibc')
-license=('GPL2' 'custom')
-source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('3acc242b829adacabcaf28533f049afd')
-url="http://git.savannah.gnu.org/cgit/enscript.git"
-
-build() {
- cd $srcdir/$pkgname-$pkgver
- ./configure --prefix=/usr --sysconfdir=/etc/enscript --mandir=/usr/share/man \
- --infodir=/usr/share/info
- make
-}
-
-package() {
- cd $srcdir/$pkgname-$pkgver
- make prefix=$pkgdir/usr \
- sysconfdir=$pkgdir/etc/enscript mandir=$pkgdir/usr/share/man \
- infodir=$pkgdir/usr/share/info install
- install -D -m644 afm/MustRead.html "${pkgdir}/usr/share/licenses/${pkgname}/MustRead.html"
-}
-
-# vim: ts=2 sw=2 et ft=sh
diff --git a/libre/epdfview-libre/PKGBUILD b/libre/epdfview-libre/PKGBUILD
index 626e653f2..4dbf93b6f 100644
--- a/libre/epdfview-libre/PKGBUILD
+++ b/libre/epdfview-libre/PKGBUILD
@@ -1,53 +1,59 @@
-# Parabola maintainer: Michał Masłowski <mtjm@mtjm.eu>
-# $Id: PKGBUILD 57042 2011-10-19 06:13:49Z schuay $
-# Maintainer: schuay <jakob.gruber@gmail.com>
+# $Id: PKGBUILD 105182 2014-02-02 12:39:48Z bpiotrowski $
+# Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
+# Maintainer: Kyle Keen <keenerd@gmail.com>
+# Contributor: schuay <jakob.gruber@gmail.com>
# Contributor: Tom K <tomk@runbox.com>
# Contributor: Thayer Williams <thayer@archlinux.org>
# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+# Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
pkgname=epdfview-libre
_pkgname=epdfview
pkgver=0.1.8
-pkgrel=4
-pkgdesc="A free lightweight PDF document viewer."
-url="http://www.emma-soft.com/projects/epdfview/"
+pkgrel=5
+pkgdesc='Lightweight PDF document viewer, without nonfree suggestions'
+url='http://freecode.com/projects/epdfview'
arch=('i686' 'x86_64' 'mips64el')
license=('GPL')
depends=('poppler-glib' 'desktop-file-utils' 'hicolor-icon-theme' 'gtk2' 'xdg-utils')
makedepends=('pkgconfig')
-provides=('epdfview')
+provides=("epdfview=$pkgver")
conflicts=('epdfview')
replaces=('epdfview')
install='epdfview.install'
-source=("http://www.emma-soft.com/projects/${_pkgname}/chrome/site/releases/${_pkgname}-${pkgver}.tar.bz2"
- "${_pkgname}.desktop.patch"
- "glib2_headers.patch"
- "0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch")
+source=(ftp://ftp.slackware.com/.1/blfs/conglomeration/epdfview/$_pkgname-$pkgver.tar.bz2
+ epdfview-0.1.8-swap-the-blue-and-red-channel.patch
+ epdfview-0.1.8-glib2-headers.patch
+ epdfview-0.1.8-modern-cups.patch)
md5sums=('e50285b01612169b2594fea375f53ae4'
- 'fbf22bbabdbb7544db615ac5775d57e2'
- '41b30f53f20472cbc2fcd4eae161125e'
- '7f9ea101a41f5b4e999fd024f423d41f')
+ '7f9ea101a41f5b4e999fd024f423d41f'
+ '2fffa9c7cd4c5f0744803591c2f162a3'
+ '5c2cf5612d2a7dfe6cf005b94aeb5ada')
-build() {
- cd "${srcdir}/${_pkgname}-${pkgver}"
-
- patch -Np0 -i "${srcdir}/${_pkgname}.desktop.patch"
- patch -Np1 -i "${srcdir}/0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch"
- patch -Np1 -i "${srcdir}/glib2_headers.patch" # FS#30116
+prepare() {
+ cd $_pkgname-$pkgver
+ sed -i 's/icon_epdfview-48/epdfview/' data/epdfview.desktop
# Use xdg-open as default browser.
sed -r '/DEFAULT_EXTERNAL_BROWSER_COMMAND_LINE/s/firefox[^ ]*/xdg-open/' -i src/Config.cxx
+ patch -p1 -i ../epdfview-0.1.8-swap-the-blue-and-red-channel.patch
+ patch -p1 -i ../epdfview-0.1.8-glib2-headers.patch # FS#30116
+ patch -p1 -i ../epdfview-0.1.8-modern-cups.patch # FS#32511
+}
+
+build() {
+ cd $_pkgname-$pkgver
./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
make
}
-package() {
- cd "${srcdir}/${_pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
+package() {
+ cd $_pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
for size in 24 32 48; do
- install -Dm644 data/icon_${_pkgname}-${size}.png \
- "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/${_pkgname}.png"
+ install -Dm644 data/icon_$_pkgname-$size.png \
+ "$pkgdir"/usr/share/icons/hicolor/${size}x${size}/apps/$_pkgname.png
done
}
diff --git a/libre/epdfview-libre/glib2_headers.patch b/libre/epdfview-libre/epdfview-0.1.8-glib2-headers.patch
index b5bc5c211..e9f0983b5 100644
--- a/libre/epdfview-libre/glib2_headers.patch
+++ b/libre/epdfview-libre/epdfview-0.1.8-glib2-headers.patch
@@ -5,8 +5,9 @@ index c142a7a..58fcf2e 100644
@@ -18,7 +18,7 @@
#if !defined (__STOCK_ICONS_H__)
#define __STOCK_ICONS_H__
-
+
-#include <glib/gmacros.h>
+#include <glib.h>
-
+
G_BEGIN_DECLS
+
diff --git a/libre/epdfview-libre/epdfview-0.1.8-modern-cups.patch b/libre/epdfview-libre/epdfview-0.1.8-modern-cups.patch
new file mode 100644
index 000000000..64988789f
--- /dev/null
+++ b/libre/epdfview-libre/epdfview-0.1.8-modern-cups.patch
@@ -0,0 +1,74 @@
+diff -Naur epdfview-0.1.8.orig/src/PrintPter.cxx epdfview-0.1.8/src/PrintPter.cxx
+--- epdfview-0.1.8.orig/src/PrintPter.cxx 2011-05-28 11:25:01.000000000 +0100
++++ epdfview-0.1.8/src/PrintPter.cxx 2012-08-22 20:11:46.362436859 +0100
+@@ -22,6 +22,40 @@
+ #include <locale.h>
+ #include "epdfview.h"
+
++#if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5)
++#define HAVE_CUPS_1_6 1
++#endif
++
++#ifndef HAVE_CUPS_1_6
++inline int ippGetInteger (ipp_attribute_t *attr, int element)
++{
++ return (attr->values[element].integer);
++}
++
++inline const char * ippGetString (ipp_attribute_t *attr,
++ int element,
++ const char **language /*UNUSED*/)
++{
++ return (attr->values[element].string.text);
++}
++
++inline int ippSetOperation (ipp_t *ipp, ipp_op_t op)
++{
++ if (!ipp)
++ return (0);
++ ipp->request.op.operation_id = op;
++ return (1);
++}
++
++inline int ippSetRequestId (ipp_t *ipp, int request_id)
++{
++ if (!ipp)
++ return (0);
++ ipp->request.any.request_id = request_id;
++ return (1);
++}
++#endif
++
+ using namespace ePDFView;
+
+ // Structures
+@@ -380,8 +414,8 @@
+
+ ipp_t *request = ippNew ();
+
+- request->request.op.operation_id = IPP_GET_PRINTER_ATTRIBUTES;
+- request->request.op.request_id = 1;
++ ippSetOperation(request, IPP_GET_PRINTER_ATTRIBUTES);
++ ippSetRequestId(request, 1);
+
+ ippAddString (request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
+ "attributes-charset", NULL, "utf-8");
+@@ -403,7 +437,7 @@
+ ippFindAttribute (answer, "printer-state", IPP_TAG_ZERO);
+ if ( NULL != state )
+ {
+- switch (state->values[0].integer)
++ switch (ippGetInteger (state, 0))
+ {
+ case IPP_PRINTER_IDLE:
+ attributes->state = g_strdup (_("Idle"));
+@@ -425,7 +459,7 @@
+ ippFindAttribute (answer, "printer-location", IPP_TAG_ZERO);
+ if ( NULL != location )
+ {
+- attributes->location = g_strdup (location->values[0].string.text);
++ attributes->location = g_strdup (ippGetString (location, 0, NULL));
+ }
+
+ ippDelete (answer);
+
diff --git a/libre/epdfview-libre/0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch b/libre/epdfview-libre/epdfview-0.1.8-swap-the-blue-and-red-channel.patch
index e077a15cf..e077a15cf 100644
--- a/libre/epdfview-libre/0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch
+++ b/libre/epdfview-libre/epdfview-0.1.8-swap-the-blue-and-red-channel.patch
diff --git a/libre/epdfview-libre/epdfview.desktop.patch b/libre/epdfview-libre/epdfview.desktop.patch
deleted file mode 100644
index d86fc3088..000000000
--- a/libre/epdfview-libre/epdfview.desktop.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- data/epdfview.desktop.bak 2009-04-05 16:55:56.000000000 -0700
-+++ data/epdfview.desktop 2009-04-05 16:56:33.000000000 -0700
-@@ -7,7 +7,7 @@
- GenericName=PDF Viewer
- GenericName[ca]=Visor PDF
- GenericName[es]=Visor PDF
--Icon=icon_epdfview-48
-+Icon=epdfview
- Name=ePDFViewer
- Name[ca]=ePDFViewer
- Name[es]=ePDFViewer
diff --git a/libre/filesystem/PKGBUILD b/libre/filesystem/PKGBUILD
index 00be19b0a..69edeeb16 100644
--- a/libre/filesystem/PKGBUILD
+++ b/libre/filesystem/PKGBUILD
@@ -5,7 +5,7 @@
pkgname=filesystem
pkgver=2013.05
-pkgrel=2
+pkgrel=2.2
pkgdesc='Base filesystem (Parabola rebranded)'
arch=('i686' 'x86_64' 'mips64el')
license=('GPL')
@@ -52,7 +52,8 @@ package() {
for f in gshadow shadow crypttab; do
install -m600 ${srcdir}/${f} etc/
done
- touch etc/arch-release
+ touch etc/parabola-release
+ ln -s parabola-release etc/arch-release
install -D -m644 ${srcdir}/modprobe.d.usb-load-ehci-first usr/lib/modprobe.d/usb-load-ehci-first.conf
install -m755 ${srcdir}/locale.sh etc/profile.d/locale.sh
diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD
index c82b41a13..df6956f96 100644
--- a/libre/grub/PKGBUILD
+++ b/libre/grub/PKGBUILD
@@ -15,7 +15,7 @@ _UNIFONT_VER="6.3.20131217"
pkgname="grub"
pkgdesc="GNU GRand Unified Bootloader (2), (Parabola rebranded)"
pkgver=2.02.beta2
-pkgrel=1
+pkgrel=1.1
epoch="1"
url="https://www.gnu.org/software/grub/"
arch=('x86_64' 'i686')
diff --git a/libre/gst-plugins-bad-libre/PKGBUILD b/libre/gst-plugins-bad-libre/PKGBUILD
index 7172dbc05..8cf3ce164 100644
--- a/libre/gst-plugins-bad-libre/PKGBUILD
+++ b/libre/gst-plugins-bad-libre/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 203419 2014-01-10 16:09:41Z heftig $
+# $Id: PKGBUILD 205811 2014-02-10 13:07:22Z heftig $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
_pkgname=gst-plugins-bad
pkgname=$_pkgname-libre
-pkgver=1.2.2
-pkgrel=2
+pkgver=1.2.3
+pkgrel=1
pkgdesc="GStreamer Multimedia Framework Bad Plugins, without nonfree faac support"
arch=('i686' 'x86_64' 'mips64el')
license=('LGPL')
@@ -18,7 +18,7 @@ conflicts=$_pkgname
replaces=$_pkgname
options=(!emptydirs)
source=(${url}/src/$_pkgname/$_pkgname-$pkgver.tar.xz)
-sha256sums=('63e78db11b482d0529a0bde01e2ac23fd32c7cb99a5508b53ee4ca1051871b2c')
+sha256sums=('595d7911a9e6207dea37200587724bdbf841b81a5eb0730118be36976684278c')
build() {
cd $_pkgname-$pkgver
diff --git a/libre/gummiboot/PKGBUILD b/libre/gummiboot/PKGBUILD
index 85804c9c0..a1814bd71 100644
--- a/libre/gummiboot/PKGBUILD
+++ b/libre/gummiboot/PKGBUILD
@@ -7,7 +7,7 @@
pkgname="gummiboot"
pkgver="43"
-pkgrel="2"
+pkgrel="2.1"
pkgdesc="Simple UEFI Boot Manager (Parabola rebranded)"
url="http://freedesktop.org/wiki/Software/gummiboot"
arch=('x86_64' 'i686' 'mips64el')
diff --git a/libre/hardinfo/PKGBUILD b/libre/hardinfo/PKGBUILD
index 1987e191e..2de9e5887 100644
--- a/libre/hardinfo/PKGBUILD
+++ b/libre/hardinfo/PKGBUILD
@@ -4,8 +4,8 @@
pkgname=hardinfo
pkgver=0.5.1
-pkgrel=5
-pkgdesc="A system information and benchmark tool."
+pkgrel=5.1
+pkgdesc="A system information and benchmark tool (Parabola rebranded)"
arch=('i686' 'x86_64')
url="http://hardinfo.berlios.de/wiki/index.php/Main_Page"
license=('GPL2')
diff --git a/libre/icecat-adblock-plus/PKGBUILD b/libre/icecat-adblock-plus/PKGBUILD
new file mode 100644
index 000000000..b1ccb3b09
--- /dev/null
+++ b/libre/icecat-adblock-plus/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id: PKGBUILD 104302 2014-01-17 11:39:31Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+
+
+pkgname=icecat-adblock-plus
+pkgver=2.4.1
+_addons_file=230225
+pkgrel=1.1
+pkgdesc="plugin for icecat which block ads and banners"
+arch=('any')
+url="http://adblockplus.org/"
+license=('GPL')
+depends=("icecat")
+makedepends=('unzip')
+provides=(firefox-adblock-plus=$pkgver)
+noextract=("adblock_plus-$pkgver-fx+tb+fn+sm.xpi")
+source=(https://addons.mozilla.org/firefox/downloads/file/${_addons_file}/adblock_plus-$pkgver-fx+tb+fn+sm.xpi)
+md5sums=('3fe51813290a0d7103b620e2813a8c0e')
+
+package() {
+# _ffver=`pacman -Q firefox | cut -f2 -d\ | cut -f1-2 -d.`
+# depends=("icecat>=${_ffver}" "icecat<=${_ffver/0/99}")
+
+ cd $srcdir
+ [ $NOEXTRACT -eq 1 ] || unzip adblock_plus-$pkgver-fx+tb+fn+sm.xpi
+ local emid=$(sed -n -e '/<\?em:id>\?/!d; s/.*\([\"{].*[}\"]\).*/\1/; s/\"//g; p; q' install.rdf)
+ local dstdir=$pkgdir/usr/lib/icecat/browser/extensions/${emid}
+ [ -n ${emid} ] || return 1
+ install -d $dstdir
+# sed -i 's#<em:maxVersion>.*</em:maxVersion>#<em:maxVersion>20.*</em:maxVersion>#' install.rdf
+ cp -R * $dstdir
+ rm $dstdir/*.xpi
+ find $pkgdir -type d -exec chmod 0755 {} \;
+ find $pkgdir -type f -exec chmod 0644 {} \;
+}
diff --git a/libre/icecat-firebug/PKGBUILD b/libre/icecat-firebug/PKGBUILD
new file mode 100644
index 000000000..cf5bcee6b
--- /dev/null
+++ b/libre/icecat-firebug/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 105364 2014-02-06 03:30:33Z speps $
+# Maintainer: speps <speps at aur dot archlinux dot org>
+
+pkgname=icecat-firebug
+pkgver=1.12.6
+pkgrel=1.1
+pkgdesc="IceCat plugin with tools for web development."
+arch=(any)
+url="http://getfirebug.com/"
+license=('custom:BSD')
+groups=('icecat-addons')
+depends=('icecat')
+provides=('firebug' firefox-firebug=$pkgver)
+source=("${url}releases/firebug/${pkgver%.*}/firebug-$pkgver.xpi")
+md5sums=('e929032f03f3af210355905cd4ddf6d3')
+
+package() {
+ cd "$srcdir"
+
+ # extension
+ _dest="$pkgdir/usr/lib/icecat/browser/extensions/firebug@software.joehewitt.com"
+ find . -type d -exec install -d {} $_dest/{} \;
+ find . -type f -exec install -Dm644 {} $_dest/{} \;
+
+ # license
+ install -Dm644 license.txt \
+ "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/libre/icecat-noscript/PKGBUILD b/libre/icecat-noscript/PKGBUILD
index 16579acdd..643db648f 100644
--- a/libre/icecat-noscript/PKGBUILD
+++ b/libre/icecat-noscript/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 104641 2014-01-24 07:00:27Z spupykin $
+# $Id: PKGBUILD 105656 2014-02-13 09:26:07Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
_pkgname=firefox-noscript
pkgname=icecat-noscript
-pkgver=2.6.8.13
+pkgver=2.6.8.14
pkgrel=1
pkgdesc="plugin for icecat which disables script"
arch=('any')
@@ -14,7 +14,7 @@ depends=()
provides=$_pkgname=$pkgver
makedepends=('unzip')
source=(https://secure.informaction.com/download/releases/noscript-$pkgver.xpi)
-md5sums=('75ec11cc5f3f039e81113abfb908110e')
+md5sums=('f0ecd6bd7c7331d77c91df55bdb3d7da')
package() {
# _ffver=`pacman -Q icecat | cut -f2 -d\ | cut -f1 -d-`
diff --git a/libre/icecat-raismth/PKGBUILD b/libre/icecat-raismth/PKGBUILD
new file mode 100644
index 000000000..83b545767
--- /dev/null
+++ b/libre/icecat-raismth/PKGBUILD
@@ -0,0 +1,28 @@
+# $Id: PKGBUILD 101450 2013-11-25 21:16:28Z speps $
+# Maintainer: speps <speps at aur dot archlinux dot org>
+
+pkgname=icecat-raismth
+pkgver=4.0.1
+pkgrel=1.1
+pkgdesc="IceCat plugin for watching Rai.tv live channels, vod and replay contents w/o *light (Silverlight/Moonlight)"
+arch=('any')
+url="http://acab.servebeer.com/"
+license=('GPL3')
+groups=('icecat-addons')
+depends=('icecat')
+optdepends=('mplayer: default video player'
+ 'faad: default audio player')
+provides=('raismth' firefox-raismth=$pkgver)
+source=("${url}raismth-$pkgver.xpi")
+md5sums=('f772ef1a74b0aba3a739849fee3238ea')
+
+package() {
+ cd "$srcdir"
+
+ # extension
+ _dest="$pkgdir/usr/lib/icecat/browser/extensions/raismth@mitm.rc"
+ find . -type d -exec install -d {} $_dest/{} \;
+ find . -type f -exec install -Dm644 {} $_dest/{} \;
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/libre/icecat-spell-ru/PKGBUILD b/libre/icecat-spell-ru/PKGBUILD
new file mode 100644
index 000000000..5b088817a
--- /dev/null
+++ b/libre/icecat-spell-ru/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 90907 2013-05-15 13:06:09Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Maciej Sitarz <macieks@freesco.pl>
+
+pkgname=icecat-spell-ru
+pkgver=0.4.4
+pkgrel=13.1
+pkgdesc="Russian spellchecker dictionary for IceCat"
+arch=(any)
+url="https://addons.mozilla.org/firefox/dictionaries/"
+license=("GPL")
+depends=("icecat")
+provides=(firefox-spell-ru=$pkgver)
+noextract=(russian_spellchecking_dictionary_with_io_support-$pkgver-fx+tb+sm.xpi)
+source=(https://addons.mozilla.org/firefox/downloads/file/98798/russian_spellchecking_dictionary-$pkgver-fx+tb+sm.xpi)
+md5sums=('269a8bdd38a5641b5f6cfb12715f1029')
+
+package() {
+# _ffver=`pacman -Q icecat | cut -f2 -d\ | cut -f1 -d-`
+# depends=("icecat>=${_ffver}" "icecat<=${_ffver/0/99}")
+
+ cd $srcdir
+ rm $srcdir/*.xpi
+ local _dir=$pkgdir/usr/lib/icecat/browser/extensions/ru@dictionaries.addons.mozilla.org
+ mkdir -p "${_dir}"
+ cd "${_dir}"
+ sed -i 's#<em:maxVersion>.*</em:maxVersion>#<em:maxVersion>20.*</em:maxVersion>#' $srcdir/install.rdf
+ cp -r $srcdir/* "${_dir}"
+ find ${_dir} -type f -exec chmod 0644 {} \;
+ touch ${_dir}/chrome.manifest
+}
diff --git a/libre/icedove-l10n/PKGBUILD b/libre/icedove-l10n/PKGBUILD
index 423b11d2a..92b0cfff0 100644
--- a/libre/icedove-l10n/PKGBUILD
+++ b/libre/icedove-l10n/PKGBUILD
@@ -1,122 +1,115 @@
-# Maintainer: Márcio Silva <coadde@lavabit.com>
# Maintainer: André Silva <emulatorman@parabola.nu>
-
-pkgbase=icedove-l10n
-epoch=1
-_pkgver=24.1.1
-pkgver=24.1.1.deb1
+# Contributor: Márcio Silva <coadde@parabola.nu>
_langpacks=(ar ast be bg bn-BD br ca cs da de el en-GB en-US es-AR es-ES et eu fi fr fy-NL ga-IE gd gl he hr hu hy-AM id is it ja ko lt nb-NO nl nn-NO pa-IN pl pt-BR pt-PT rm ro ru si sk sl sq sr sv-SE ta-LK tr uk vi zh-CN zh-TW)
-pkgname=($(for lang in ${_langpacks[@]}
- do echo $pkgbase-$lang | tr A-Z a-z
- done))
-
+pkgbase=icedove-l10n
+pkgname=(
+ $(for lang in ${_langpacks[@]}; do
+ echo $pkgbase-$lang | tr A-Z a-z
+ done)
+)
+epoch=1
+_pkgver=24.3.0
+pkgver=24.3.0.deb1
pkgrel=1
+
pkgdesc="Language packs for Debian Icedove."
arch=('any')
-url="http://packages.debian.org/experimental/icedove"
+_url=https://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$_pkgver/linux-i686/xpi
+url="http://packages.debian.org/sid/icedove"
license=('MPL' 'GPL')
depends=("icedove-libre>=$epoch:$pkgver")
makedepends=('unzip' 'zip')
-_url=https://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$_pkgver/linux-i686/xpi
-
source=('brand.dtd' 'brand.properties')
-for lang in ${_langpacks[@]}
-do
- source+=("icedove-l10n-$_pkgver-$lang.xpi::$_url/$lang.xpi")
+for lang in ${_langpacks[@]}; do
+ source+=("icedove-l10n-$_pkgver-$lang.xpi::$_url/$lang.xpi")
done
-
-# Don't extract anything
noextract=(${source[@]##*/})
-_path="/usr/lib/icedove/extensions/"
+_path=usr/lib/icedove/extensions
-build() {
+prepare() {
cd $srcdir
-
- for i in ${_langpacks[@]}
- do
- cd $srcdir
- unzip -q icedove-l10n-$_pkgver-$i.xpi -d $i
- rm icedove-l10n-$_pkgver-$i.xpi
- install -Dm644 $srcdir/brand.dtd $i/chrome/$i/locale/$i/branding
- install -Dm644 $srcdir/brand.properties $i/chrome/$i/locale/$i/branding
- sed -i -e 's/thunderbird/icedove/' $i/install.rdf
- cd $i
- zip -q -r langpack-$i@icedove.mozilla.org.xpi .
- mv langpack-$i@icedove.mozilla.org.xpi $srcdir
+ for lang in ${_langpacks[@]}; do
+ unzip -q icedove-l10n-$_pkgver-$lang.xpi -d $lang
+ rm icedove-l10n-$_pkgver-$lang.xpi
+ install -Dm644 $srcdir/brand.dtd $lang/chrome/$lang/locale/$lang/branding
+ install -Dm644 $srcdir/brand.properties $lang/chrome/$lang/locale/$lang/branding
+ sed -i -e 's/thunderbird/icedove/' $lang/install.rdf
+ cd $lang
+ zip -q -r langpack-$lang@icedove.mozilla.org.xpi .
+ mv langpack-$lang@icedove.mozilla.org.xpi $srcdir
+ cd ..
+ rm -r $lang
done
-
- cd $srcdir
}
-for lang in ${_langpacks[@]}
-do
- eval "
-package_icedove-l10n-$(echo $lang | tr A-Z a-z)() {
- replaces=(thunderbird-i18n-$(echo $lang | tr A-Z a-z) icedove-i18n-$(echo $lang | tr A-Z a-z))
- conflicts=(thunderbird-i18n-$(echo $lang | tr A-Z a-z) icedove-i18n-$(echo $lang | tr A-Z a-z))
- provides=(thunderbird-i18n-$(echo $lang | tr A-Z a-z) icedove-i18n-$(echo $lang | tr A-Z a-z))
- install -Dm644 \"\$srcdir/langpack-$lang@icedove.mozilla.org.xpi\" \"\$pkgdir$_path/langpack-$lang@icedove.mozilla.org.xpi\"
-}
-"
+for lang in ${_langpacks[@]}; do
+ eval "
+ package_icedove-l10n-$(echo $lang | tr A-Z a-z)() {
+ replaces=(thunderbird-i18n-$(echo $lang | tr A-Z a-z) icedove-i18n-$(echo $lang | tr A-Z a-z))
+ conflicts=(thunderbird-i18n-$(echo $lang | tr A-Z a-z) icedove-i18n-$(echo $lang | tr A-Z a-z))
+ provides=(thunderbird-i18n-$(echo $lang | tr A-Z a-z) icedove-i18n-$(echo $lang | tr A-Z a-z))
+ install -Dm644 \"\$srcdir/langpack-$lang@icedove.mozilla.org.xpi\" \"\$pkgdir/$_path/langpack-$lang@icedove.mozilla.org.xpi\"
+ }
+ "
done
md5sums=('d5b2567a8cc8f64591f313a6efdaaffc'
'f3719964e893c1002b7a923e8f95f923'
- '71b52e9b2ea4b2813579151107b26d7c'
- '0001f92a0a732b2d8d4abe5b73739871'
- '0ca3fd860debb0f4bea75c295cd794bf'
- '3fa1b7e34efb29fcf12ff84c9b7cfb99'
- '0d412e040d7db1bff6ba7a5901c194a3'
- '196390a5683708ea9d1dff08d5da4969'
- '1b580efd13589da4a7c700ce675b4de8'
- '3f0b570ace30f4b8439328f63424914a'
- '5d7890dce639c703319185dcca099c19'
- '02352099e2bb79b9ed57b8b735d1b662'
- '1b463b18db5640f9fb1fbb82f9862d51'
- 'f8053c0d509c95643be7c993f79469e8'
- 'c7286e9fb549480c7565947162473eb3'
- 'a180d36ebe0e04a452c452d8ca249936'
- 'faa9054e681927eec112b989b9b9f916'
- 'd5b4bbe5cd18b72b7d8c649b68a095bb'
- '5fd037b2d60ff663eccbf0788a52cce7'
- '824805de27a69e5323c6e547974c6c02'
- '6a3e55d20d4945ead133054127b1ba17'
- '81db405732d6b5e6fd057505be5b03c1'
- '25338963e6cbf51ea9c18bc7bd786a44'
- 'bfc2a548805ba54bb81d8deaa5fcf406'
- 'da5d4edacaf56bbb015987b334c49a46'
- '264aa5440cd50dd1d09b1f6c682dde95'
- '1a671a227b2713f0d7ede3b8c547e003'
- '4dfce580e8d6f889ef868cf1a85ddd89'
- 'cded11a2ee85f1bfa704a8bcfd7063ac'
- 'ca08979c98adc6b1c1086c1bf037d64a'
- '6d433d1b6395957c9c16eb9efe79c461'
- '412186cd09492af191ef5b8e5523997b'
- '9f5f15ba89ed4a7dd82b973616a84fb1'
- 'ff817ed985260ba5b2284d70ede97cfc'
- 'c6474a9d0a49b177b8d1daca5e3faf54'
- '81f1379b774a9762918b5bb6fd613a94'
- 'dfb5c1393033518e12ae9ff91afeed97'
- '24383d610a424cc71c44b9fa923b9743'
- 'c5918f13d25dd124ed8050b7177a6adf'
- '76ec5c28687220f39bac18fd2381ab29'
- '03263f5ebc6e38022c808689ff0f848c'
- 'aaa66545fb46d23ea0b5537495b0c08e'
- '5e105d2fd7ad811f3afbe375ab8ef293'
- '955a91d8b73bd14f12afa4be13a45bca'
- 'dbd1a1b2ea0777d1df361f973d53c27e'
- '03f0558bcbc1dafa4b29bcf1a69ca170'
- 'd1a58f928165c099c01b8687e92889af'
- 'a8b3385d0c7679b871cf9bcaf406ca26'
- '2fbeac1775ab8ce9096ee14d628c68e8'
- '450ac4b6e744b7ed8cd92e9852d0e80f'
- '31c56ec4e6de175c75b60e421f1381fc'
- '43d1335568bc7b6806ed5151e7b38243'
- 'eaece7103da2f8b19967d5f4b5e7befc'
- '9b3abcfb1ccac0b863dcde99ab487d71'
- '343fcfdec8f55f2e227bb5e1a5804907'
- 'ee9931bb007f935c0aaa16031c4319e7'
- 'ee92083eea883b10946cee46ac529d21')
+ '305fb4a11d119e1dffc8db00d8415447'
+ '6c970218d71fe3f2b2c080495c627dcf'
+ '5a791b03e66024e4590e90ea21c8072c'
+ '6d2bf5155653fc524e9eeffebb67fd1f'
+ '454d22e0cfffbf890249c344a0bfb3ed'
+ 'a613a5f928a86933c0dc4aa1ee83cabf'
+ '5d45b8aa1707ec42927118a42a64a901'
+ 'a4eeee3b77fb6c7d8185bb28986eeb2e'
+ 'abda1c12b400d0735944b2d1254135c5'
+ '0eb3e249f5950feebdfbe3abca393b9f'
+ '710dd329680a9ec523edc0976ee023c0'
+ 'a73a4bc3af9d42c793f453ade7ed7f47'
+ '0f67df0895150db4d117c3f8b2307bd2'
+ 'c37a4c222729ce7c2f37d695f037e7d9'
+ 'd372395a17630f7b0908456e01d3f305'
+ 'fc9c760ae32fcc72e38d518020507f48'
+ '343607eb1e2f051434ea5c9516887577'
+ '30a0a1de457425cee3b07b09d2a20225'
+ 'd6a19837e6704b43839a2608d109ecd5'
+ '9e0ae78d37852e0f6157b41fbef0f7c7'
+ '34d7d58ec4b20a1f07094a0fcf57774d'
+ '3c4503fa49ea87f1e647ea0c6d09436b'
+ '041c1281e98b583750adeaa46096ae4c'
+ '0ca153732c0af2bbd93173c140cd17cb'
+ '0f64947d77b92966e907039e051201d8'
+ '3951156099cee856d5dce13a10da233e'
+ 'a56081b911b707ae56fb8760813e3854'
+ '2ece2346cc35164742d5af8d4e5869ac'
+ '1a1cd84af5d427afcf2d20d7fe1e621c'
+ 'e3ed8fd936efcd3d5579d98701c09f53'
+ '5465a2c427ed645e5edd7ba9fcfea4cf'
+ '5e73d9699c9b1c617e24035e6869dabb'
+ '2f1d0102b66f0eaebf0a2a8054a36e6b'
+ '7bbdcee9350ddcba95cc8f37ef8bc557'
+ '6ca42a1473532da9a1387e7c133764ea'
+ '70ecae7ef62b9c4c4f9f7d45ee3c623f'
+ '02aab1810bce9fc80bd1e8c15c27cabf'
+ 'd059f84aaad99f16fc7aff65caeeb1cb'
+ 'e9c008d932c72e3ba9d6b181972a831a'
+ 'c5800f343a193d55e9d699e3f49c0fa6'
+ 'a239fc033efd9dc1a85093cadadcacff'
+ '62664ace7c66c0893eb2957692082036'
+ '9cafc6676e4e50cf71c6fda3d498f31b'
+ '0b29a636819202ea03169188e866264c'
+ '1ca9be772729a3539265b51fbda680a8'
+ 'bac6196887859fc6a2144748038e90b8'
+ '9a1374760f1b29c73fcc472f4ab128ec'
+ 'c33852a9a55eeed9930289c1a9282ba8'
+ '64b89babcda06ce68308cefc38a38b41'
+ '94b791cb6afb33b8b9c734e7b191c27a'
+ 'e56035901013b616ee4c63a2b351ac40'
+ '09d4df4a554806e97f53f302a7c2301e'
+ 'ff52d0ddad0e00635b1e7612fb6372bd'
+ 'df80dc11119b8405a35ebf7735897783'
+ 'b0b0feef63479a6c3aad0cad6e27c72b')
diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD
index 9409190c8..a5914ba56 100644
--- a/libre/icedove-libre/PKGBUILD
+++ b/libre/icedove-libre/PKGBUILD
@@ -1,9 +1,9 @@
-# Maintainer : Márcio Silva <coadde@lavabit.com>
# Maintainer : André Silva <emulatorman@parabola.nu>
+# Contributor : Márcio Silva <coadde@parabola.nu>
-# We're getting this from Debian Experimental
+# We're getting this from Debian Sid
_debname=icedove
-_debver=24.1.1
+_debver=24.3.0
_debrel=deb1
_debrepo=http://ftp.debian.org/debian/pool/main/
debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -16,22 +16,22 @@ pkgrel=1
pkgdesc="A libre version of Debian Icedove, the standalone mail/news reader based on Mozilla Thunderbird."
arch=('i686' 'x86_64' 'mips64el')
license=('MPL' 'GPL' 'LGPL')
-url="http://packages.debian.org/experimental/${_pkgname}"
-depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss' 'sqlite' 'startup-notification')
-makedepends=('unzip' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'quilt')
+url="http://packages.debian.org/sid/${_pkgname}"
+depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss' 'sqlite' 'startup-notification')
+makedepends=('unzip' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'quilt' 'jquery-ui')
optdepends=('libcanberra: for sound support')
replaces=('thunderbird')
conflicts=('thunderbird')
provides=('thunderbird')
install=${_pkgname}.install
source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.xz"
- "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel#deb}.debian.tar.gz"
+ "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel#deb}.debian.tar.xz"
mozconfig
vendor.js
${_pkgname}.desktop)
options=(!emptydirs)
-md5sums=('91ddfb44481e6cb456d835a832d885c1'
- '9f060324dbed3f8d27c896703bda6078'
+md5sums=('cbf58e11a8eb1ded01167fa927ce9cc0'
+ 'a8ef513d211c60bd2e77810c10a3c25c'
'c46cf2a671c8fdefcabd4c87e38f3d40'
'5a53179d14ae9631b7afe5e4d0fc0b25'
'e785e0c267f4435ae1a9aa0b03bcacfb')
@@ -92,6 +92,10 @@ prepare() {
# configure script misdetects the preprocessor without an optimization level
# https://bugs.archlinux.org/task/34644
sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' mozilla/configure
+
+ # Add symlinks to use jquery files built for us
+ ln -s /usr/share/javascript/jquery/jquery.min.js mail/jquery
+ ln -s /usr/share/javascript/jquery-ui/jquery-ui.min.js mail/jquery
}
build() {
diff --git a/libre/iceweasel-adblock-plus/PKGBUILD b/libre/iceweasel-adblock-plus/PKGBUILD
new file mode 100644
index 000000000..0a248955b
--- /dev/null
+++ b/libre/iceweasel-adblock-plus/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id: PKGBUILD 104302 2014-01-17 11:39:31Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+
+
+pkgname=iceweasel-adblock-plus
+pkgver=2.4.1
+_addons_file=230225
+pkgrel=1.1
+pkgdesc="plugin for iceweasel which block ads and banners"
+arch=('any')
+url="http://adblockplus.org/"
+license=('GPL')
+depends=("iceweasel-libre")
+makedepends=('unzip')
+provides=(firefox-adblock-plus=$pkgver)
+noextract=("adblock_plus-$pkgver-fx+tb+fn+sm.xpi")
+source=(https://addons.mozilla.org/firefox/downloads/file/${_addons_file}/adblock_plus-$pkgver-fx+tb+fn+sm.xpi)
+md5sums=('3fe51813290a0d7103b620e2813a8c0e')
+
+package() {
+# _ffver=`pacman -Q firefox | cut -f2 -d\ | cut -f1-2 -d.`
+# depends=("iceweasel-libre>=${_ffver}" "iceweasel-libre<=${_ffver/0/99}")
+
+ cd $srcdir
+ [ $NOEXTRACT -eq 1 ] || unzip adblock_plus-$pkgver-fx+tb+fn+sm.xpi
+ local emid=$(sed -n -e '/<\?em:id>\?/!d; s/.*\([\"{].*[}\"]\).*/\1/; s/\"//g; p; q' install.rdf)
+ local dstdir=$pkgdir/usr/lib/iceweasel/browser/extensions/${emid}
+ [ -n ${emid} ] || return 1
+ install -d $dstdir
+# sed -i 's#<em:maxVersion>.*</em:maxVersion>#<em:maxVersion>20.*</em:maxVersion>#' install.rdf
+ cp -R * $dstdir
+ rm $dstdir/*.xpi
+ find $pkgdir -type d -exec chmod 0755 {} \;
+ find $pkgdir -type f -exec chmod 0644 {} \;
+}
diff --git a/libre/iceweasel-firebug/PKGBUILD b/libre/iceweasel-firebug/PKGBUILD
new file mode 100644
index 000000000..3920bd4f6
--- /dev/null
+++ b/libre/iceweasel-firebug/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 105364 2014-02-06 03:30:33Z speps $
+# Maintainer: speps <speps at aur dot archlinux dot org>
+
+pkgname=iceweasel-firebug
+pkgver=1.12.6
+pkgrel=1.1
+pkgdesc="Iceweasel plugin with tools for web development."
+arch=(any)
+url="http://getfirebug.com/"
+license=('custom:BSD')
+groups=('iceweasel-addons')
+depends=('iceweasel-libre')
+provides=('firebug' firefox-firebug=$pkgver)
+source=("${url}releases/firebug/${pkgver%.*}/firebug-$pkgver.xpi")
+md5sums=('e929032f03f3af210355905cd4ddf6d3')
+
+package() {
+ cd "$srcdir"
+
+ # extension
+ _dest="$pkgdir/usr/lib/iceweasel/browser/extensions/firebug@software.joehewitt.com"
+ find . -type d -exec install -d {} $_dest/{} \;
+ find . -type f -exec install -Dm644 {} $_dest/{} \;
+
+ # license
+ install -Dm644 license.txt \
+ "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/libre/iceweasel-l10n/PKGBUILD b/libre/iceweasel-l10n/PKGBUILD
index 0f3cb050a..1eb6bb91d 100644
--- a/libre/iceweasel-l10n/PKGBUILD
+++ b/libre/iceweasel-l10n/PKGBUILD
@@ -1,27 +1,24 @@
# Maintainer: André Silva <emulatorman@parabola.nu>
-# Maintainer: Márcio Silva <coadde@lavabit.com>
+# Contributor: Márcio Silva <coadde@parabola.nu>
# Contributor: Luke Shumaker <lukeshu@sbcglobal.net>
# Contributor: fauno <fauno@kiwwwi.com.ar>
# Contributor: Figue <ffigue@gmail.com>
# Based on icecat-i18n package, which is in turn based on firefox-i18n
-# When updating to a newer upstream release:
-# - Edit variables in in Makefile.
-# - (optionally) edit PKGBUILD.in
-# - Run 'make'. It will take care of everything else for you.
-
_debname=iceweasel
-_debver=26.0
-_debrel=deb1
+_debver=27.0
+_debrel=deb2
_debrepo=http://ftp.debian.org/debian/pool/main/
debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
-_langpacks=(ach af ak ar as ast be bg bn-BD bn-IN br bs ca cs csb cy da de el en-GB en-ZA eo es-AR es-CL es-ES es-MX et eu fa ff fi fr fy-NL ga-IE gd gl gu-IN he hi-IN hr hu hy-AM id is it ja kk km kn ko ku lg lij lt lv mai mk ml mr nb-NO nl nn-NO nso or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta ta-LK te th tr uk vi zh-CN zh-TW zu)
+_langpacks=(ach af an ar as ast be bg bn-BD br bs ca cs csb cy da de el en-GB en-ZA eo es-AR es-CL es-ES es-MX et eu fa ff fi fr fy-NL ga-IE gd gl gu-IN he hi-IN hr hu hy-AM id is it ja kk km kn ko lij lt lv mai mk ml mr nb-NO nl nn-NO or pa-IN pl pt-BR pt-PT rm ro ru si sk sl sq sr sv-SE ta te th tr uk vi xh zh-CN zh-TW)
pkgbase=iceweasel-l10n
-pkgname=($(for lang in ${_langpacks[@]}
- do echo $pkgbase-$lang | tr A-Z a-z
- done))
+pkgname=(
+ $(for lang in ${_langpacks[@]}; do
+ echo $pkgbase-$lang | tr A-Z a-z
+ done)
+)
epoch=1
pkgver=$_debver.$_debrel
pkgrel=1
@@ -33,134 +30,126 @@ license=('MPL' 'GPL')
depends=("iceweasel-libre>=$epoch:$pkgver")
makedepends=('unzip' 'zip')
source=('region.properties')
-for lang in ${_langpacks[@]}
-do
- source+=("${_debrepo}/`debfile ${_debname}`-l10n-$(echo $lang | tr A-Z a-z)_${_debver}-${_debrel#deb}_all.deb")
+for lang in ${_langpacks[@]}; do
+ source+=("${_debrepo}/`debfile ${_debname}`-l10n-$(echo $lang | tr A-Z a-z)_${_debver}-${_debrel#deb}_all.deb")
done
-_path="/usr/lib/iceweasel/browser/extensions/"
+_path=usr/lib/iceweasel/browser/extensions
-build() {
- cd "${srcdir}"
- for f in *.deb
- do
- bsdtar xf $f
- bsdtar xf data.tar.xz
+prepare() {
+ cd $srcdir
+ for f in *.deb; do
+ bsdtar xf $f
+ bsdtar xf data.tar.xz
done
- cd $srcdir/$_path
+ mv $_path/* .
+ rm -r {control.tar.gz,data.tar.xz,debian-binary,etc,usr}
+ rm -r *.deb
- for i in ${_langpacks[@]}
- do
- cd $srcdir/$_path
- unzip -q langpack-$i@iceweasel.mozilla.org.xpi -d $i
- rm langpack-$i@iceweasel.mozilla.org.xpi
- install -Dm644 $srcdir/region.properties $i/browser/chrome/$i/locale/browser-region
- cd $i
- zip -q -r $srcdir/$_path/langpack-$i@iceweasel.mozilla.org.xpi .
+ for lang in ${_langpacks[@]}; do
+ unzip -q langpack-$lang@iceweasel.mozilla.org.xpi -d $lang
+ rm langpack-$lang@iceweasel.mozilla.org.xpi
+ install -Dm644 $srcdir/region.properties $lang/browser/chrome/$lang/locale/browser-region
+ cd $lang
+ zip -q -r langpack-$lang@iceweasel.mozilla.org.xpi .
+ mv langpack-$lang@iceweasel.mozilla.org.xpi $srcdir
+ cd ..
+ rm -r $lang
done
-
- cd $srcdir
}
-for lang in ${_langpacks[@]}
-do
- eval "
-package_iceweasel-l10n-$(echo $lang | tr A-Z a-z)() {
- replaces=(firefox-i18n-$(echo $lang | tr A-Z a-z) iceweasel-i18n-$(echo $lang | tr A-Z a-z) iceweasel-libre-l10n-$(echo $lang | tr A-Z a-z))
- conflicts=(firefox-i18n-$(echo $lang | tr A-Z a-z) iceweasel-i18n-$(echo $lang | tr A-Z a-z) iceweasel-libre-l10n-$(echo $lang | tr A-Z a-z))
- provides=(firefox-i18n-$(echo $lang | tr A-Z a-z) iceweasel-i18n-$(echo $lang | tr A-Z a-z) iceweasel-libre-l10n-$(echo $lang | tr A-Z a-z))
- install -Dm644 \"\$srcdir$_path/langpack-$lang@iceweasel.mozilla.org.xpi\" \"\$pkgdir$_path/langpack-$lang@iceweasel.mozilla.org.xpi\"
-}
-"
+for lang in ${_langpacks[@]}; do
+ eval "
+ package_iceweasel-l10n-$(echo $lang | tr A-Z a-z)() {
+ replaces=(firefox-i18n-$(echo $lang | tr A-Z a-z) iceweasel-i18n-$(echo $lang | tr A-Z a-z) iceweasel-libre-l10n-$(echo $lang | tr A-Z a-z))
+ conflicts=(firefox-i18n-$(echo $lang | tr A-Z a-z) iceweasel-i18n-$(echo $lang | tr A-Z a-z) iceweasel-libre-l10n-$(echo $lang | tr A-Z a-z))
+ provides=(firefox-i18n-$(echo $lang | tr A-Z a-z) iceweasel-i18n-$(echo $lang | tr A-Z a-z) iceweasel-libre-l10n-$(echo $lang | tr A-Z a-z))
+ install -Dm644 \"\$srcdir/langpack-$lang@iceweasel.mozilla.org.xpi\" \"\$pkgdir/$_path/langpack-$lang@iceweasel.mozilla.org.xpi\"
+ }
+ "
done
md5sums=('a4593936bf1c7a9ec9368ff249f9cc56'
- '1034ab86bc45115f9ef614b85cfcdc19'
- '4c34d69b741bf1f33648b77c3322b2da'
- 'aacb59b72dd27ed06881cd01d81fa3a6'
- 'e64213a5fb34e8d53f13200f7b729c82'
- '0a92bec210e3f8aff64a81fda8780cf3'
- 'd0f290128bbf2a4383e982bf4e686b96'
- '3f008ae077bc54cb948cc6a08a78a0f6'
- '84fde08dd4da53def0491960a908f9ff'
- '2494d4cba834bf49d2e8f0ac6e86dec0'
- '328c526e9c41f32c5df0916d8633b8e7'
- '6bbd86c0180764b59e9762f7b33d5db3'
- 'd4c2de19670d608f16158908ae980e0d'
- '36c76ce311208ad2fcc19a06f02c4d52'
- '1de6bdd14302fff21d62472bf172e5bf'
- '8aceec26df106e67c4f19589fcef7588'
- 'edd2c8f8c3f6df1cc819cf8542b76196'
- '89b3ab8adace5efd25a92a091e3f6bac'
- 'fefbecae93e912447a8119115930f7d5'
- '236f1fc25ff6e104ca61bcb48342710f'
- '7a839afc851fcb2e3e630090586245ca'
- '12fea0abba7caf75da8ba7bcab99728a'
- '4779ce690c5f45c138ec36fff6360bed'
- 'e3b767cfb3318fc85b96d894ed4cdec5'
- '2a2d96b793f652520de146f9dc24755c'
- '17120e297fc252e97e0abd3ff1c2a10b'
- '2259d8189d34915f32ab31b4d53d6e87'
- 'b7aa28e93264aea26595fd98d7982abe'
- '01873dd70986ca857cf5e00b85a22adf'
- '2f88825d3925eb1bb21a0ad092308edd'
- '485e799de41f283c937cf6055e2f5523'
- 'f19e860a2d5435ee61d48ed328494212'
- 'd64ac8e776f808d61d2c2c4678124294'
- '74b6666fabaa8e270356eaa7a78b371c'
- '36304846e8a1ae604b29bdfb6b0c12ba'
- '0cdfde7a083cca4308bd23f7203bbe7b'
- '74a2103823f0f9a6b0bc614bd46272ca'
- 'e088239e0f15ad5d23099ab2cad19d92'
- '16b9e9814f154ffddd8d9612bdf9f8d8'
- '6a2aca46eabd374d80106328fea6e340'
- 'f680470cc3d6fc87276a9b17d6841ae2'
- '6964eef1fd96fa810de34f32844f31fc'
- '223e82aa9efb2376f44b7601e3ddbeae'
- 'd821062dd74179309981c18542412e2e'
- '7128e964f3d01da8967c5e57b2d76b93'
- '2cc4b1a603c29450d19dd98c15093fec'
- '595e155b3d15432d5de2c5962feea581'
- '9110dc57eff2d7cab6d7eeeb11f8e98c'
- '0503d87f660e9e86be6a3c32ed73e65c'
- 'e19e8f1702232f5d77ec0624071ccd7d'
- '5618dcfcc50831b8efccd0c0c093dfc2'
- '1020905e47d89bf40545a3bbdf52951b'
- '6d187dc8a4ac042e7c871134ca86b2c0'
- '36d5a7066f518c7db7464320e2b86fc8'
- '9654556b5c1a74a4ffe21091edbe26df'
- 'd5e6d93aa7f35e052a24b612730a70ba'
- 'b5f0df97c10290c555f3002655f5bfe6'
- 'f1f4d8897422ed5328e1b2325a1f1198'
- '3bfa9cbe5abd0ea40c70e16cd2f5c24c'
- 'f27983d5cf79aa478409c33dae988ce2'
- 'cbf40cf391dd5bbac1665a8180f81620'
- '69ffe26a603ddc25bc7d9e56a70b6399'
- '90d6449031ae5e06acd8cffdb0d01e05'
- '326ad24d994971a2405dcb1532cce6bf'
- '5ced14adbdddd81bda4a9cd2ddd92ee4'
- 'b86565c39ef253d51a39bc851e7b354d'
- '915f6058a855a59cddeb027d2a518dce'
- '58f8bfcd609626a2a76ff22206e2033f'
- '9b0be982d506f060319bd3c41aee0896'
- '65cd9c3cf11f1937be0a1dc0802f3d1a'
- '454413e97a0d19ba018ebc60e2502d2b'
- '45b8f8cdb117eca4eaaa1d6b449569f5'
- 'f10ef03517f558c15fca7db4d9e50ad1'
- '5a3465027d47bd30da6a77f92e94fd08'
- '56ecb69e73f7d3447019e6f3b23aebba'
- 'c02e08ff0732233738fe3af877513a34'
- '3a4fbbfeb24cff45933c53dac27d6fdc'
- 'a2245eca0bca1d615e031e82734b8e43'
- '62f4ea1010191b721aa8b2d6130a3c1e'
- '45bd1ab2f164630366ce6004d0070f55'
- '1cce5000ad1146b1cfc5ff9cd5db175b'
- 'b9283671cf87329296b62f529e8e7709'
- '17fa69f4617ce5706fe11c54d5a737a8'
- 'cfd0b7b1215f13cfcd8eb1d0ab335aa4'
- '6ec5cd2855ae69f8998de2305109bd91'
- '4b121cb7694f5962c99c479a26442905'
- '6aa873082d24918f489431be9be7300a'
- 'f36aafb79f6120698f9b890c52dbd301'
- 'ff581801e9a9663e4562a5d28d4cbe2d')
+ 'de575fedef8fd6b811334d8b9c082479'
+ '36043f6b423fd8c0a378c2e5fcb3a3c1'
+ '306ef53afb18ffa3ec57feb0063ab433'
+ '9af26b5177f1b20cb682299345ad1a87'
+ '21d7586f0dcc740835c9d3a6e9cee397'
+ '94c11e19db72eea7a5630bbf6c4a992d'
+ '86f1a539a8f9af7ea81a63f11a882b70'
+ 'c62fdd3ce834337d43c4e59af3b87553'
+ '0678ff6935296e17e36c40b3fc17ac96'
+ '680ff4dbae9ce0b9f1bcd092169e6a34'
+ 'dc8e478e69b1ee22126cb6addc744fe5'
+ 'a513f4af7f608347225cd4180e89dee6'
+ '17d1e0cd0c7023461fc5dde7b97ee4b1'
+ 'c08f2cd5a29737b20ecc2f7c2892bd74'
+ '8ff5f9ea03c3fff51142df8c52626b22'
+ 'f8a42eb22e2192793a85112adb8e2278'
+ 'f1b221697547feff3e69889a9e9dd1b4'
+ '1c106f032476d2443b368e52d9e1bc69'
+ 'dbf5e2a01c84e18dc19ed9be5e12920b'
+ '9d6e6b497af88a0b5c44845adf275f9d'
+ 'aeb7f058aabd5d7d4e05f8e7917bd59b'
+ '4612bf235fdfd328e176b3e682e61072'
+ 'ebf5aefb15834234fbac6a4310b8f8ab'
+ '7591125ee445836f9e1247f5a7f6a474'
+ '410d090d68240f1f304ff94c4847817e'
+ '96a9dbd806a336936a4642ae95d12a26'
+ '4924dd568df7dc0428f3458758eadca1'
+ '62d46770f79074fc90ce4c1e4f5e5169'
+ 'c57d361eaa5d0fb90e872dd8f1d3fce1'
+ 'dbbba15f93f960c19bab63599b8f771c'
+ '0025e4609f5d1f72bf784f35d42934a9'
+ '638306adb405c506baa2728a00237d50'
+ '7ae2cbe9e2888b95a513eb8238e6e5d2'
+ '8b560d4ae6f62bb64d8fa8c1a62abe27'
+ '52bd4641b6066a2a0596c7b4f64b25c1'
+ '9293f6d596e7586c7955cc0d6d71dbbb'
+ 'a634db784e4bb6efda49e2508d58c96c'
+ 'ebf52ea0d70699f5d2651054b975dac2'
+ '6fbf98e9d4477d3355369bbf9c33c9aa'
+ 'a0c6cb16be15cdca746f52fe07af0ab8'
+ '934f4c14a9242228da3322bd844f001b'
+ '29df15b3dad1764cb236e1913adb6895'
+ '8f4bd42afb2b0042300b50dbd575ed76'
+ '9f1d8951c50f6dd133089824db8e811b'
+ 'df683c5a6b64226311f1158e1cfd7387'
+ 'ddf59c931fb1d11337dfb30796172222'
+ '3c69e0fa5c10427c9d95b26fecb73366'
+ 'fdf86cfbcf7e6084f01fda86b3907d68'
+ '4f602efbc5ee7dbcf315b7c00c5a9824'
+ '30012df56189ba8de7a2be3089ac7037'
+ '90660c135667807a35d5a424a14a03c7'
+ '39e8128c27e68f03db07ec9d3a4661f4'
+ '34c9463b7bd4000cb6c2178568ea5d57'
+ 'd6008349e2b26e11b4bf29d182236d15'
+ '1d51c2c91f10f459227a2c4e16e2cf52'
+ '59b1f8e007070d0ac598cc8782cc775d'
+ '23f7deb8fbbf8b74426299cf239e83bd'
+ '81ec70e9b9fdf887d00c9422d94803d0'
+ 'b4aea1741607118d5d128df88181c363'
+ '52dbb00c5e7adcdee972b2daf689401b'
+ 'a180a40f9651e8ca3ebdb3001fce6fa7'
+ 'fed061bc838b9eec2e1c187e64b93176'
+ '09b9eae4bdfbc1f7f4939f01a325bb40'
+ '337f7aaf9a2d7b94a9c33648a9734287'
+ '647abcd745c18a80e5187bc28b1b67b8'
+ 'b9c5f0043fe7c26e23ba42450afb57b6'
+ '6c9bb760adb3ae75ddb969c595649732'
+ '70917dca185cf1f150df72eb848b6315'
+ 'cc16dd7b22855338055429a3fd1a2367'
+ '236a36024c7660e7ec0ab2c7931b9ea0'
+ '471e98027910bcbfba3957df1e6a3c4a'
+ 'cea62f763650bb50e770055288e3bd7c'
+ '0f4abd8240ecc996fd434b0139a9996b'
+ 'cec783e074568d1c750ee88a2bbb003f'
+ '437d59dd764666147bfe5d27b0848b94'
+ 'f05ac803378d996351a277ebcc99e0e2'
+ '13ddcd0d7c10e381458d5563476d53c3'
+ 'f33a663b92b61fa02c28b881deae2376'
+ '4c4b58d49295b0b873f265ffa369a27d'
+ '67e54d3c0058263192700617500045e7'
+ '1022e9f23438b96df2f0dd054ff195b0'
+ '8274a6aafc5b097ab0659675d66b87c6')
diff --git a/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch b/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
index c9df18dc4..82ba01a9c 100644
--- a/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
+++ b/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
@@ -273,10 +273,10 @@ index f35c227..7062886 100644
%{C++
diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
-index 42fbd15..6c3dbfe 100644
+index 20a3d6e..87e351d 100644
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
-@@ -3737,7 +3737,7 @@ XREMain::XRE_mainRun()
+@@ -3843,7 +3843,7 @@ XREMain::XRE_mainRun()
if (gDoProfileReset) {
// Automatically migrate from the current application if we just
// reset the profile.
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 6d49588e8..5c6313e9e 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -1,11 +1,11 @@
# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+# Contributor (Parabola): Márcio Silva <coadde@parabola.nu>
# Contributor (ConnochaetOS): Henry Jensen <hjensen@connochaetos.org>
# Contributor (Parabola): Luke Shumaker <lukeshu@sbcglobal.net>
-# Contributor: Figue <ffigue at gmail>
# Contributor (Parabola): fauno <fauno@kiwwwi.com.ar>
# Contributor (Parabola): vando <facundo@esdebian.org>
# Contributor (Arch): Jakub Schmidtke <sjakub@gmail.com>
+# Contributor: Figue <ffigue at gmail>
# Thank you very much to the older contributors:
# Contributor: evr <evanroman at gmail>
# Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com>
@@ -14,8 +14,8 @@ _pgo=true
# We're getting this from Debian Experimental
_debname=iceweasel
-_debver=26.0
-_debrel=deb1
+_debver=27.0
+_debrel=deb2
_debrepo=http://ftp.debian.org/debian/pool/main/
debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -23,7 +23,7 @@ _pkgname=iceweasel
pkgname=iceweasel-libre
epoch=1
pkgver=$_debver.$_debrel
-pkgrel=3
+pkgrel=1
pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox."
arch=(i686 x86_64 mips64el)
@@ -49,7 +49,7 @@ replaces=('firefox')
conflicts=('firefox')
provides=('firefox')
source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2"
- "$_debrepo/`debfile $_debname`_$_debver-${_debrel#deb}.debian.tar.gz"
+ "$_debrepo/`debfile $_debname`_$_debver-${_debrel#deb}.debian.tar.xz"
mozconfig
mozconfig.pgo
libre.patch
@@ -60,17 +60,17 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2"
iceweasel-20.0.1-fixed-loading-icon.png
Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
Fixup-Reset-Firefox-after-bad-merge.patch)
-md5sums=('219cf21e0642e8a364365286f23d0624'
- '2001d0477bcefd0eeaab584402133691'
+md5sums=('0baf0b166421f785db79bd33fe7b0748'
+ '2446de5f7844caae8cd7e46b3b72119c'
'023120a970670dc85cea19393f0b94b6'
'df08eaa1ac3bc6c2356be4fbf8ec8932'
- 'fea121a94737ec8641b39e7120a048d3'
+ '641e8b54a684161c60209b81f260a19b'
'b03a979a78484503ba8dddad4f2c96d1'
'7b9e5996dd9fe0b186a43a297db1c6b5'
'6620e724ec9a1be74e65089d81d802f7'
'816013881cfc9a1f4f0ede72b014f8b3'
'6e335a517c68488941340ee1c23f97b0'
- 'dbf1c021e5f7ac323197b219bf213c50'
+ '3dcb1f1eccce5b6b90fa48ab94bf7a47'
'8e165ef85ddd72491f0b48f8954afca6')
prepare() {
@@ -171,6 +171,10 @@ prepare() {
# https://bugzilla.mozilla.org/show_bug.cgi?id=841734
cp "$srcdir/iceweasel-20.0.1-fixed-loading-icon.png" \
browser/themes/linux/tabbrowser/loading.png
+
+ # Remove non-existent file on Makefile.in
+ sed -i '\|build/pgo/blueprint/valid.png|d' build/Makefile.in
+
}
build() {
diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch
index 2384818b4..4be59abff 100644
--- a/libre/iceweasel-libre/libre.patch
+++ b/libre/iceweasel-libre/libre.patch
@@ -1,8 +1,8 @@
diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
-index 331edc8..226508d 100644
+index 3840da4..fe1c05c 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
-@@ -242,11 +242,6 @@ pref("browser.slowStartup.notificationDisabled", false);
+@@ -272,11 +272,6 @@ pref("browser.slowStartup.notificationDisabled", false);
pref("browser.slowStartup.timeThreshold", 60000);
pref("browser.slowStartup.maxSamples", 5);
@@ -14,7 +14,7 @@ index 331edc8..226508d 100644
pref("browser.enable_automatic_image_resizing", true);
pref("browser.chrome.site_icons", true);
pref("browser.chrome.favicons", true);
-@@ -1283,11 +1278,7 @@ pref("pdfjs.previousHandler.alwaysAskBeforeHandling", false);
+@@ -1318,11 +1313,7 @@ pref("shumway.disabled", true);
// (This is intentionally on the high side; see bug 746055.)
pref("image.mem.max_decoded_image_kb", 256000);
@@ -25,7 +25,7 @@ index 331edc8..226508d 100644
-pref("social.sidebar.unload_timeout_ms", 10000);
+// removed facebook sidebar with Iceweasel.
- pref("dom.identity.enabled", false);
+ pref("social.allowMultipleWorkers", true);
diff --git a/browser/base/content/abouthome/aboutHome.css b/browser/base/content/abouthome/aboutHome.css
index c270318..049fe6e 100644
@@ -173,10 +173,10 @@ index c270318..049fe6e 100644
}
diff --git a/browser/base/content/abouthome/aboutHome.js b/browser/base/content/abouthome/aboutHome.js
-index 432fcdc..8e85f1f 100644
+index 432fcdc..bd1692a 100644
--- a/browser/base/content/abouthome/aboutHome.js
+++ b/browser/base/content/abouthome/aboutHome.js
-@@ -3,317 +3,99 @@
+@@ -3,152 +3,44 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
const SEARCH_ENGINES = {
@@ -352,59 +352,35 @@ index 432fcdc..8e85f1f 100644
- "https://www.mozilla.org/firefox/features/?utm_source=snippet&utm_medium=snippet&utm_campaign=default+feature+snippet"
-, "https://addons.mozilla.org/firefox/?utm_source=snippet&utm_medium=snippet&utm_campaign=addons"
-];
-
+-
-const SNIPPETS_UPDATE_INTERVAL_MS = 86400000; // 1 Day.
-+// Bug with dom.storage.enabled set as false
-+// We are using DDG as a default in this case.
-+let gSearchEngine = {"name": "DuckDuckGo HTML", "searchUrl": "https://duckduckgo.com/html/?t=iceweasel&q=_searchTerms_"};
-
+-
-// IndexedDB storage constants.
-const DATABASE_NAME = "abouthome";
-const DATABASE_VERSION = 1;
-const SNIPPETS_OBJECTSTORE_NAME = "snippets";
-
--// This global tracks if the page has been set up before, to prevent double inits
--let gInitialized = false;
--let gObserver = new MutationObserver(function (mutations) {
-- for (let mutation of mutations) {
-- if (mutation.attributeName == "searchEngineName") {
-- setupSearchEngine();
-- if (!gInitialized) {
+ // This global tracks if the page has been set up before, to prevent double inits
+ let gInitialized = false;
+ let gObserver = new MutationObserver(function (mutations) {
+@@ -156,7 +48,6 @@ let gObserver = new MutationObserver(function (mutations) {
+ if (mutation.attributeName == "searchEngineName") {
+ setupSearchEngine();
+ if (!gInitialized) {
- ensureSnippetsMapThen(loadSnippets);
-- gInitialized = true;
-- }
-- return;
-- }
-- }
--});
--
--window.addEventListener("pageshow", function () {
-- // Delay search engine setup, cause browser.js::BrowserOnAboutPageLoad runs
-- // later and may use asynchronous getters.
-- window.gObserver.observe(document.documentElement, { attributes: true });
-- fitToWidth();
-- window.addEventListener("resize", fitToWidth);
--
-- // Ask chrome to update snippets.
-- var event = new CustomEvent("AboutHomeLoad", {bubbles:true});
-- document.dispatchEvent(event);
--});
--
--window.addEventListener("pagehide", function() {
-- window.gObserver.disconnect();
-- window.removeEventListener("resize", fitToWidth);
-+document.addEventListener("DOMContentLoaded", function init() {
-+ setupSearchEngine();
+ gInitialized = true;
+ }
+ return;
+@@ -181,117 +72,6 @@ window.addEventListener("pagehide", function() {
+ window.removeEventListener("resize", fitToWidth);
});
-+window.addEventListener("load", fitToWidth);
-+window.addEventListener("resize", fitToWidth);
-// This object has the same interface as Map and is used to store and retrieve
-// the snippets data. It is lazily initialized by ensureSnippetsMapThen(), so
-// be sure its callback returned before trying to use it.
-let gSnippetsMap;
-let gSnippetsMapCallbacks = [];
-
+-
-/**
- * Ensure the snippets map is properly initialized.
- *
@@ -414,8 +390,7 @@ index 432fcdc..8e85f1f 100644
- * it may change inadvertently.
- */
-function ensureSnippetsMapThen(aCallback)
-+function onSearchSubmit(aEvent)
- {
+-{
- if (gSnippetsMap) {
- aCallback(gSnippetsMap);
- return;
@@ -431,44 +406,30 @@ index 432fcdc..8e85f1f 100644
- let invokeCallbacks = function () {
- if (!gSnippetsMap) {
- gSnippetsMap = Object.freeze(new Map());
-+ let searchTerms = document.getElementById("searchText").value;
-+ if (gSearchEngine && searchTerms.length > 0) {
-+ const SEARCH_TOKENS = {
-+ "_searchTerms_": encodeURIComponent(searchTerms)
- }
+- }
-
- for (let callback of gSnippetsMapCallbacks) {
- callback(gSnippetsMap);
-+ let url = gSearchEngine.searchUrl;
-+ for (let key in SEARCH_TOKENS) {
-+ url = url.replace(key, SEARCH_TOKENS[key]);
- }
+- }
- gSnippetsMapCallbacks.length = 0;
-+ window.location.href = url;
- }
-
+- }
+-
- let openRequest = indexedDB.open(DATABASE_NAME, DATABASE_VERSION);
-+ aEvent.preventDefault();
-+}
-
+-
- openRequest.onerror = function (event) {
- // Try to delete the old database so that we can start this process over
- // next time.
- indexedDB.deleteDatabase(DATABASE_NAME);
- invokeCallbacks();
- };
-
+-
- openRequest.onupgradeneeded = function (event) {
- let db = event.target.result;
- if (!db.objectStoreNames.contains(SNIPPETS_OBJECTSTORE_NAME)) {
- db.createObjectStore(SNIPPETS_OBJECTSTORE_NAME);
- }
-+function setupSearchEngine()
-+{
-+ if (localStorage && localStorage["search-engine"]) {
-+ gSearchEngine = JSON.parse(localStorage["search-engine"]);
- }
-
+- }
+-
- openRequest.onsuccess = function (event) {
- let db = event.target.result;
-
@@ -522,80 +483,16 @@ index 432fcdc..8e85f1f 100644
-
- setTimeout(invokeCallbacks, 0);
- }
-+
-+ // Look for extended information, like logo and links.
-+ var searchEngineInfo = SEARCH_ENGINES[gSearchEngine.name];
-+ if (searchEngineInfo) {
-+ for (let prop in searchEngineInfo)
-+ gSearchEngine[prop] = searchEngineInfo[prop];
- }
--}
-
--function onSearchSubmit(aEvent)
--{
-- let searchTerms = document.getElementById("searchText").value;
-- let engineName = document.documentElement.getAttribute("searchEngineName");
-+ // Enqueue additional params if required by the engine definition.
-+ if (gSearchEngine.params)
-+ gSearchEngine.searchUrl += "&" + gSearchEngine.params;
-
-- if (engineName && searchTerms.length > 0) {
-- // Send an event that will perform a search and Firefox Health Report will
-- // record that a search from about:home has occurred.
-- let eventData = JSON.stringify({
-- engineName: engineName,
-- searchTerms: searchTerms
-- });
-- let event = new CustomEvent("AboutHomeSearchEvent", {detail: eventData});
-- document.dispatchEvent(event);
-+ // Add search engine logo.
-+ if (gSearchEngine.image) {
-+ let logoElt = document.getElementById("searchEngineLogo");
-+ logoElt.src = gSearchEngine.image;
-+ logoElt.alt = gSearchEngine.name;
- }
-
-- aEvent.preventDefault();
--}
--
--
--function setupSearchEngine()
--{
- // The "autofocus" attribute doesn't focus the form element
- // immediately when the element is first drawn, so the
- // attribute is also used for styling when the page first loads.
-@@ -322,173 +104,6 @@ function setupSearchEngine()
- searchText.removeEventListener("blur", searchText_onBlur);
- searchText.removeAttribute("autofocus");
- });
--
-- let searchEngineName = document.documentElement.getAttribute("searchEngineName");
-- let searchEngineInfo = SEARCH_ENGINES[searchEngineName];
-- let logoElt = document.getElementById("searchEngineLogo");
--
-- // Add search engine logo.
-- if (searchEngineInfo && searchEngineInfo.image) {
-- logoElt.parentNode.hidden = false;
-- logoElt.src = searchEngineInfo.image;
-- logoElt.alt = searchEngineName;
-- searchText.placeholder = "";
-- }
-- else {
-- logoElt.parentNode.hidden = true;
-- searchText.placeholder = searchEngineName;
- }
--
--}
--
--/**
-- * Inform the test harness that we're done loading the page.
-- */
--function loadSucceeded()
--{
-- var event = new CustomEvent("AboutHomeLoadSnippetsSucceeded", {bubbles:true});
-- document.dispatchEvent(event);
-}
-
+ function onSearchSubmit(aEvent)
+ {
+ let searchTerms = document.getElementById("searchText").value;
+@@ -350,147 +130,6 @@ function loadSucceeded()
+ document.dispatchEvent(event);
+ }
+
-/**
- * Update the local snippets from the remote storage, then show them through
- * showSnippets.
@@ -735,14 +632,16 @@ index 432fcdc..8e85f1f 100644
- }
- // Move the default snippet to the snippets element.
- snippetsElt.appendChild(entry);
- }
-
+-}
+-
function fitToWidth() {
+ if (window.scrollMaxX) {
+ document.body.setAttribute("narrow", "true");
diff --git a/browser/base/content/abouthome/aboutHome.xhtml b/browser/base/content/abouthome/aboutHome.xhtml
-index 1d03d38..fda3095 100644
+index 1d03d38..5d808db 100644
--- a/browser/base/content/abouthome/aboutHome.xhtml
+++ b/browser/base/content/abouthome/aboutHome.xhtml
-@@ -43,30 +43,9 @@
+@@ -43,15 +43,6 @@
<input id="searchSubmit" type="submit" value="&abouthome.searchEngineButton.label;"/>
</form>
</div>
@@ -758,245 +657,16 @@ index 1d03d38..fda3095 100644
</div>
<div class="spacer"/>
-- <div id="launcher">
-- <button class="launchButton" id="downloads">&abouthome.downloadsButton.label;</button>
-- <button class="launchButton" id="bookmarks">&abouthome.bookmarksButton.label;</button>
-- <button class="launchButton" id="history">&abouthome.historyButton.label;</button>
-- <button class="launchButton" id="apps" hidden="true">&abouthome.appsButton.label;</button>
-- <button class="launchButton" id="addons">&abouthome.addonsButton.label;</button>
-- <button class="launchButton" id="sync">&abouthome.syncButton.label;</button>
-- <button class="launchButton" id="settings">&abouthome.settingsButton.label;</button>
-- <div id="restorePreviousSessionSeparator"/>
-- <button class="launchButton" id="restorePreviousSession">&historyRestoreLastSession.label;</button>
-- </div>
--
+@@ -67,6 +58,6 @@
+ <button class="launchButton" id="restorePreviousSession">&historyRestoreLastSession.label;</button>
+ </div>
+
- <a id="aboutMozilla" href="https://www.mozilla.org/about/?utm_source=about-home&amp;utm_medium=Referral"/>
+ <a id="aboutGNU" href="http://gnu.org"></a>
</body>
</html>
-diff --git a/browser/base/content/content.js b/browser/base/content/content.js
-index 9428613..fc3c00a 100644
---- a/browser/base/content/content.js
-+++ b/browser/base/content/content.js
-@@ -50,216 +50,3 @@ if (Services.prefs.getBoolPref("browser.tabs.remote")) {
- LoginManagerContent.onUsernameInput(event);
- });
- }
--
--let AboutHomeListener = {
-- init: function(chromeGlobal) {
-- chromeGlobal.addEventListener('AboutHomeLoad', () => this.onPageLoad(), false, true);
-- },
--
-- handleEvent: function(aEvent) {
-- switch (aEvent.type) {
-- case "AboutHomeLoad":
-- this.onPageLoad();
-- break;
-- }
-- },
--
-- receiveMessage: function(aMessage) {
-- switch (aMessage.name) {
-- case "AboutHome:Update":
-- this.onUpdate(aMessage.data);
-- break;
-- }
-- },
--
-- onUpdate: function(aData) {
-- let doc = content.document;
-- if (doc.documentURI.toLowerCase() != "about:home")
-- return;
--
-- if (aData.showRestoreLastSession && !PrivateBrowsingUtils.isWindowPrivate(content))
-- doc.getElementById("launcher").setAttribute("session", "true");
--
-- // Inject search engine and snippets URL.
-- let docElt = doc.documentElement;
-- // set the following attributes BEFORE searchEngineName, which triggers to
-- // show the snippets when it's set.
-- docElt.setAttribute("snippetsURL", aData.snippetsURL);
-- if (aData.showKnowYourRights)
-- docElt.setAttribute("showKnowYourRights", "true");
-- docElt.setAttribute("snippetsVersion", aData.snippetsVersion);
-- docElt.setAttribute("searchEngineName", Services.search.defaultEngine.name);
-- },
--
-- onPageLoad: function() {
-- let doc = content.document;
-- if (doc.documentURI.toLowerCase() != "about:home" ||
-- doc.documentElement.hasAttribute("hasBrowserHandlers")) {
-- return;
-- }
--
-- doc.documentElement.setAttribute("hasBrowserHandlers", "true");
-- let updateListener = this;
-- addMessageListener("AboutHome:Update", updateListener);
-- addEventListener("click", this.onClick, true);
-- addEventListener("pagehide", function onPageHide(event) {
-- if (event.target.defaultView.frameElement)
-- return;
-- removeMessageListener("AboutHome:Update", updateListener);
-- removeEventListener("click", this.onClick, true);
-- removeEventListener("pagehide", onPageHide, true);
-- if (event.target.documentElement)
-- event.target.documentElement.removeAttribute("hasBrowserHandlers");
-- }, true);
--
-- // XXX bug 738646 - when Marketplace is launched, remove this statement and
-- // the hidden attribute set on the apps button in aboutHome.xhtml
-- if (Services.prefs.getPrefType("browser.aboutHome.apps") == Services.prefs.PREF_BOOL &&
-- Services.prefs.getBoolPref("browser.aboutHome.apps"))
-- doc.getElementById("apps").removeAttribute("hidden");
--
-- sendAsyncMessage("AboutHome:RequestUpdate");
--
-- doc.addEventListener("AboutHomeSearchEvent", function onSearch(e) {
-- sendAsyncMessage("AboutHome:Search", { searchData: e.detail });
-- }, true, true);
-- },
--
-- onClick: function(aEvent) {
-- if (!aEvent.isTrusted || // Don't trust synthetic events
-- aEvent.button == 2 || aEvent.target.localName != "button") {
-- return;
-- }
--
-- let originalTarget = aEvent.originalTarget;
-- let ownerDoc = originalTarget.ownerDocument;
-- let elmId = originalTarget.getAttribute("id");
--
-- switch (elmId) {
-- case "restorePreviousSession":
-- sendAsyncMessage("AboutHome:RestorePreviousSession");
-- ownerDoc.getElementById("launcher").removeAttribute("session");
-- break;
--
-- case "downloads":
-- sendAsyncMessage("AboutHome:Downloads");
-- break;
--
-- case "bookmarks":
-- sendAsyncMessage("AboutHome:Bookmarks");
-- break;
--
-- case "history":
-- sendAsyncMessage("AboutHome:History");
-- break;
--
-- case "apps":
-- sendAsyncMessage("AboutHome:Apps");
-- break;
--
-- case "addons":
-- sendAsyncMessage("AboutHome:Addons");
-- break;
--
-- case "sync":
-- sendAsyncMessage("AboutHome:Sync");
-- break;
--
-- case "settings":
-- sendAsyncMessage("AboutHome:Settings");
-- break;
-- }
-- },
--};
--AboutHomeListener.init(this);
--
--
--var global = this;
--
--let ClickEventHandler = {
-- init: function init() {
-- Cc["@mozilla.org/eventlistenerservice;1"]
-- .getService(Ci.nsIEventListenerService)
-- .addSystemEventListener(global, "click", this, true);
-- },
--
-- handleEvent: function(event) {
-- // Bug 903016: Most of this code is an unfortunate duplication from
-- // contentAreaClick in browser.js.
-- if (!event.isTrusted || event.defaultPrevented || event.button == 2)
-- return;
--
-- let [href, node] = this._hrefAndLinkNodeForClickEvent(event);
--
-- let json = { button: event.button, shiftKey: event.shiftKey,
-- ctrlKey: event.ctrlKey, metaKey: event.metaKey,
-- altKey: event.altKey, href: null, title: null,
-- bookmark: false };
--
-- if (href) {
-- json.href = href;
-- if (node) {
-- json.title = node.getAttribute("title");
--
-- if (event.button == 0 && !event.ctrlKey && !event.shiftKey &&
-- !event.altKey && !event.metaKey) {
-- json.bookmark = node.getAttribute("rel") == "sidebar";
-- if (json.bookmark)
-- event.preventDefault(); // Need to prevent the pageload.
-- }
-- }
--
-- sendAsyncMessage("Content:Click", json);
-- return;
-- }
--
-- // This might be middle mouse navigation.
-- if (event.button == 1)
-- sendAsyncMessage("Content:Click", json);
-- },
--
-- /**
-- * Extracts linkNode and href for the current click target.
-- *
-- * @param event
-- * The click event.
-- * @return [href, linkNode].
-- *
-- * @note linkNode will be null if the click wasn't on an anchor
-- * element (or XLink).
-- */
-- _hrefAndLinkNodeForClickEvent: function(event) {
-- function isHTMLLink(aNode) {
-- // Be consistent with what nsContextMenu.js does.
-- return ((aNode instanceof content.HTMLAnchorElement && aNode.href) ||
-- (aNode instanceof content.HTMLAreaElement && aNode.href) ||
-- aNode instanceof content.HTMLLinkElement);
-- }
--
-- let node = event.target;
-- while (node && !isHTMLLink(node)) {
-- node = node.parentNode;
-- }
--
-- if (node)
-- return [node.href, node];
--
-- // If there is no linkNode, try simple XLink.
-- let href, baseURI;
-- node = event.target;
-- while (node && !href) {
-- if (node.nodeType == content.Node.ELEMENT_NODE) {
-- href = node.getAttributeNS("http://www.w3.org/1999/xlink", "href");
-- if (href)
-- baseURI = node.ownerDocument.baseURIObject;
-- }
-- node = node.parentNode;
-- }
--
-- // In case of XLink, we don't return the node we got href from since
-- // callers expect <a>-like elements.
-- // Note: makeURI() will throw if aUri is not a valid URI.
-- return [href ? makeURI(href, null, baseURI).spec : null, null];
-- }
--};
--ClickEventHandler.init();
diff --git a/browser/base/jar.mn b/browser/base/jar.mn
-index f2a820c..9478039 100644
+index 3113094..e852cec 100644
--- a/browser/base/jar.mn
+++ b/browser/base/jar.mn
@@ -33,7 +33,7 @@ browser.jar:
@@ -1090,7 +760,7 @@ index 087cc50..5654eb9 100644
+gecko.handlerService.schemes.ircs.0.name=Freenode Web IRC
+gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net
diff --git a/browser/locales/generic/profile/bookmarks.html.in b/browser/locales/generic/profile/bookmarks.html.in
-index e925c1e..5101035 100644
+index e925c1e..8c121fc 100644
--- a/browser/locales/generic/profile/bookmarks.html.in
+++ b/browser/locales/generic/profile/bookmarks.html.in
@@ -15,13 +15,20 @@
@@ -1121,7 +791,7 @@ index e925c1e..5101035 100644
</DL><p>
</DL><p>
diff --git a/browser/modules/AboutHome.jsm b/browser/modules/AboutHome.jsm
-index 98c443d..0173762 100644
+index c3dc6b2..df312e3 100644
--- a/browser/modules/AboutHome.jsm
+++ b/browser/modules/AboutHome.jsm
@@ -8,7 +8,7 @@ let Cc = Components.classes;
@@ -1200,13 +870,14 @@ index 98c443d..0173762 100644
/**
* This code provides services to the about:home page. Whenever
* about:home needs to do something chrome-privileged, it sends a
-@@ -185,17 +125,8 @@ let AboutHome = {
+@@ -186,18 +126,9 @@ let AboutHome = {
ss.promiseInitialized.then(function() {
let data = {
showRestoreLastSession: ss.canRestoreLastSession,
- snippetsURL: AboutHomeUtils.snippetsURL,
- showKnowYourRights: AboutHomeUtils.showKnowYourRights,
-- snippetsVersion: AboutHomeUtils.snippetsVersion
+- snippetsVersion: AboutHomeUtils.snippetsVersion,
+ defaultEngineName: Services.search.defaultEngine.name
};
- if (AboutHomeUtils.showKnowYourRights) {
diff --git a/libre/iceweasel-noscript/PKGBUILD b/libre/iceweasel-noscript/PKGBUILD
index 5cde02a92..3250bad42 100644
--- a/libre/iceweasel-noscript/PKGBUILD
+++ b/libre/iceweasel-noscript/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 104641 2014-01-24 07:00:27Z spupykin $
+# $Id: PKGBUILD 105656 2014-02-13 09:26:07Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
_pkgname=firefox-noscript
pkgname=iceweasel-noscript
-pkgver=2.6.8.13
+pkgver=2.6.8.14
pkgrel=1
pkgdesc="plugin for iceweasel which disables script"
arch=('any')
@@ -14,7 +14,7 @@ depends=()
provides=$_pkgname=$pkgver
makedepends=('unzip')
source=(https://secure.informaction.com/download/releases/noscript-$pkgver.xpi)
-md5sums=('75ec11cc5f3f039e81113abfb908110e')
+md5sums=('f0ecd6bd7c7331d77c91df55bdb3d7da')
package() {
# _ffver=`pacman -Q iceweasel-libre | cut -f2 -d\ | cut -f1 -d-`
diff --git a/libre/iceweasel-raismth/PKGBUILD b/libre/iceweasel-raismth/PKGBUILD
new file mode 100644
index 000000000..ee3b9119e
--- /dev/null
+++ b/libre/iceweasel-raismth/PKGBUILD
@@ -0,0 +1,28 @@
+# $Id: PKGBUILD 101450 2013-11-25 21:16:28Z speps $
+# Maintainer: speps <speps at aur dot archlinux dot org>
+
+pkgname=iceweasel-raismth
+pkgver=4.0.1
+pkgrel=1.1
+pkgdesc="Iceweasel plugin for watching Rai.tv live channels, vod and replay contents w/o *light (Silverlight/Moonlight)"
+arch=('any')
+url="http://acab.servebeer.com/"
+license=('GPL3')
+groups=('iceweasel-addons')
+depends=('iceweasel-libre')
+optdepends=('mplayer: default video player'
+ 'faad: default audio player')
+provides=('raismth' firefox-raismth=$pkgver)
+source=("${url}raismth-$pkgver.xpi")
+md5sums=('f772ef1a74b0aba3a739849fee3238ea')
+
+package() {
+ cd "$srcdir"
+
+ # extension
+ _dest="$pkgdir/usr/lib/iceweasel/browser/extensions/raismth@mitm.rc"
+ find . -type d -exec install -d {} $_dest/{} \;
+ find . -type f -exec install -Dm644 {} $_dest/{} \;
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/libre/iceweasel-spell-ru/PKGBUILD b/libre/iceweasel-spell-ru/PKGBUILD
new file mode 100644
index 000000000..b9bb8b6f9
--- /dev/null
+++ b/libre/iceweasel-spell-ru/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 90907 2013-05-15 13:06:09Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Maciej Sitarz <macieks@freesco.pl>
+
+pkgname=iceweasel-spell-ru
+pkgver=0.4.4
+pkgrel=13.1
+pkgdesc="Russian spellchecker dictionary for Iceweasel"
+arch=(any)
+url="https://addons.mozilla.org/firefox/dictionaries/"
+license=("GPL")
+depends=("iceweasel-libre")
+provides=(firefox-spell-ru=$pkgver)
+noextract=(russian_spellchecking_dictionary_with_io_support-$pkgver-fx+tb+sm.xpi)
+source=(https://addons.mozilla.org/firefox/downloads/file/98798/russian_spellchecking_dictionary-$pkgver-fx+tb+sm.xpi)
+md5sums=('269a8bdd38a5641b5f6cfb12715f1029')
+
+package() {
+# _ffver=`pacman -Q iceweasel-libre | cut -f2 -d\ | cut -f1 -d-`
+# depends=("iceweasel-libre>=${_ffver}" "iceweasel-libre<=${_ffver/0/99}")
+
+ cd $srcdir
+ rm $srcdir/*.xpi
+ local _dir=$pkgdir/usr/lib/iceweasel/browser/extensions/ru@dictionaries.addons.mozilla.org
+ mkdir -p "${_dir}"
+ cd "${_dir}"
+ sed -i 's#<em:maxVersion>.*</em:maxVersion>#<em:maxVersion>20.*</em:maxVersion>#' $srcdir/install.rdf
+ cp -r $srcdir/* "${_dir}"
+ find ${_dir} -type f -exec chmod 0644 {} \;
+ touch ${_dir}/chrome.manifest
+}
diff --git a/libre/jquery-ui/PKGBUILD b/libre/jquery-ui/PKGBUILD
new file mode 100644
index 000000000..0be01f724
--- /dev/null
+++ b/libre/jquery-ui/PKGBUILD
@@ -0,0 +1,31 @@
+#Maintainer: André Silva <emulatorman@parabola.nu>
+#Maintainer: Márcio Silva <coadde@parabola.nu>
+
+_pkgname=jquery
+pkgname=jquery-ui
+pkgver=1.10.4
+pkgrel=1
+pkgdesc='jQuery UI provides abstractions for low-level interaction and animation, advanced effects and high-level, themeable widgets, built on top of the jQuery JavaScript Library, that you can use to build highly interactive web applications'
+arch=any
+url=http://jqueryui.com/
+license=MIT
+depends=jquery
+makedepends=nodejs
+
+source=https://github.com/$_pkgname/$pkgname/archive/$pkgver.tar.gz
+sha512sums=cab57c40bc593f32baeca8f9bcf8e23ef770b511dd4894fbb5bfd0b0bb9f7266b9572247ea47289f8d0eaa782f8c803f3e4b262b71f00d173e7bd54793fdb0ac
+
+build() {
+ cd $srcdir/$pkgname-$pkgver
+ npm install grunt-cli
+ npm install
+ node_modules/.bin/grunt build
+}
+
+package() {
+ cd $srcdir/$pkgname-$pkgver
+ install -d $pkgdir/usr/share/javascript/$pkgname
+ install -d $pkgdir/usr/share/licenses/$pkgname
+ cp -a dist/* $pkgdir/usr/share/javascript/$pkgname
+ cp -a MIT-LICENSE.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE
+}
diff --git a/libre/jquery/PKGBUILD b/libre/jquery/PKGBUILD
new file mode 100644
index 000000000..23d56d7c3
--- /dev/null
+++ b/libre/jquery/PKGBUILD
@@ -0,0 +1,29 @@
+#Maintainer: André Silva <emulatorman@parabola.nu>
+#Maintainer: Márcio Silva <coadde@parabola.nu>
+
+pkgname=jquery
+pkgver=2.1.0
+pkgrel=1
+pkgdesc='jQuery is a fast and concise JavaScript Library that simplifies HTML document traversing, event handling, animating, and Ajax interactions for rapid web development'
+arch=any
+url=http://jquery.com/
+license=MIT
+makedepends=nodejs
+
+source=https://github.com/$pkgname/$pkgname/archive/$pkgver.tar.gz
+sha512sums=aedd1086b3b84ed6705b31ac297b6bef29fc2b19a190b3bded2c135d13931cdc92b9ea7cf3eab86e8157a50f1e4ec9ba2bbe1eeba1af5dd44079f237571d41e4
+
+build() {
+ cd $srcdir/$pkgname-$pkgver
+ npm install
+ node_modules/.bin/grunt
+}
+
+package() {
+ cd $srcdir/$pkgname-$pkgver
+ install -d $pkgdir/usr/share/javascript/$pkgname
+ install -d $pkgdir/usr/share/licenses/$pkgname
+ node_modules/.bin/grunt dist:$pkgdir/usr/share/javascript/$pkgname
+ cp -a MIT-LICENSE.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE
+}
+
diff --git a/libre/kdebase-konqueror-libre/PKGBUILD b/libre/kdebase-konqueror-libre/PKGBUILD
index 9020ef239..e7578c381 100644
--- a/libre/kdebase-konqueror-libre/PKGBUILD
+++ b/libre/kdebase-konqueror-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 203722 2014-01-14 07:36:58Z svenstaro $
+# $Id: PKGBUILD 205134 2014-02-04 13:52:45Z svenstaro $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
# Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
@@ -6,7 +6,7 @@
_pkgname='kdebase-konqueror'
pkgname='kdebase-konqueror-libre'
-pkgver=4.12.1
+pkgver=4.12.2
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
url="http://kde.org/applications/internet/konqueror/"
@@ -15,7 +15,7 @@ groups=('kde' 'kdebase')
makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml' 'nepomuk-widgets')
source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz"
'konq-about-fsdg.diff')
-sha1sums=('a08013c4f3e7221e597f98c310c323e40e03d280'
+sha1sums=('7002c8d1a8f4fb1735ad70b8cb1a106876323f94'
'd6cbb53c04179b8180f9439eca156b7ff2e76b3a')
pkgdesc='KDE File Manager & Web Browser, without Google and nonfree software recommendation'
depends=('kdebase-dolphin' 'kdebase-keditbookmarks')
diff --git a/libre/kdebase-runtime-libre/PKGBUILD b/libre/kdebase-runtime-libre/PKGBUILD
index 6ae82841a..369ec746f 100644
--- a/libre/kdebase-runtime-libre/PKGBUILD
+++ b/libre/kdebase-runtime-libre/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 204616 2014-01-24 10:54:17Z andyrtr $
+# $Id: PKGBUILD 205106 2014-02-04 13:51:12Z svenstaro $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
_pkgname=kdebase-runtime
pkgname=kdebase-runtime-libre
-pkgver=4.12.1
-pkgrel=2
+pkgver=4.12.2
+pkgrel=1
pkgdesc="Plugins and applications necessary for the running of KDE applications, without non-privacy search providers"
arch=('i686' 'x86_64' 'mips64el')
url='https://projects.kde.org/projects/kde/kde-runtime'
@@ -26,7 +26,7 @@ install="${_pkgname}.install"
source=("http://download.kde.org/stable/${pkgver}/src/kde-runtime-${pkgver}.tar.xz"
'duckduckgo_html.desktop'
'duckduckgo_lite.desktop')
-sha1sums=('e62d0b6a8fea172ac4b36a16004f10161406872a'
+sha1sums=('935dd93d1a705de6b11dc489a56dfb40827b2046'
'aa6f39f4b0ad3c110fd05cd6c41190afae9773dd'
'ac3bac94a2c4b1444642524bc5fb539c4c5dcc5b')
diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD
index 7204da87d..c1936476d 100644
--- a/libre/kdelibs-libre/PKGBUILD
+++ b/libre/kdelibs-libre/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 203682 2014-01-14 07:33:57Z svenstaro $
+# $Id: PKGBUILD 205088 2014-02-04 13:47:15Z svenstaro $
# Maintainer: Andrea Scarpino <andrea@archlinux.org
# Contributor: Pierre Schmitz <pierre@archlinux.de>
# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
_pkgname=kdelibs
pkgname=kdelibs-libre
-pkgver=4.12.1
+pkgver=4.12.2
pkgrel=1
pkgdesc="KDE Core Libraries, without nonfree plugins recommendation support"
arch=('i686' 'x86_64' 'mips64el')
@@ -24,7 +24,7 @@ install=${_pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz"
'kde-applications-menu.patch' 'qt4.patch'
'khtml-fsdg.diff')
-sha1sums=('b6c1b22a0fc3c9789d29ffef4d24b41afdf357bb'
+sha1sums=('05e324af3752953ca637c2a51d989155f9f6bb8a'
'86ee8c8660f19de8141ac99cd6943964d97a1ed7'
'ed1f57ee661e5c7440efcaba7e51d2554709701c'
'a1502a964081ad583a00cf90c56e74bf60121830')
diff --git a/libre/kdenetwork-kopete-libre/PKGBUILD b/libre/kdenetwork-kopete-libre/PKGBUILD
index 4bb85b87c..2f33f98e9 100644
--- a/libre/kdenetwork-kopete-libre/PKGBUILD
+++ b/libre/kdenetwork-kopete-libre/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 203932 2014-01-14 07:49:31Z svenstaro $
+# $Id: PKGBUILD 205344 2014-02-04 14:04:24Z svenstaro $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
_pkgname=kdenetwork-kopete
pkgname=kdenetwork-kopete-libre
-pkgver=4.12.1
+pkgver=4.12.2
pkgrel=1
pkgdesc='Instant Messenger, without Skype support'
url='http://kde.org/applications/internet/kopete/'
@@ -19,7 +19,7 @@ replaces=$_pkgname
conflicts=$_pkgname
provides=$_pkgname=$pkgver
source=("http://download.kde.org/stable/${pkgver}/src/kopete-${pkgver}.tar.xz")
-sha1sums=('e6ad13cb81842961df0e6e9ecda309b47db0af29')
+sha1sums=('6b5ebab916f4527157cf7f979724538f38052bad')
prepare() {
cd kopete-${pkgver}
diff --git a/libre/kdepim-libre/PKGBUILD b/libre/kdepim-libre/PKGBUILD
index 911b45170..be15c03fb 100644
--- a/libre/kdepim-libre/PKGBUILD
+++ b/libre/kdepim-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 203942 2014-01-14 07:50:06Z svenstaro $
+# $Id: PKGBUILD 205354 2014-02-04 14:04:58Z svenstaro $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
@@ -22,7 +22,7 @@ pkgname=('kdepim-akonadiconsole-libre'
'kdepim-ktimetracker-libre'
'kdepim-ktnef-libre'
'kdepim-libkdepim-libre')
-pkgver=4.12.1
+pkgver=4.12.2
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
url='http://pim.kde.org'
@@ -31,7 +31,7 @@ groups=('kde' 'kdepim-libre')
makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss'
'nepomuk-widgets' 'link-grammar')
source=("http://download.kde.org/stable/${pkgver}/src/${_pkgbase}-${pkgver}.tar.xz")
-sha1sums=('6ea8fb59a725885801460adc492ee53ab4676d59')
+sha1sums=('c1e5f3284ab23233632ae27edb85f80588bb7e86')
build() {
mkdir build
diff --git a/libre/kdeutils-ark-libre/PKGBUILD b/libre/kdeutils-ark-libre/PKGBUILD
index f3bd7ec31..b7a3d7047 100644
--- a/libre/kdeutils-ark-libre/PKGBUILD
+++ b/libre/kdeutils-ark-libre/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 203980 2014-01-14 07:52:36Z svenstaro $
+# $Id: PKGBUILD 205392 2014-02-04 14:07:41Z svenstaro $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
_pkgname=kdeutils-ark
pkgname=kdeutils-ark-libre
-pkgver=4.12.1
+pkgver=4.12.2
pkgrel=1
pkgdesc='Archiving Tool, with unar support'
url='http://kde.org/applications/utilities/ark/'
@@ -20,7 +20,7 @@ replaces=('kdeutils-ark')
conflicts=('kdeutils-ark')
source=("http://download.kde.org/stable/${pkgver}/src/ark-${pkgver}.tar.xz"
'ark-unar-06.patch')
-sha1sums=('788e43ec97e9c3c60ce494c784ed41c298a7c8fd'
+sha1sums=('ab99d0b78536f187566e1f0a602f41551bbf0f29'
'a0a836950f185d9b2245204579f969203036fdec')
build() {
diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD
index 104231739..53e9afb22 100644
--- a/libre/libretools/PKGBUILD
+++ b/libre/libretools/PKGBUILD
@@ -9,10 +9,10 @@ pkgdesc="Programs for Parabola development"
url="https://projects.parabolagnulinux.org/packages/libretools.git/"
license=('GPL3' 'GPL2')
-pkgver=20140202
-_libretools_commit=9f28b8f1d7ecc211e4df9f4a16a04960ed1bd582
+pkgver=20140210
+_libretools_commit=696c05516039b7b93381811451d393b16a8653d1
_devtools_commit=534d2015b45e013b37e1edbb997bd4df27d7b8fd
-md5sums=('6810cb9fe75b0fb543bbc38d130ba71f'
+md5sums=('e5e6e2a939850c4ce6695e3ee10e71f4'
'ec69dffa68829f063224de19bbd55fa9')
_packages_url=https://projects.parabolagnulinux.org/packages
diff --git a/libre/linux-libre-api-headers/PKGBUILD b/libre/linux-libre-api-headers/PKGBUILD
index 0517b685e..087a0cae8 100644
--- a/libre/linux-libre-api-headers/PKGBUILD
+++ b/libre/linux-libre-api-headers/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 201421 2013-12-11 13:48:25Z allan $
+# $Id: PKGBUILD 205569 2014-02-07 22:36:57Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
# toolchain build order: linux-libre-api-headers->glibc->binutils->gcc->binutils->glibc
pkgname=linux-libre-api-headers
-_basekernel=3.12
-_sublevel=4
+_basekernel=3.13
+_sublevel=2
pkgver=${_basekernel}.${_sublevel}
pkgrel=1
pkgdesc="Kernel headers sanitized for use in userspace"
@@ -18,14 +18,14 @@ conflicts=('linux-api-headers')
replaces=('linux-api-headers')
source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz"
"http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz")
-md5sums=('254f59707b6676b59ce5ca5c3c698319'
- 'ba123db2fbc72133d6292ca9aba51dd4')
+md5sums=('98a8e803e0ed08557f3cdd4d56b0ddc1'
+ '5594978ab8b62033274cf36305baf238')
build() {
cd ${srcdir}/linux-${_basekernel}
if [ "${_basekernel}" != "${pkgver}" ]; then
- patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu-${pkgver}-gnu"
+ patch -p1 -i "${srcdir}/patch-${_basekernel}-gnu-${pkgver}-gnu"
fi
make mrproper
diff --git a/libre/linux-libre-lts/0001-x86-x32-Correct-invalid-use-of-user-timespec-in-the-.patch b/libre/linux-libre-lts/0001-x86-x32-Correct-invalid-use-of-user-timespec-in-the-.patch
deleted file mode 100644
index 3f1bccc80..000000000
--- a/libre/linux-libre-lts/0001-x86-x32-Correct-invalid-use-of-user-timespec-in-the-.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 2def2ef2ae5f3990aabdbe8a755911902707d268 Mon Sep 17 00:00:00 2001
-From: PaX Team <pageexec@freemail.hu>
-Date: Thu, 30 Jan 2014 16:59:25 -0800
-Subject: [PATCH] x86, x32: Correct invalid use of user timespec in the kernel
-
-The x32 case for the recvmsg() timout handling is broken:
-
- asmlinkage long compat_sys_recvmmsg(int fd, struct compat_mmsghdr __user *mmsg,
- unsigned int vlen, unsigned int flags,
- struct compat_timespec __user *timeout)
- {
- int datagrams;
- struct timespec ktspec;
-
- if (flags & MSG_CMSG_COMPAT)
- return -EINVAL;
-
- if (COMPAT_USE_64BIT_TIME)
- return __sys_recvmmsg(fd, (struct mmsghdr __user *)mmsg, vlen,
- flags | MSG_CMSG_COMPAT,
- (struct timespec *) timeout);
- ...
-
-The timeout pointer parameter is provided by userland (hence the __user
-annotation) but for x32 syscalls it's simply cast to a kernel pointer
-and is passed to __sys_recvmmsg which will eventually directly
-dereference it for both reading and writing. Other callers to
-__sys_recvmmsg properly copy from userland to the kernel first.
-
-The bug was introduced by commit ee4fa23c4bfc ("compat: Use
-COMPAT_USE_64BIT_TIME in net/compat.c") and should affect all kernels
-since 3.4 (and perhaps vendor kernels if they backported x32 support
-along with this code).
-
-Note that CONFIG_X86_X32_ABI gets enabled at build time and only if
-CONFIG_X86_X32 is enabled and ld can build x32 executables.
-
-Other uses of COMPAT_USE_64BIT_TIME seem fine.
-
-This addresses CVE-2014-0038.
-
-Signed-off-by: PaX Team <pageexec@freemail.hu>
-Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
-Cc: <stable@vger.kernel.org> # v3.4+
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
----
- net/compat.c | 9 ++-------
- 1 file changed, 2 insertions(+), 7 deletions(-)
-
-diff --git a/net/compat.c b/net/compat.c
-index dd32e34..f50161f 100644
---- a/net/compat.c
-+++ b/net/compat.c
-@@ -780,21 +780,16 @@ asmlinkage long compat_sys_recvmmsg(int fd, struct compat_mmsghdr __user *mmsg,
- if (flags & MSG_CMSG_COMPAT)
- return -EINVAL;
-
-- if (COMPAT_USE_64BIT_TIME)
-- return __sys_recvmmsg(fd, (struct mmsghdr __user *)mmsg, vlen,
-- flags | MSG_CMSG_COMPAT,
-- (struct timespec *) timeout);
--
- if (timeout == NULL)
- return __sys_recvmmsg(fd, (struct mmsghdr __user *)mmsg, vlen,
- flags | MSG_CMSG_COMPAT, NULL);
-
-- if (get_compat_timespec(&ktspec, timeout))
-+ if (compat_get_timespec(&ktspec, timeout))
- return -EFAULT;
-
- datagrams = __sys_recvmmsg(fd, (struct mmsghdr __user *)mmsg, vlen,
- flags | MSG_CMSG_COMPAT, &ktspec);
-- if (datagrams > 0 && put_compat_timespec(&ktspec, timeout))
-+ if (datagrams > 0 && compat_put_timespec(&ktspec, timeout))
- datagrams = -EFAULT;
-
- return datagrams;
---
-1.8.5.3
-
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index e2da7fff9..ae5f590f0 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 204934 2014-01-31 16:13:52Z bpiotrowski $
+# $Id: PKGBUILD 205955 2014-02-14 20:17:56Z andyrtr $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Maintainer: Thomas Baechler <thomas@archlinux.org>
# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
@@ -10,10 +10,10 @@
pkgbase=linux-libre-lts # Build stock -LIBRE-LTS kernel
#pkgbase=linux-libre-custom # Build kernel with a different name
_basekernel=3.10
-_sublevel=28
+_sublevel=30
pkgver=${_basekernel}.${_sublevel}
-pkgrel=1.1
-_lxopkgver=${_basekernel}.28 # nearly always the same as pkgver
+pkgrel=1
+_lxopkgver=${_basekernel}.30 # nearly always the same as pkgver
arch=('i686' 'x86_64' 'mips64el')
url="http://linux-libre.fsfla.org/"
license=('GPL2')
@@ -30,10 +30,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
'boot-logo.patch'
'change-default-console-loglevel.patch'
'criu-no-expert.patch'
- '0001-x86-x32-Correct-invalid-use-of-user-timespec-in-the-.patch'
"http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.xz")
md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c'
- '1eeedf694bd64b34a031ac27549bc7a3'
+ 'fa8d8ba21bf5a6fad7edea6b158fd05c'
'85ce008eaacbb2fc54b81116d35cf946'
'16867e648e4b9f89bec949cb643888c2'
'c072b17032e80debc6a8626299245d46'
@@ -42,8 +41,7 @@ md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c'
'04b21c79df0a952c22d681dd4f4562df'
'f3def2cefdcbb954c21d8505d23cc83c'
'd50c1ac47394e9aec637002ef3392bd1'
- '336d2c4afd7ee5f2bdf0dcb1a54df4b2'
- 'cec0d90f5d3fae8752b0020c6b785954')
+ '8e0bb5cbd34b0e7391049eba25d135be')
if [ "$CARCH" != "mips64el" ]; then
# don't use the Loongson-specific patches on non-mips64el arches.
unset source[${#source[@]}-1]
@@ -75,9 +73,6 @@ prepare() {
# patch from fedora
patch -Np1 -i "${srcdir}/criu-no-expert.patch"
- # CVE-2014-0038
- patch -Np1 -i "${srcdir}/0001-x86-x32-Correct-invalid-use-of-user-timespec-in-the-.patch"
-
if [ "$CARCH" == "mips64el" ]; then
sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre-lts|" Makefile
sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \
diff --git a/libre/linux-libre/ChangeLog b/libre/linux-libre/ChangeLog
index 9020464ef..5259f3e89 100644
--- a/libre/linux-libre/ChangeLog
+++ b/libre/linux-libre/ChangeLog
@@ -1,8 +1,3 @@
-2013-10-20 André Silva <emulatorman@parabola.nu>
-
- * linux-libre-3.11.5-1
- * Replaced email account emulatorman@lavabit.com to emulatorman@parabola.nu.
-
2013-07-15 André Silva <emulatorman@parabola.nu>
* linux-libre-3.10.1-1
@@ -18,27 +13,27 @@
* linux-libre-3.7.1-1
* Replaced CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org" to CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="linux-libre.fsfla.org"
-2012-06-23 André Silva <emulatorman@parabola.nu>
-
- * linux-libre-3.4.4-1
- * Replaced email account andre.paulista@adinet.com.uy to emulatorman@lavabit.com.
-
2012-05-26 André Silva <emulatorman@parabola.nu>
* linux-libre-3.4-1.2
- * Disabled CONFIG_MICROCODE_INTEL and CONFIG_MICROCODE_AMD modules https://labs.parabola.nu/issues/116
+ * Disabled CONFIG_MICROCODE_INTEL and CONFIG_MICROCODE_AMD modules [3]
2012-04-24 André Silva <emulatorman@parabola.nu>
* linux-libre-3.3.3-1
- * Disabled CONFIG_STUB_POULSBO module https://labs.parabola.nu/issues/90
+ * Disabled CONFIG_STUB_POULSBO module [2]
2012-04-08 André Silva <emulatorman@parabola.nu>
* linux-libre-3.3.1-1.1
- * Disabled CONFIG_IPW2100 and CONFIG_IPW2200 modules https://labs.parabola.nu/issues/47
+ * Disabled CONFIG_IPW2100 and CONFIG_IPW2200 modules [1]
2012-03-03 André Silva <emulatorman@parabola.nu>
* linux-libre-3.2.9-2
- * Enabled CONFIG_FB_VT8623 module https://labs.parabola.nu/issues/14
+ * Enabled CONFIG_FB_VT8623 module [0]
+
+[0] https://labs.parabola.nu/issues/14
+[1] https://labs.parabola.nu/issues/47
+[2] https://labs.parabola.nu/issues/90
+[3] https://labs.parabola.nu/issues/116
diff --git a/libre/lsb-release/PKGBUILD b/libre/lsb-release/PKGBUILD
index 6f761a81f..c6cbe5863 100644
--- a/libre/lsb-release/PKGBUILD
+++ b/libre/lsb-release/PKGBUILD
@@ -7,7 +7,7 @@
pkgname=lsb-release
pkgver=1.4
-pkgrel=14
+pkgrel=14.2
pkgdesc="LSB version query program (Parabola rebranded)"
arch=('any')
url="http://www.linuxbase.org/"
diff --git a/libre/lsb-release/lsb-release.install b/libre/lsb-release/lsb-release.install
index 62d404892..261df2a73 100644
--- a/libre/lsb-release/lsb-release.install
+++ b/libre/lsb-release/lsb-release.install
@@ -1,10 +1,8 @@
post_install() {
- rm -f /etc/arch-release
echo "Parabola GNU/Linux-libre release" >> /etc/parabola-release
}
post_upgrade() {
- rm -f /etc/arch-release
sed -e '/Parabola GNU\/Linux-[Ll]ibre release/d' -i /etc/parabola-release
echo "Parabola GNU/Linux-libre release" >> /etc/parabola-release
}
diff --git a/libre/mate-document-viewer-libre/PKGBUILD b/libre/mate-document-viewer-libre/PKGBUILD
index 6557d3469..969c335b2 100644
--- a/libre/mate-document-viewer-libre/PKGBUILD
+++ b/libre/mate-document-viewer-libre/PKGBUILD
@@ -3,7 +3,7 @@
_pkgname=mate-document-viewer
pkgname=mate-document-viewer-libre
pkgver=1.6.2
-pkgrel=1
+pkgrel=2
pkgdesc="Simply a document viewer, with libarchive recommendation"
url="http://mate-desktop.org"
arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ replaces=$_pkgname
conflicts=$_pkgname
provides=$_pkgname=$pkgver
depends=('dconf' 'dbus' 'desktop-file-utils' 'gtk2' 'libmatekeyring' 'libsm'
- 'libspectre' 'mate-icon-theme' 'poppler-glib' 'zlib')
+ 'libspectre' 'mate-desktop' 'mate-icon-theme' 'poppler-glib' 'zlib')
makedepends=('djvulibre' 'gobject-introspection' 'libgxps' 'mate-common'
'mate-doc-utils' 'mate-file-manager' 'perl-xml-parser' 'texlive-bin')
optdepends=('djvulibre: DjVu support'
diff --git a/libre/mate-file-archiver-libre/PKGBUILD b/libre/mate-file-archiver-libre/PKGBUILD
index 5072dd583..80711e259 100644
--- a/libre/mate-file-archiver-libre/PKGBUILD
+++ b/libre/mate-file-archiver-libre/PKGBUILD
@@ -2,7 +2,7 @@
_pkgname=mate-file-archiver
pkgname=mate-file-archiver-libre
-pkgver=1.6.1
+pkgver=1.6.2
pkgrel=1
pkgdesc="Archive manipulator for MATE, with unar recommendation included and nonfree unace recommendation removed"
url="http://mate-desktop.org"
@@ -23,7 +23,7 @@ options=('!emptydirs')
groups=('mate-extra')
source=("http://pub.mate-desktop.org/releases/1.6/${_pkgname}-${pkgver}.tar.xz"
fr-rpm-bsdtar.patch)
-sha1sums=('53a28d6fb559151c0b8d6f9a658113c77cdb938a'
+sha1sums=('58a0f7d78dabd627a3a2b3352fabcba20d72aa92'
'219b05a979bf6f249aaae27964f02345fd81168d')
install=${_pkgname}.install
diff --git a/libre/mesa-libcl/PKGBUILD b/libre/mesa-libcl/PKGBUILD
index 88c817dcd..198bcbcb5 100644
--- a/libre/mesa-libcl/PKGBUILD
+++ b/libre/mesa-libcl/PKGBUILD
@@ -4,7 +4,7 @@ pkgbase=mesa
_pkgname=libcl
pkgname=$pkgbase-$_pkgname
_pkgflag=libre
-pkgver=10.0.2
+pkgver=10.0.3
pkgrel=1
pkgdesc='Mesa 3-D OpenCL library'
url=http://${pkgbase}3d.sourceforge.net
@@ -27,7 +27,7 @@ provides=($_pkgname-$_pkgflag $_pkgname opencl-nvidia opencl-nvidia-304xx)
conflicts=($_pkgname-$_pkgflag $_pkgname opencl-nvidia opencl-nvidia-304xx)
replaces=($_pkgname-$_pkgflag $_pkgname opencl-nvidia opencl-nvidia-304xx)
source=ftp://ftp.freedesktop.org/pub/$pkgbase/${pkgver%.0}/${pkgbase^}Lib-$pkgver.tar.bz2
-sha512sums=15741b916e6338645a28961fb7a731f8c2a33afe11e91c0bd144f9d9afca96837c9caf7fb2fd769aedbeba2b8b12443e7a7eb8ab6cd2270024308ca11e88ff24
+sha512sums=e864c4d63336977b2917d83926331163198d47023228cc71f47c67251f675102dbab4551e032aa1dfcb4cbda1f98f15ff4565acef54a33ed8c50af32f52a52da
build() {
cd $srcdir/${pkgbase^}-$pkgver
diff --git a/libre/mkisolinux/PKGBUILD b/libre/mkisolinux/PKGBUILD
index 7c9ab6cc4..e2900d521 100644
--- a/libre/mkisolinux/PKGBUILD
+++ b/libre/mkisolinux/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=mkisolinux
pkgver=2013.05
-pkgrel=1
+pkgrel=1.1
pkgdesc="Advanced, modular isolinux bootcd image creation utility (Parabola rebranded)"
arch=(any)
license=('GPL')
diff --git a/libre/mkpxelinux/PKGBUILD b/libre/mkpxelinux/PKGBUILD
index b3a94547f..5596983b0 100644
--- a/libre/mkpxelinux/PKGBUILD
+++ b/libre/mkpxelinux/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=mkpxelinux
pkgver=2013.10
-pkgrel=1
+pkgrel=1.1
pkgdesc="Advanced, modular network pxe boot image creation utility (Parabola rebranded)"
arch=(any)
license=('GPL')
diff --git a/libre/mksyslinux/PKGBUILD b/libre/mksyslinux/PKGBUILD
index a64f141fd..f01c844a9 100644
--- a/libre/mksyslinux/PKGBUILD
+++ b/libre/mksyslinux/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=mksyslinux
pkgver=2013.06
-pkgrel=1
+pkgrel=1.1
pkgdesc="Advanced, modular syslinux boot image creation utility (Parabola rebranded)"
arch=(any)
license=('GPL')
diff --git a/libre/mozilla-searchplugins/PKGBUILD b/libre/mozilla-searchplugins/PKGBUILD
index 2405ac889..85bba0637 100644
--- a/libre/mozilla-searchplugins/PKGBUILD
+++ b/libre/mozilla-searchplugins/PKGBUILD
@@ -9,8 +9,8 @@
# Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com>
pkgname=mozilla-searchplugins
-pkgver=1.4
-pkgrel=2
+pkgver=1.5
+pkgrel=1
pkgdesc="System-wide OpenSearch plugins common for Mozilla based browsers."
arch=('any')
license=('MPL' 'GPL' 'LGPL')
@@ -32,8 +32,8 @@ package() {
install -m644 "${srcdir}"/*.xml "${pkgdir}/usr/lib/mozilla/searchplugins"
}
-md5sums=('b4cc6bd8353af36ade441916217619e4'
- '766aa6def4bf63c0d65afd6ca1b1ce37'
+md5sums=('3412ff5311c1ba8d883ba9c6fd805bb7'
+ 'edb15da251e25cec39d471d885463db3'
'462c68585461f8cdc23c93c46f6ee4cf'
'92f834a3a1d85c9ae202955cdfe941eb'
'b9a0893d7f6d41d755c478fd60c44be8'
diff --git a/libre/mozilla-searchplugins/duckduckgo-html.xml b/libre/mozilla-searchplugins/duckduckgo-html.xml
index b53408077..14575dd12 100644
--- a/libre/mozilla-searchplugins/duckduckgo-html.xml
+++ b/libre/mozilla-searchplugins/duckduckgo-html.xml
@@ -1,8 +1,17 @@
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
+<SearchPlugin
+ xmlns="http://www.mozilla.org/2006/browser/search/"
+xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
<os:ShortName>DuckDuckGo HTML</os:ShortName>
-<os:Description>Search DuckDuckGo HTML</os:Description>
+<os:Description>Search DuckDuckGo (HTML)</os:Description>
<os:InputEncoding>UTF-8</os:InputEncoding>
-<os:Image width="16" height="16">http://duckduckgo.com/favicon.ico</os:Image>
-<os:Url type="text/html" method="GET" template="https://duckduckgo.com/html/?q={searchTerms}">
+<os:Image width="16"
+height="16">data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAB8lBMVEUAAADkRQzjPwPjQQXkRQ3iPwTiQQXgPQPeQgrcOwPVNgDVNQDWOgbTMwDRMgDQMwDSMwDRNwTQLgDRJgDSJwDSLgDSNwTjOgDiOADjOQDkPADhQAXzs5v+/fv////0vKbiRQvgPQHpdUr85NzuknPdKgDcIwDnZzj2w7HqeU/gPQLsimb/+PftjWn97Obpb0LdJQDeLQDtjmvsi2jgSBDnbULgOQD/39HgLQDeMgDpeFLgSBH0v670uqbaJQD2qImWvP/G1Ob5+/3u//+fvvXyp47dMwDaLwD0u6v0v6/aNQDiXi/aKQD3qozU7/8gSY2vvtg0ZK/OqLDaKQHYKgLgWTfaNADZMgDZMADZLADzqpD7//+xwdz//9H/5Bn/7Bn//ADofADYMADYMQDZOgPXLgDiZDj//97/0AD3tQDvlgHZOgbXLATXMADWMgDfXjLVLQD///z+0AD/3Rn/yRnwnQDcVjbVMQDyv67wuKTSJwDRHQD+8O/tg3/iQQDwhAHnawHWMADvtKfyva7XQxHga0bQGQD2vbH/u8LXIQCmPQzja07XQxLliGn99fPkcVHvhnGZ5VguvUU5wktBwCcAgxzydVv/8/XmiGngdlL+ysi3+I8LtCE80V6P3YmX4sDleljSNQLzr6D7sKPXNQTSIwAEAbMrAAAAF3RSTlMARqSkRvPz80PTpKRG3fPe3hio9/eoGP50jNsAAAABYktHRB5yCiArAAAAyElEQVQYGQXBvUqCYRiA4fu2V9Tn+UQddI3aCpxaOoU6iU4gcqqpoYbALXBuCuoYmttamqJDiEoh4YP+MOi6BNCh+uYKEGiOVNCXXxA2XDVV/UyfKbRCXTLQWAxbP2vt8Ue/uYDvfim91615sb2um6rqtrr/NFb1cUf1Ybd06areU6lSlYpK79jzK1SyJOkfhOl8JGEcqV5zoKrTRqO6yUzIzNu46ijdM1VV9bhuUJ/nZURExLRzUiPQm3kKXHi4BAEGOmOi78A/L1QoU/VHoTsAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTQtMDEtMTlUMjA6MDE6MTEtMDU6MDAuET6cAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE0LTAxLTE5VDIwOjAxOjExLTA1OjAwX0yGIAAAAABJRU5ErkJggg==</os:Image>
+<os:Url
+ type="text/html" method="POST"
+template="https://duckduckgo.com/html/">
+ <os:Param name="q" value="{searchTerms}"/>
+</os:Url><os:Url type="application/x-suggestions+json"
+method="GET"
+template="https://duckduckgo.com/ac/?q={searchTerms}&amp;type=list">
</os:Url>
</SearchPlugin>
diff --git a/libre/mozilla-searchplugins/duckduckgo-lite.xml b/libre/mozilla-searchplugins/duckduckgo-lite.xml
index 1e651abe6..12436fb9a 100644
--- a/libre/mozilla-searchplugins/duckduckgo-lite.xml
+++ b/libre/mozilla-searchplugins/duckduckgo-lite.xml
@@ -1,8 +1,17 @@
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
+<SearchPlugin
+ xmlns="http://www.mozilla.org/2006/browser/search/"
+xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
<os:ShortName>DuckDuckGo Lite</os:ShortName>
-<os:Description>Search DuckDuckGo Lite</os:Description>
+<os:Description>Search DuckDuckGo (Lite)</os:Description>
<os:InputEncoding>UTF-8</os:InputEncoding>
-<os:Image width="16" height="16">http://duckduckgo.com/favicon.ico</os:Image>
-<os:Url type="text/html" method="GET" template="https://duckduckgo.com/lite/?q={searchTerms}">
+<os:Image width="16"
+height="16">data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAB8lBMVEUAAADkRQzjPwPjQQXkRQ3iPwTiQQXgPQPeQgrcOwPVNgDVNQDWOgbTMwDRMgDQMwDSMwDRNwTQLgDRJgDSJwDSLgDSNwTjOgDiOADjOQDkPADhQAXzs5v+/fv////0vKbiRQvgPQHpdUr85NzuknPdKgDcIwDnZzj2w7HqeU/gPQLsimb/+PftjWn97Obpb0LdJQDeLQDtjmvsi2jgSBDnbULgOQD/39HgLQDeMgDpeFLgSBH0v670uqbaJQD2qImWvP/G1Ob5+/3u//+fvvXyp47dMwDaLwD0u6v0v6/aNQDiXi/aKQD3qozU7/8gSY2vvtg0ZK/OqLDaKQHYKgLgWTfaNADZMgDZMADZLADzqpD7//+xwdz//9H/5Bn/7Bn//ADofADYMADYMQDZOgPXLgDiZDj//97/0AD3tQDvlgHZOgbXLATXMADWMgDfXjLVLQD///z+0AD/3Rn/yRnwnQDcVjbVMQDyv67wuKTSJwDRHQD+8O/tg3/iQQDwhAHnawHWMADvtKfyva7XQxHga0bQGQD2vbH/u8LXIQCmPQzja07XQxLliGn99fPkcVHvhnGZ5VguvUU5wktBwCcAgxzydVv/8/XmiGngdlL+ysi3+I8LtCE80V6P3YmX4sDleljSNQLzr6D7sKPXNQTSIwAEAbMrAAAAF3RSTlMARqSkRvPz80PTpKRG3fPe3hio9/eoGP50jNsAAAABYktHRB5yCiArAAAAyElEQVQYGQXBvUqCYRiA4fu2V9Tn+UQddI3aCpxaOoU6iU4gcqqpoYbALXBuCuoYmttamqJDiEoh4YP+MOi6BNCh+uYKEGiOVNCXXxA2XDVV/UyfKbRCXTLQWAxbP2vt8Ue/uYDvfim91615sb2um6rqtrr/NFb1cUf1Ybd06areU6lSlYpK79jzK1SyJOkfhOl8JGEcqV5zoKrTRqO6yUzIzNu46ijdM1VV9bhuUJ/nZURExLRzUiPQm3kKXHi4BAEGOmOi78A/L1QoU/VHoTsAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTQtMDEtMTlUMjA6MDE6MTEtMDU6MDAuET6cAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE0LTAxLTE5VDIwOjAxOjExLTA1OjAwX0yGIAAAAABJRU5ErkJggg==</os:Image>
+<os:Url
+ type="text/html" method="POST"
+template="https://duckduckgo.com/lite/">
+ <os:Param name="q" value="{searchTerms}"/>
+</os:Url><os:Url type="application/x-suggestions+json"
+method="GET"
+template="https://duckduckgo.com/ac/?q={searchTerms}&amp;type=list">
</os:Url>
</SearchPlugin>
diff --git a/libre/netsurf-libre/PKGBUILD b/libre/netsurf-libre/PKGBUILD
index bcb40c614..6d028e732 100644
--- a/libre/netsurf-libre/PKGBUILD
+++ b/libre/netsurf-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 100033 2013-10-31 10:58:22Z arodseth $
+# $Id: PKGBUILD 105500 2014-02-09 11:01:04Z arodseth $
# Maintainer: Alexander Rødseth <rodseth@gmail.com>
# Contributor: Paulo Matias <matiasΘarchlinux-br·org>
# Contributor: Georgij Kondratjev <smpuj@bk.ru>
@@ -8,7 +8,7 @@
_pkgname=netsurf
pkgname=netsurf-libre
pkgver=3.0
-pkgrel=5
+pkgrel=7
pkgdesc='Lightweight and fast web browser, without non-privacy search providers'
arch=('x86_64' 'i686' 'mips64el')
url='http://www.netsurf-browser.org/'
@@ -24,7 +24,7 @@ source=("netsurf.png::http://ubuntu.allmyapps.com/data/n/e/netsurf-netsurf-web-b
'netsurf.sh')
sha256sums=('f0dbcc5d80bf03d706aa8b28a322aa7f169a40813848c2d1505691f6e2c7ef00'
'7c6a48d3cc3e9a3e3a51b532ddf60f7697e97bf8b61a6d3b2ced1a2e89fbccc6'
- '3efaf14b95c9aeb83caac488135bd5b6040d2ede382caa5589ff7ebd2bd506cc')
+ '7aef20cc7b2e2e7225237f2f94b5a0074caeb8ec07075c58429b0345ca566f8d')
prepare() {
cd "$_pkgname-$pkgver"
@@ -96,7 +96,7 @@ prepare() {
addinclude image/mng.c stdio
addinclude image/png.c stdio
- gendesk --pkgname "$_pkgname" --pkgdesc "$pkgdesc" --exec 'netsurf %U' \
+ gendesk -f --pkgname "$_pkgname" --pkgdesc "$pkgdesc" --exec 'netsurf %U' \
--genericname 'Web Browser' --comment 'Lightweight web browser' \
--mimetypes 'text/html;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/geo'
}
@@ -108,15 +108,13 @@ build() {
PREFIX=/usr \
TARGET=gtk \
NETSURF_USE_WEBP=YES \
- NETSURF_USE_VIDEO=NO \
- NETSURF_USE_MOZILLA_JS=YES \
- NETSURF_USE_HARU_PDF=NO
+ NETSURF_USE_VIDEO=NO
}
package() {
cd "$_pkgname-$pkgver"
- make install PREFIX=/usr DESTDIR="$pkgdir"
+ make install PREFIX=/usr DESTDIR="$pkgdir" NETSURF_USE_WEBP=YES
mv "$pkgdir/usr/bin/$_pkgname" "$pkgdir/usr/bin/$_pkgname.elf"
install -Dm755 "../$_pkgname.sh" "$pkgdir/usr/bin/$_pkgname"
install -Dm644 "../$_pkgname.png" "$pkgdir/usr/share/pixmaps/$_pkgname.png"
diff --git a/libre/netsurf-libre/netsurf.install b/libre/netsurf-libre/netsurf.install
index 98f3ea190..ad97d7bab 100644
--- a/libre/netsurf-libre/netsurf.install
+++ b/libre/netsurf-libre/netsurf.install
@@ -1,5 +1,4 @@
post_upgrade() {
- #gtk-update-icon-cache -q -f -t /usr/share/icons/hicolor
update-desktop-database -q
}
diff --git a/libre/netsurf-libre/netsurf.sh b/libre/netsurf-libre/netsurf.sh
index 49b1e161e..b74f388af 100644
--- a/libre/netsurf-libre/netsurf.sh
+++ b/libre/netsurf-libre/netsurf.sh
@@ -3,5 +3,5 @@ shortname=`echo $LANG | cut -b1-2`
if [[ -d /usr/share/netsurf/$shortname ]]; then
/usr/bin/netsurf.elf "$@"
else
- LANG=en_US /usr/bin/netsurf.elf "$@"
+ LANG=en /usr/bin/netsurf.elf "$@"
fi
diff --git a/libre/openimageio/PKGBUILD b/libre/openimageio/PKGBUILD
index 992cd1389..9e7217250 100644
--- a/libre/openimageio/PKGBUILD
+++ b/libre/openimageio/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=openimageio
pkgver=1.3.12
-pkgrel=1
+pkgrel=2
pkgdesc='A library for reading and writing images, including classes, utilities, and applications (built for the blender-libre package)'
arch=(
mips64el
diff --git a/libre/openshadinglanguage/PKGBUILD b/libre/openshadinglanguage/PKGBUILD
new file mode 100644
index 000000000..f5d2a43b8
--- /dev/null
+++ b/libre/openshadinglanguage/PKGBUILD
@@ -0,0 +1,100 @@
+# Maintainer: Márcio Silva <coadde@parabola.nu>
+# based of Arch pkg
+
+pkgname=openshadinglanguage
+pkgver=1.3.3
+pkgrel=1
+pkgdesc="Advanced shading language for production GI renderers (built for the blender-libre package)"
+arch=(
+ mips64el
+ x86_64
+ i686
+)
+url=https://github.com/imageworks/OpenShadingLanguage
+license=custom
+depends=(
+ openimageio
+ openexr
+ freetype2
+ libpng
+ libtiff
+ boost-libs
+ llvm
+ zlib
+)
+makedepends=(
+ boost
+ clang
+ cmake
+)
+source=(
+ https://github.com/imageworks/OpenShadingLanguage/archive/Release-${pkgver}.tar.gz
+ llvm.patch
+)
+md5sums=(
+ 77e2261b6b4e0aabdc13b3bb58caeae1a603dbd6a674048631284e150795ecdc4c0d6fd50e7898bda835024bcfeba3da5d89dea8b1ceb3f8fd893087001cc756
+ 8d62aa04426cb93c9239845a6eb685081a8760a1731cffb9f075cc294ab8b426c369347ae90a473b0dfbcf4d04a2be44e786792c8ce79fe82c11dc81acf6b3a2
+)
+
+prepare() {
+ cd OpenShadingLanguage-Release-$pkgver
+
+ msg 'renaming wrong OS name'
+ _OS=$(uname -o)
+ [[ $_OS == GNU ]] &&\
+ sed -i 's|linux|GNU|i;
+ ' src/{cmake/platform.cmake,make/detectplatform.mk}
+ [[ $_OS == GNU/Linux ]] &&\
+ sed -i 's|[{]uname[}][,]linux]|{uname -o},GNU/Linux|;\|platform| s|linux|GNU/Linux|i
+ ' src/{cmake/platform.cmake,make/detectplatform.mk}
+ [[ $_OS == GNU/kFreeBSD ]] &&\
+ sed -i '\|STREQUAL| s|FreeBSD|kFreeBSD|;\|platform| s|freebsd|GNU/kFreeBSD|i
+ ' src/cmake/platform.cmake
+ sed -i 's|[{]uname[}][,]linux]|{uname -o},GNU/kFreeBSD|;\|platform| s|linux|GNU/kFreeBSD|i
+ ' src/make/detectplatform.mk
+ sed -i 's|Linux/OSX|GNU/BSD|' src/include/export.h
+
+ # LLVM 3.4 build fix
+ # based of "https://github.com/imageworks/OpenShadingLanguage/pull/320.patch"
+ patch -Np1 < $srcdir/llvm.patch
+
+ # fix include paths
+ sed -i 's|oslconfig.h|../include/oslconfig.h|
+ s|dual.h|../include/dual.h|
+ s|dual_vec.h|../include/dual_vec.h|
+ ' src/liboslexec/llvm_ops.cpp
+ sed -i 's|oslexec.h|../include/oslexec.h|
+ s|oslclosure.h|../include/oslclosure.h|
+ s|osl_pvt.h|../include/osl_pvt.h|
+ ' src/liboslexec/oslexec_pvt.h
+
+ cd src
+
+ [[ -d build ]] && rm -r build
+ mkdir build
+}
+
+build() {
+ cd OpenShadingLanguage-Release-$pkgver/src/build
+
+ cmake .. \
+ -DCMAKE_BUILD_TYPE=Release\
+ -DCMAKE_INSTALL_PREFIX=/usr\
+ -DLLVM_STATIC=OFF
+ make
+}
+
+package() {
+ cd OpenShadingLanguage-Release-$pkgver/src/build
+
+ make DESTDIR=$pkgdir install
+
+ mkdir -p $pkgdir/usr/share/OSL/
+ mkdir -p $pkgdir/usr/share/licenses/$pkgname
+ mv $pkgdir/usr/{CHANGES,README.md,INSTALL} $pkgdir/usr/share/OSL
+ mv $pkgdir/usr/doc $pkgdir/usr/share/OSL/doc
+ mv $pkgdir/usr/shaders $pkgdir/usr/share/OSL/shaders
+ mv $pkgdir/usr/LICENSE $pkgdir/usr/share/licenses/$pkgname
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/libre/openshadinglanguage/llvm.patch b/libre/openshadinglanguage/llvm.patch
new file mode 100644
index 000000000..a63b91e0d
--- /dev/null
+++ b/libre/openshadinglanguage/llvm.patch
@@ -0,0 +1,331 @@
+diff -Nur OpenShadingLanguage-Release-1.3.3.orig/src/cmake/externalpackages.cmake OpenShadingLanguage-Release-1.3.3/src/cmake/externalpackages.cmake
+--- OpenShadingLanguage-Release-1.3.3.orig/src/cmake/externalpackages.cmake 2013-07-11 20:01:18.000000000 -0300
++++ OpenShadingLanguage-Release-1.3.3/src/cmake/externalpackages.cmake 2014-02-04 18:09:20.236025178 -0200
+@@ -185,9 +185,9 @@
+ find_library ( LLVM_LIBRARY
+ NAMES LLVM-${LLVM_VERSION}
+ PATHS ${LLVM_LIB_DIR})
++message (STATUS "LLVM version = ${LLVM_VERSION}")
++message (STATUS "LLVM dir = ${LLVM_DIRECTORY}")
+ if (VERBOSE)
+- message (STATUS "LLVM version = ${LLVM_VERSION}")
+- message (STATUS "LLVM dir = ${LLVM_DIRECTORY}")
+ message (STATUS "LLVM includes = ${LLVM_INCLUDES}")
+ message (STATUS "LLVM library = ${LLVM_LIBRARY}")
+ message (STATUS "LLVM lib dir = ${LLVM_LIB_DIR}")
+diff -Nur OpenShadingLanguage-Release-1.3.3.orig/src/liboslexec/CMakeLists.txt OpenShadingLanguage-Release-1.3.3/src/liboslexec/CMakeLists.txt
+--- OpenShadingLanguage-Release-1.3.3.orig/src/liboslexec/CMakeLists.txt 2013-07-11 20:01:18.000000000 -0300
++++ OpenShadingLanguage-Release-1.3.3/src/liboslexec/CMakeLists.txt 2014-02-04 18:07:21.960947198 -0200
+@@ -51,49 +51,64 @@
+ MESSAGE (STATUS "LLVM_COMPILE cpp=${llvm_bc_cpp}")
+ endif ()
+ SET ( ${srclist} ${${srclist}} ${llvm_bc_cpp} )
+- EXEC_PROGRAM ( ${LLVM_DIRECTORY}/bin/llvm-config ARGS --cxxflags OUTPUT_VARIABLE LLVM_COMPILE_FLAGS )
+- set (LLVM_COMPILE_FLAGS "${LLVM_COMPILE_FLAGS} -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS -O3 --combine")
+- LIST (APPEND LLVM_COMPILE_FLAGS "-I${ILMBASE_INCLUDE_DIR}")
++ SET (LLVM_COMPILE_FLAGS ${LLVM_COMPILE_FLAGS} "-I${ILMBASE_INCLUDE_DIR}")
+ if (OSL_NAMESPACE)
+- LIST (APPEND LLVM_COMPILE_FLAGS "-DOSL_NAMESPACE=${OSL_NAMESPACE}")
++ SET (LLVM_COMPILE_FLAGS ${LLVM_COMPILE_FLAGS} "-DOSL_NAMESPACE=${OSL_NAMESPACE}")
+ endif ()
+ if (OPENIMAGEIO_NAMESPACE)
+- LIST (APPEND LLVM_COMPILE_FLAGS "-DOPENIMAGEIO_NAMESPACE=${OPENIMAGEIO_NAMESPACE}")
++ SET (LLVM_COMPILE_FLAGS ${LLVM_COMPILE_FLAGS} "-DOPENIMAGEIO_NAMESPACE=${OPENIMAGEIO_NAMESPACE}")
+ endif ()
+ get_property (CURRENT_DEFINITIONS DIRECTORY PROPERTY COMPILE_DEFINITIONS)
+ if (VERBOSE)
+ message (STATUS "Current #defines are ${CURRENT_DEFINITIONS}")
+ endif ()
+ foreach (def ${CURRENT_DEFINITIONS})
+- LIST (APPEND LLVM_COMPILE_FLAGS "-D${def}")
++ SET (LLVM_COMPILE_FLAGS ${LLVM_COMPILE_FLAGS} "-D${def}")
+ endforeach()
+
+- # First try looking in their build (clang++ first, then llvm-g++)
+- FIND_PROGRAM(LLVM_BC_GENERATOR NAMES "clang++" "llvm-g++" PATHS ${LLVM_DIRECTORY}/bin NO_DEFAULT_PATH NO_CMAKE_SYSTEM_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH)
++ # Figure out what program we will use to make the bitcode.
++ if (NOT LLVM_BC_GENERATOR)
++ FIND_PROGRAM(LLVM_BC_GENERATOR NAMES "clang++" PATHS "${LLVM_DIRECTORY}/bin" NO_DEFAULT_PATH NO_CMAKE_SYSTEM_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH)
++ endif ()
++ # If that didn't work, look anywhere
++ if (NOT LLVM_BC_GENERATOR)
++ # Wasn't in their build, look anywhere
++ FIND_PROGRAM(LLVM_BC_GENERATOR NAMES clang++ llvm-g++)
++ endif ()
+
+- if(NOT LLVM_BC_GENERATOR)
+- # Wasn't in their build, look anywhere
+- FIND_PROGRAM(LLVM_BC_GENERATOR NAMES clang++ llvm-g++)
++ if (NOT LLVM_BC_GENERATOR)
++ message (FATAL_ERROR "You must have a valid llvm bitcode generator (clang++) somewhere.")
++ endif ()
++ if (VERBOSE)
++ message (STATUS "Using ${LLVM_BC_GENERATOR} to generate bitcode.")
+ endif()
+
+- if(NOT LLVM_BC_GENERATOR)
+- message (FATAL_ERROR "You must have a valid llvm bitcode generator (either llvm-g++ or clang++) somewhere.")
+- else()
+- if (VERBOSE)
+- message (STATUS "Using ${LLVM_BC_GENERATOR} to generate bitcode.")
+- endif ()
+- endif()
++ # Fix specific problem I had on new Apple systems (e.g. Mavericks) with
++ # LLVM/libc++ installed -- for some reason, LLVM 3.4 wasn't finding it,
++ # so in that specific case, append another -I to point it in the right
++ # direction.
++ if (APPLE AND ${LLVM_BC_GENERATOR} MATCHES ".*clang.*")
++ EXEC_PROGRAM ( "${LLVM_BC_GENERATOR}" ARGS --version OUTPUT_VARIABLE MY_CLANG_VERSION )
++ string (REGEX REPLACE "clang version ([0-9][.][0-9]+).*" "\\1" MY_CLANG_VERSION "${MY_CLANG_VERSION}")
++ if ((${MY_CLANG_VERSION} VERSION_GREATER "3.3")
++ AND (EXISTS "/usr/lib/libc++.dylib")
++ AND (EXISTS "/Library/Developer/CommandLineTools/usr/lib/c++/v1"))
++ set (LLVM_COMPILE_FLAGS ${LLVM_COMPILE_FLAGS} "-I/Library/Developer/CommandLineTools/usr/lib/c++/v1")
++ endif ()
++ endif ()
+
+ # Command to turn the .cpp file into LLVM assembly language .s, into
+ # LLVM bitcode .bc, then back into a C++ file with the bc embedded!
+ ADD_CUSTOM_COMMAND ( OUTPUT ${llvm_bc_cpp}
+- COMMAND ${LLVM_BC_GENERATOR} ${LLVM_COMPILE_FLAGS}
+- -I${CMAKE_CURRENT_SOURCE_DIR}
+- -I${CMAKE_SOURCE_DIR}/include
+- -I${CMAKE_BINARY_DIR}/include
+- -I${OPENIMAGEIO_INCLUDES} -I${ILMBASE_INCLUDE_DIR}
+- -I${Boost_INCLUDE_DIRS} -O3 -S -emit-llvm -o ${llvm_asm} ${llvm_src}
+-
++ COMMAND ${LLVM_BC_GENERATOR}
++ ${LLVM_COMPILE_FLAGS}
++ "-I${CMAKE_CURRENT_SOURCE_DIR}"
++ "-I${CMAKE_SOURCE_DIR}/src/include"
++ "-I${CMAKE_BINARY_DIR}/include"
++ "-I${OPENIMAGEIO_INCLUDES}"
++ "-I${ILMBASE_INCLUDE_DIR}"
++ "-I${Boost_INCLUDE_DIRS}"
++ -O3 -S -emit-llvm -o ${llvm_asm} ${llvm_src}
+ COMMAND ${LLVM_DIRECTORY}/bin/llvm-as -f -o ${llvm_bc} ${llvm_asm}
+ COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/serialize-bc.bash ${llvm_bc} ${llvm_bc_cpp}
+ MAIN_DEPENDENCY ${llvm_src}
+diff -Nur OpenShadingLanguage-Release-1.3.3.orig/src/liboslexec/llvm_headers.h OpenShadingLanguage-Release-1.3.3/src/liboslexec/llvm_headers.h
+--- OpenShadingLanguage-Release-1.3.3.orig/src/liboslexec/llvm_headers.h 2013-07-11 20:01:18.000000000 -0300
++++ OpenShadingLanguage-Release-1.3.3/src/liboslexec/llvm_headers.h 2014-02-04 19:28:31.349811104 -0200
+@@ -33,7 +33,27 @@
+ namespace llvm = LLVM_NAMESPACE;
+ #endif
+
+-#if OSL_LLVM_VERSION >= 33
++#if OSL_LLVM_VERSION >= 34
++
++# include <llvm/IR/Constants.h>
++# include <llvm/IR/DerivedTypes.h>
++# include <llvm/IR/Instructions.h>
++# include <llvm/IR/Intrinsics.h>
++# include <llvm/IR/Module.h>
++# include <llvm/IR/LLVMContext.h>
++# include <llvm/IR/IRBuilder.h>
++# include <llvm/IR/DataLayout.h>
++# include <llvm/Bitcode/ReaderWriter.h>
++# include <llvm/ExecutionEngine/GenericValue.h>
++# include <llvm/ExecutionEngine/JIT.h>
++# include <llvm/ExecutionEngine/JITMemoryManager.h>
++# include <llvm/Linker.h>
++# include <llvm/IR/LegacyPassManager.h>
++# include <llvm/Support/ManagedStatic.h>
++# include <llvm/Support/MemoryBuffer.h>
++# include <llvm/Support/raw_ostream.h>
++
++#elif OSL_LLVM_VERSION >= 33
+
+ # include <llvm/IR/Constants.h>
+ # include <llvm/IR/DerivedTypes.h>
+diff -Nur OpenShadingLanguage-Release-1.3.3.orig/src/liboslexec/llvm_instance.cpp OpenShadingLanguage-Release-1.3.3/src/liboslexec/llvm_instance.cpp
+--- OpenShadingLanguage-Release-1.3.3.orig/src/liboslexec/llvm_instance.cpp 2013-07-11 20:01:18.000000000 -0300
++++ OpenShadingLanguage-Release-1.3.3/src/liboslexec/llvm_instance.cpp 2014-02-04 20:08:23.574948459 -0200
+@@ -992,6 +992,7 @@
+ virtual void deallocateFunctionBody(void *Body) {
+ // DON'T DEALLOCATE mm->deallocateFunctionBody (Body);
+ }
++#if OSL_LLVM_VERSION <= 33
+ virtual uint8_t* startExceptionTable(const llvm::Function* F,
+ uintptr_t &ActualSize) {
+ return mm->startExceptionTable (F, ActualSize);
+@@ -1003,6 +1004,7 @@
+ virtual void deallocateExceptionTable(void *ET) {
+ // DON'T DEALLOCATE mm->deallocateExceptionTable(ET);
+ }
++#endif
+ virtual bool CheckInvariants(std::string &s) {
+ return mm->CheckInvariants(s);
+ }
+@@ -1018,7 +1020,41 @@
+ virtual unsigned GetNumCodeSlabs() { return mm->GetNumCodeSlabs(); }
+ virtual unsigned GetNumDataSlabs() { return mm->GetNumDataSlabs(); }
+ virtual unsigned GetNumStubSlabs() { return mm->GetNumStubSlabs(); }
+-#if OSL_LLVM_VERSION >= 31
++
++#if OSL_LLVM_VERSION >= 34
++
++ virtual void *getPointerToNamedFunction(const std::string &Name,
++ bool AbortOnFailure = true) {
++ return mm->getPointerToNamedFunction (Name, AbortOnFailure);
++ }
++ virtual uint8_t *allocateCodeSection(uintptr_t Size, unsigned Alignment,
++ unsigned SectionID, llvm::StringRef SectionName) {
++ return mm->allocateCodeSection(Size, Alignment, SectionID, SectionName);
++ }
++ virtual uint8_t *allocateDataSection(uintptr_t Size, unsigned Alignment,
++ unsigned SectionID, llvm::StringRef SectionName,
++ bool IsReadOnly) {
++ return mm->allocateDataSection(Size, Alignment, SectionID,
++ SectionName, IsReadOnly);
++ }
++ virtual void registerEHFrames(uint8_t *Addr, uint64_t LoadAddr, size_t Size) {
++ mm->registerEHFrames (Addr, LoadAddr, Size);
++ }
++ virtual void deregisterEHFrames(uint8_t *Addr, uint64_t LoadAddr, size_t Size) {
++ mm->deregisterEHFrames(Addr, LoadAddr, Size);
++ }
++ virtual uint64_t getSymbolAddress(const std::string &Name) {
++ return mm->getSymbolAddress (Name);
++ }
++ virtual void notifyObjectLoaded(llvm::ExecutionEngine *EE, const llvm::ObjectImage *oi) {
++ mm->notifyObjectLoaded (EE, oi);
++ }
++ virtual bool finalizeMemory(std::string *ErrMsg = 0) {
++ return mm->finalizeMemory (ErrMsg);
++ }
++
++#elif OSL_LLVM_VERSION == 33
++
+ virtual void *getPointerToNamedFunction(const std::string &Name,
+ bool AbortOnFailure = true) {
+ return mm->getPointerToNamedFunction (Name, AbortOnFailure);
+@@ -1027,7 +1063,6 @@
+ unsigned SectionID) {
+ return mm->allocateCodeSection(Size, Alignment, SectionID);
+ }
+-#if OSL_LLVM_VERSION >= 33
+ virtual uint8_t *allocateDataSection(uintptr_t Size, unsigned Alignment,
+ unsigned SectionID, bool IsReadOnly) {
+ return mm->allocateDataSection(Size, Alignment, SectionID, IsReadOnly);
+@@ -1035,12 +1070,22 @@
+ virtual bool applyPermissions(std::string *ErrMsg = 0) {
+ return mm->applyPermissions(ErrMsg);
+ }
+-#else
++
++#elif OSL_LLVM_VERSION == 32 || OSL_LLVM_VERSION == 31
++
++ virtual void *getPointerToNamedFunction(const std::string &Name,
++ bool AbortOnFailure = true) {
++ return mm->getPointerToNamedFunction (Name, AbortOnFailure);
++ }
++ virtual uint8_t *allocateCodeSection(uintptr_t Size, unsigned Alignment,
++ unsigned SectionID) {
++ return mm->allocateCodeSection(Size, Alignment, SectionID);
++ }
+ virtual uint8_t *allocateDataSection(uintptr_t Size, unsigned Alignment,
+ unsigned SectionID) {
+ return mm->allocateDataSection(Size, Alignment, SectionID);
+ }
+-#endif
++
+ #endif
+ };
+
+@@ -1155,7 +1200,7 @@
+ m_shadingsys.m_stat_empty_groups += 1;
+ m_shadingsys.m_stat_empty_instances += 1; // the one layer is empty
+ } else {
+- m_llvm_passes->run (*llvm_module());
++ m_llvm_module_passes->run (*llvm_module());
+ }
+
+ m_stat_llvm_opt_time += timer.lap();
+@@ -1290,7 +1335,12 @@
+ // Some global LLVM initialization for the first thread that
+ // gets here.
+ info ("Setting up LLVM");
++
++#if OSL_LLVM_VERSION <= 33
++ // Starting with LLVM 3.4, the pretty stack trace was opt-in rather
++ // than opt-out, and the following variable was removed.
+ llvm::DisablePrettyStackTrace = true;
++#endif
+ llvm::llvm_start_multithreaded (); // enable it to be thread-safe
+ llvm::InitializeNativeTarget();
+ done = true;
+@@ -1301,12 +1351,17 @@
+ void
+ RuntimeOptimizer::llvm_setup_optimization_passes ()
+ {
+- ASSERT (m_llvm_passes == NULL && m_llvm_func_passes == NULL);
++ ASSERT (m_llvm_module_passes == NULL && m_llvm_func_passes == NULL);
+
+ // Specify per-function passes
+ //
++#if OSL_LLVM_VERSION >= 34
++ m_llvm_func_passes = new llvm::legacy::FunctionPassManager(llvm_module());
++ llvm::legacy::FunctionPassManager &fpm (*m_llvm_func_passes);
++#else
+ m_llvm_func_passes = new llvm::FunctionPassManager(llvm_module());
+ llvm::FunctionPassManager &fpm (*m_llvm_func_passes);
++#endif
+ #if OSL_LLVM_VERSION >= 32
+ fpm.add (new llvm::DataLayout(llvm_module()));
+ #else
+@@ -1315,8 +1370,13 @@
+
+ // Specify module-wide (interprocedural optimization) passes
+ //
+- m_llvm_passes = new llvm::PassManager;
+- llvm::PassManager &passes (*m_llvm_passes);
++#if OSL_LLVM_VERSION >= 34
++ m_llvm_module_passes = new llvm::legacy::PassManager;
++ llvm::legacy::PassManager &passes (*m_llvm_module_passes);
++#else
++ m_llvm_module_passes = new llvm::PassManager;
++ llvm::PassManager &passes (*m_llvm_module_passes);
++#endif
+ #if OSL_LLVM_VERSION >= 32
+ passes.add (new llvm::DataLayout(llvm_module()));
+ #else
+diff -Nur OpenShadingLanguage-Release-1.3.3.orig/src/liboslexec/runtimeoptimize.cpp OpenShadingLanguage-Release-1.3.3/src/liboslexec/runtimeoptimize.cpp
+--- OpenShadingLanguage-Release-1.3.3.orig/src/liboslexec/runtimeoptimize.cpp 2013-07-11 20:01:18.000000000 -0300
++++ OpenShadingLanguage-Release-1.3.3/src/liboslexec/runtimeoptimize.cpp 2014-02-04 19:37:02.660353625 -0200
+@@ -107,7 +107,7 @@
+ m_stat_llvm_jit_time(0),
+ m_llvm_context(NULL), m_llvm_module(NULL),
+ m_llvm_exec(NULL), m_builder(NULL),
+- m_llvm_passes(NULL), m_llvm_func_passes(NULL)
++ m_llvm_module_passes(NULL), m_llvm_func_passes(NULL)
+ {
+ set_debug ();
+ memset (&m_shaderglobals, 0, sizeof(ShaderGlobals));
+@@ -119,7 +119,7 @@
+ RuntimeOptimizer::~RuntimeOptimizer ()
+ {
+ delete m_builder;
+- delete m_llvm_passes;
++ delete m_llvm_module_passes;
+ delete m_llvm_func_passes;
+ }
+
+diff -Nur OpenShadingLanguage-Release-1.3.3.orig/src/liboslexec/runtimeoptimize.h OpenShadingLanguage-Release-1.3.3/src/liboslexec/runtimeoptimize.h
+--- OpenShadingLanguage-Release-1.3.3.orig/src/liboslexec/runtimeoptimize.h 2013-07-11 20:01:18.000000000 -0300
++++ OpenShadingLanguage-Release-1.3.3/src/liboslexec/runtimeoptimize.h 2014-02-04 19:52:30.207956999 -0200
+@@ -934,8 +934,13 @@
+ llvm::Type *m_llvm_type_closure_component_attr; // LLVM type for ClosureMeta::Attr
+ llvm::PointerType *m_llvm_type_prepare_closure_func;
+ llvm::PointerType *m_llvm_type_setup_closure_func;
+- llvm::PassManager *m_llvm_passes;
++#if OSL_LLVM_VERSION >= 34
++ llvm::legacy::PassManager *m_llvm_module_passes;
++ llvm::legacy::FunctionPassManager *m_llvm_func_passes;
++#else
++ llvm::PassManager *m_llvm_module_passes;
+ llvm::FunctionPassManager *m_llvm_func_passes;
++#endif
+ int m_llvm_local_mem; // Amount of memory we use for locals
+
+ // Persistant data shared between layers
diff --git a/libre/psi/PKGBUILD b/libre/psi/PKGBUILD
index e37c37f05..c4150075f 100644
--- a/libre/psi/PKGBUILD
+++ b/libre/psi/PKGBUILD
@@ -4,7 +4,7 @@
pkgname=psi
pkgver=0.15
-pkgrel=2
+pkgrel=2.2
pkgdesc='Instant messaging application designed for the Jabber IM (Parabola rebranded)'
url='http://psi-im.org/'
license=('GPL')
@@ -15,7 +15,7 @@ install='psi.install'
source=("http://downloads.sourceforge.net/psi/psi-${pkgver}.tar.bz2"
'parabola.patch')
md5sums=('aea15f17cf93e7cea52f305523f761be'
- 'a641b77517c82c6e1f254d5595a25113')
+ '8a5c799ad8b6fd5310d4a849c324c82c')
prepare() {
cd ${srcdir}/psi-${pkgver}
diff --git a/libre/psi/parabola.patch b/libre/psi/parabola.patch
index cafe67fa1..9d41bffc4 100644
--- a/libre/psi/parabola.patch
+++ b/libre/psi/parabola.patch
@@ -25,7 +25,7 @@
};
enum OsFlags {
-@@ -106,24 +90,7 @@
+@@ -106,24 +90,8 @@
QString file;
QString name;
} osInfo[] = {
@@ -47,7 +47,8 @@
-
- // many distros use the /etc/redhat-release for compatibility, so RedHat will be the last :)
- { LinuxRedHat, OsUseFile, "/etc/redhat-release", "RedHat Linux" },
-+ { LinuxParabola, OsUseName, "/etc/arch-release", "Parabola GNU/Linux-libre" },
++ { LinuxParabola, OsUseName, "/etc/parabola-release", "Parabola GNU/Linux-libre" },
++ { LinuxParabola, OsUseFile, "/etc/parabola-release", "Parabola GNU/Linux-libre" },
{ LinuxNone, OsUseName, "", "" }
};
diff --git a/libre/reflector/PKGBUILD b/libre/reflector/PKGBUILD
index dda93c171..c8bc6bd5e 100644
--- a/libre/reflector/PKGBUILD
+++ b/libre/reflector/PKGBUILD
@@ -2,7 +2,7 @@
#Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
pkgname=reflector
pkgver=2014
-pkgrel=2
+pkgrel=2.1
pkgdesc='A Python 3 module and script to retrieve and filter the latest Pacman mirror list (Parabola rebranded)'
arch=(any)
license=(GPL)
diff --git a/libre/syslinux/PKGBUILD b/libre/syslinux/PKGBUILD
index 234f7a43f..6b3b53b77 100644
--- a/libre/syslinux/PKGBUILD
+++ b/libre/syslinux/PKGBUILD
@@ -5,7 +5,7 @@
pkgname="syslinux"
pkgver="6.02"
-pkgrel="8"
+pkgrel="8.1"
arch=('x86_64' 'i686')
pkgdesc="Collection of boot loaders that boot from FAT, ext2/3/4 and btrfs filesystems, from CDs and via PXE (Parabola rebranded)"
url="http://syslinux.zytor.com/"
diff --git a/libre/tp_smapi-libre-lts/PKGBUILD b/libre/tp_smapi-libre-lts/PKGBUILD
index de5c899c6..2a4a1a023 100644
--- a/libre/tp_smapi-libre-lts/PKGBUILD
+++ b/libre/tp_smapi-libre-lts/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 104131 2014-01-16 08:33:59Z bpiotrowski $
+# $Id: PKGBUILD 105407 2014-02-06 23:12:06Z bpiotrowski $
# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
# Contributor: xduugu
# Contributor: nh2
@@ -13,7 +13,7 @@ pkgname=tp_smapi-libre-lts
_pkgname=tp_smapi
_extramodules=/usr/lib/modules/extramodules-3.10-LIBRE-LTS
pkgver=0.41
-pkgrel=23
+pkgrel=24
pkgdesc="Modules for ThinkPad's SMAPI functionality (built for the linux-libre-lts kernel package)"
arch=('i686' 'x86_64' 'mips64el')
url='https://github.com/evgeni/tp_smapi'
diff --git a/libre/usermin/PKGBUILD b/libre/usermin/PKGBUILD
index 5344a65c2..5613daba3 100644
--- a/libre/usermin/PKGBUILD
+++ b/libre/usermin/PKGBUILD
@@ -2,7 +2,7 @@
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
pkgname=usermin
pkgver=1.570
-pkgrel=1
+pkgrel=1.1
pkgdesc="a web interface that can be used to easily perform tasks like reading mail, setting up SSH or configuring mail forwarding (Parabola rebranded)"
arch=(i686 x86_64 mips64el)
license=('custom:usermin')
diff --git a/libre/vim/PKGBUILD b/libre/vim/PKGBUILD
new file mode 100644
index 000000000..ed2252afd
--- /dev/null
+++ b/libre/vim/PKGBUILD
@@ -0,0 +1,227 @@
+# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
+# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
+# Contributor: tobias [ tobias at archlinux org ]
+# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
+
+pkgbase=vim
+pkgname=('vim' 'gvim' 'vim-runtime')
+_topver=7.4
+_patchlevel=135
+__hgrev=de28b1568fc2
+_versiondir="vim${_topver//./}"
+pkgver=${_topver}.${_patchlevel}
+pkgrel=2.1
+arch=('i686' 'x86_64')
+license=('custom:vim')
+url="http://www.vim.org"
+makedepends=('gpm' 'python2' 'ruby' 'libxt' 'desktop-file-utils' 'gtk2' 'lua')
+source=("ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz"
+ "ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz.sig"
+ 'vimrc'
+ 'parabola.vim'
+ 'gvim.desktop')
+md5sums=('be672ce2a929503412378c998fc3dc27'
+ 'SKIP'
+ '27820c2bdc34624674c561ae6476bc6a'
+ 'a8c21928eefd766e211f987879a9199c'
+ 'd90413bd21f400313a785bb4010120cd')
+
+# source PKGBUILD && mksource
+mksource() {
+ [[ -x /usr/bin/hg ]] || (echo "hg not found. Install mercurial." && return 1)
+
+ __hgroot='http://vim.googlecode.com/hg/'
+ __hgrepo='vim'
+ __hgbranch='default'
+
+ hg clone -b ${__hgbranch} -u ${__hgrev} "${__hgroot}${__hgrepo}" ${__hgrepo}
+
+ pushd ${__hgrepo}
+ if (( $(hg id -n) < $(hg id -nr ${__hgbranch}) )); then
+ printf 'You are not building the latest revision!\n'
+ printf "Consider updating __hgrev to $(hg id -r ${__hgbranch}).\n"
+ fi
+ popd
+
+ mv vim ${pkgname}-${pkgver}
+ find ${pkgname}-${pkgver} -depth -type d -name .hg -exec rm -rf {} \;
+ rm ${pkgname}-${pkgver}/{.hgignore,.hgtags}
+ tar -cJf ${pkgname}-${pkgver}.tar.xz ${pkgname}-${pkgver}/*
+ rm -r ${pkgname}-${pkgver}
+
+ gpg --detach-sign ${pkgname}-${pkgver}.tar.xz
+
+ scp ${pkgname}-${pkgver}.tar.xz nym:/srv/ftp/other/vim/
+ scp ${pkgname}-${pkgver}.tar.xz.sig nym:/srv/ftp/other/vim/
+}
+
+build() {
+ cp -a ${pkgname}-${pkgver} vim-build
+
+ # define the place for the global (g)vimrc file (set to /etc/vimrc)
+ sed -i 's|^.*\(#define SYS_.*VIMRC_FILE.*"\) .*$|\1|' \
+ vim-build/src/feature.h
+ sed -i 's|^.*\(#define VIMRC_FILE.*"\) .*$|\1|' \
+ vim-build/src/feature.h
+
+ (cd vim-build/src && autoconf)
+
+ cp -a vim-build gvim-build
+
+ cd "${srcdir}"/vim-build
+
+ ./configure \
+ --prefix=/usr \
+ --localstatedir=/var/lib/vim \
+ --with-features=huge \
+ --with-compiledby='Parabola GNU/Linux-libre' \
+ --enable-gpm \
+ --enable-acl \
+ --with-x=no \
+ --disable-gui \
+ --enable-multibyte \
+ --enable-cscope \
+ --disable-netbeans \
+ --enable-perlinterp \
+ --disable-pythoninterp \
+ --disable-python3interp \
+ --disable-rubyinterp \
+ --disable-luainterp
+
+ make
+
+ cd "${srcdir}"/gvim-build
+
+ ./configure \
+ --prefix=/usr \
+ --localstatedir=/var/lib/vim \
+ --with-features=huge \
+ --with-compiledby='Parabola GNU/Linux-libre' \
+ --enable-gpm \
+ --enable-acl \
+ --with-x=yes \
+ --enable-gui=gtk2 \
+ --enable-multibyte \
+ --enable-cscope \
+ --enable-netbeans \
+ --enable-perlinterp \
+ --enable-pythoninterp \
+ --disable-python3interp \
+ --enable-rubyinterp \
+ --enable-luainterp
+
+ make
+}
+
+check() {
+ # disable tests because they seem to freeze
+
+ cd "${srcdir}"/vim-build
+
+ #make test
+
+ cd "${srcdir}"/gvim-build
+
+ #make test
+}
+
+package_vim() {
+ pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor'
+ depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm')
+ conflicts=('gvim')
+
+ cd "${srcdir}"/vim-build
+ make -j1 VIMRCLOC=/etc DESTDIR="${pkgdir}" install
+
+ # provided by (n)vi in core
+ rm "${pkgdir}"/usr/bin/{ex,view}
+
+ # delete some manpages
+ find "${pkgdir}"/usr/share/man -type d -name 'man1' 2>/dev/null | \
+ while read _mandir; do
+ cd ${_mandir}
+ rm -f ex.1 view.1 # provided by (n)vi
+ rm -f evim.1 # this does not make sense if we have no GUI
+ done
+
+ # Runtime provided by runtime package
+ rm -r "${pkgdir}"/usr/share/vim
+
+ # license
+ install -Dm644 "${srcdir}"/vim-${pkgver}/runtime/doc/uganda.txt \
+ "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt
+}
+
+package_gvim() {
+ pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor (with advanced features, such as a GUI)'
+ depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'ruby' 'libxt'
+ 'desktop-file-utils' 'gtk2' 'lua' 'python2')
+ provides=("vim=${pkgver}-${pkgrel}")
+ conflicts=('vim')
+ install=gvim.install
+
+ cd "${srcdir}"/gvim-build
+ make -j1 VIMRCLOC=/etc DESTDIR="${pkgdir}" install
+
+ # provided by (n)vi in core
+ rm "${pkgdir}"/usr/bin/{ex,view}
+
+ # delete some manpages
+ find "${pkgdir}"/usr/share/man -type d -name 'man1' 2>/dev/null | \
+ while read _mandir; do
+ cd ${_mandir}
+ rm -f ex.1 view.1 # provided by (n)vi
+ done
+
+ # Move the runtime for later packaging
+ mv "${pkgdir}"/usr/share/vim "${srcdir}"/runtime-install
+
+ # freedesktop links
+ install -Dm644 "${srcdir}"/gvim.desktop \
+ "${pkgdir}"/usr/share/applications/gvim.desktop
+ install -Dm644 runtime/vim48x48.png "${pkgdir}"/usr/share/pixmaps/gvim.png
+
+ # license
+ install -Dm644 "${srcdir}"/vim-${pkgver}/runtime/doc/uganda.txt \
+ "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt
+}
+
+package_vim-runtime() {
+ pkgdesc='Runtime for vim and gvim (Parabola rebranded)'
+ depends=('perl' 'gawk')
+ backup=('etc/vimrc')
+
+ # Install the runtime split from gvim
+ install -dm755 "${pkgdir}"/usr/share
+ mv "${srcdir}"/runtime-install "${pkgdir}"/usr/share/vim
+
+ # Don't forget logtalk.dict
+ install -Dm644 "${srcdir}"/gvim-build/runtime/ftplugin/logtalk.dict \
+ "${pkgdir}"/usr/share/vim/${_versiondir}/ftplugin/logtalk.dict
+
+ # fix FS#17216
+ sed -i 's|messages,/var|messages,/var/log/messages.log,/var|' \
+ "${pkgdir}"/usr/share/vim/${_versiondir}/filetype.vim
+
+ # patch filetype.vim for better handling of pacman related files
+ sed -i "s/rpmsave/pacsave/;s/rpmnew/pacnew/;s/,\*\.ebuild/\0,PKGBUILD*,*.install/" \
+ "${pkgdir}"/usr/share/vim/${_versiondir}/filetype.vim
+ sed -i "/find the end/,+3{s/changelog_date_entry_search/changelog_date_end_entry_search/}" \
+ "${pkgdir}"/usr/share/vim/${_versiondir}/ftplugin/changelog.vim
+
+ # rc files
+ install -Dm644 "${srcdir}"/vimrc "${pkgdir}"/etc/vimrc
+ install -Dm644 "${srcdir}"/parabola.vim \
+ "${pkgdir}"/usr/share/vim/vimfiles/parabola.vim
+
+ # rgb.txt file
+ install -Dm644 "${srcdir}"/vim-${pkgver}/runtime/rgb.txt \
+ "${pkgdir}"/usr/share/vim/${_versiondir}/rgb.txt
+
+ # license
+ install -dm755 "${pkgdir}"/usr/share/licenses/vim-runtime
+ ln -s /usr/share/vim/${_versiondir}/doc/uganda.txt \
+ "${pkgdir}"/usr/share/licenses/vim-runtime/license.txt
+}
+
+# vim:set sw=2 sts=2 et:
diff --git a/libre/vim/gvim.desktop b/libre/vim/gvim.desktop
new file mode 100644
index 000000000..675357da5
--- /dev/null
+++ b/libre/vim/gvim.desktop
@@ -0,0 +1,63 @@
+[Desktop Entry]
+Name=Vi IMproved
+Name[bg]=Vi Ðåäàêòîð
+Name[ca]=Vi Millorat
+Name[da]=Vi forbedret
+Name[eo]=VIM
+Name[et]=Täiustatud Vi (vim)
+Name[fr]=Vi étendu (VIM)
+Name[he]=רפושמ Vi
+Name[hu]=Vi
+Name[is]=Vi IMproved ritillinn
+Name[it]=Vi iMproved
+Name[no]=Vi IMproved (forbedret VI)
+Name[pl]=Poprawiony VI (vim)
+Name[ro]=VIM
+Name[ru]=Улучшенный VI
+Name[sk]=Vi IMpreved
+Name[sl]=Izboljšani vi (vim)
+Name[sv]=Förbättrad Vi
+Name[zh_CN.GB2312]=改进的 Vi
+Comment=Powerful text editor with scripting functions and macro recorder
+Comment[bg]=Ðåäàêòîð ñ ìíîãî âúçìîæíîñòè
+Comment[ca]=Editor vi potent
+Comment[cs]=Mocný textový editor vi
+Comment[da]=En kraftig vi tekstbehandler
+Comment[de]=Ein leistungsfähiger vi-Editor
+Comment[el]=Πανίσχυρος διορθωτής vi
+Comment[eo]=VIM similas al redaktilo "vi", sed havas aldonajn ecojn
+Comment[es]=Una versión mejorada del editor vi
+Comment[et]=Võimas tekstiredaktor vi
+Comment[fi]=Tehokas vi-tekstieditori
+Comment[fr]=Éditeur vi puissant
+Comment[gl]=Potente editor vi
+Comment[he]=Vi המצועה בר ךרועה
+Comment[hr]=Napredni vi uređivač
+Comment[hu]=Vi szövegszerkesztő
+Comment[is]=Öflug útgáfa vi ritilsins
+Comment[it]=Un editor vi potenziato
+Comment[ja]=強力なViエディタ
+Comment[lt]=Galingas vi redaktorius
+Comment[mk]=Моќен VI уредувач
+Comment[nl]=Krachtige vi-editor
+Comment[no]=En kraftig vi-redigerer
+Comment[no_NY]=Kraftig vi-tekstredigeringsprogram
+Comment[pl]=Edytor vi
+Comment[pt]=Um poderoso editor de texto
+Comment[ro]=Un editor de texte VI, puternic
+Comment[ru]=Мощный текстовый редактор vi
+Comment[sk]=Silný textový procesor vi
+Comment[sl]=Zmogljivi urejevalnik vi
+Comment[sr]=Moćni vi editor
+Comment[sv]=En kraftfull texteditor
+Comment[ta]=ºì¾¢Å¡öó¾ vi ¦¾¡ÌôÀ¡Ç÷
+Comment[tr]=Güçlü vi düzenleyicisi
+Comment[uk]=Потужний редактор vi
+Comment[zh_CN.GB2312]=功能强大的 vi 编辑器
+MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
+Exec=gvim -f %F
+Icon=gvim
+Type=Application
+Terminal=false
+X-XClassHintResName=VIM
+Categories=Utility;TextEditor;
diff --git a/libre/vim/gvim.install b/libre/vim/gvim.install
new file mode 100644
index 000000000..2eaa60550
--- /dev/null
+++ b/libre/vim/gvim.install
@@ -0,0 +1,11 @@
+post_install() {
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+post_remove() {
+ post_install $1
+}
diff --git a/libre/vim/parabola.vim b/libre/vim/parabola.vim
new file mode 100644
index 000000000..bc3c1f82e
--- /dev/null
+++ b/libre/vim/parabola.vim
@@ -0,0 +1,27 @@
+" The Parabola GNU/Linux-libre global vimrc - setting only a few sane defaults
+"
+" Maintainer: Tobias Kieslich [tobias funnychar archlinux dot org]
+" Maintainer for Parabola rebranding: André Silva [emulatorman funnychar parabola dot nu]
+"
+" NEVER EDIT THIS FILE, IT'S OVERWRITTEN UPON UPGRADES, GLOBAL CONFIGURATION
+" SHALL BE DONE IN /etc/vimrc, USER SPECIFIC CONFIGURATION IN ~/.vimrc
+
+" Normally we use vim-extensions. If you want true vi-compatibility
+" remove change the following statements
+set nocompatible " Use Vim defaults instead of 100% vi compatibility
+set backspace=indent,eol,start " more powerful backspacing
+
+" Now we set some defaults for the editor
+set history=50 " keep 50 lines of command line history
+set ruler " show the cursor position all the time
+
+" Suffixes that get lower priority when doing tab completion for filenames.
+" These are files we are not likely to want to edit or read.
+set suffixes=.bak,~,.swp,.o,.info,.aux,.log,.dvi,.bbl,.blg,.brf,.cb,.ind,.idx,.ilg,.inx,.out,.toc
+
+
+if has('gui_running')
+ " Make shift-insert work like in Xterm
+ map <S-Insert> <MiddleMouse>
+ map! <S-Insert> <MiddleMouse>
+endif
diff --git a/libre/vim/vimrc b/libre/vim/vimrc
new file mode 100644
index 000000000..fc67e7eb0
--- /dev/null
+++ b/libre/vim/vimrc
@@ -0,0 +1,16 @@
+" All system-wide defaults are set in $VIMRUNTIME/parabola.vim (usually just
+" /usr/share/vim/vimfiles/parabola.vim) and sourced by the call to :runtime
+" you can find below. If you wish to change any of those settings, you should
+" do it in this file (/etc/vimrc), since parabola.vim will be overwritten
+" everytime an upgrade of the vim packages is performed. It is recommended to
+" make changes after sourcing parabola.vim since it alters the value of the
+" 'compatible' option.
+
+" This line should not be removed as it ensures that various options are
+" properly set to work with the Vim-related packages.
+runtime! parabola.vim
+
+" If you prefer the old-style vim functionalty, add 'runtime! vimrc_example.vim'
+" Or better yet, read /usr/share/vim/vim74/vimrc_example.vim or the vim manual
+" and configure vim to your own liking!
+
diff --git a/libre/webmin/PKGBUILD b/libre/webmin/PKGBUILD
index 17d02e437..824c7da2b 100644
--- a/libre/webmin/PKGBUILD
+++ b/libre/webmin/PKGBUILD
@@ -2,7 +2,7 @@
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
pkgname=webmin
pkgver=1.660
-pkgrel=1
+pkgrel=1.1
pkgdesc="a web-based interface for system administration (Parabola rebranded)"
arch=(i686 x86_64 mips64el)
license=('custom:webmin')
diff --git a/libre/xsp/PKGBUILD b/libre/xsp/PKGBUILD
index 02e172c8f..ef6fe97c2 100644
--- a/libre/xsp/PKGBUILD
+++ b/libre/xsp/PKGBUILD
@@ -4,7 +4,7 @@
pkgname=xsp
pkgver=3.0.11
-pkgrel=1
+pkgrel=1.1
pkgdesc="A simple webserver based on mono - provides ASP.NET support (Parabola rebranded)"
arch=('i686' 'x86_64' 'mips64el')
license=('custom')
diff --git a/nonprism/bti-nonprism/PKGBUILD b/nonprism/bti-nonprism/PKGBUILD
index 378664976..e09af287c 100644
--- a/nonprism/bti-nonprism/PKGBUILD
+++ b/nonprism/bti-nonprism/PKGBUILD
@@ -1,40 +1,40 @@
-# $Id$
-# Maintainer: Kaiting Chen <kaitocracy@gmail.com>
+# $Id: PKGBUILD 105298 2014-02-04 18:30:40Z jlichtblau $
+# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+# Contributor: Kaiting Chen <kaitocracy@gmail.com>
# Contributor: uvok <uvok at online dot de>
# Contributor: Urist <9362773 at gmail.com>
_pkgname=bti
pkgname=bti-nonprism
-pkgver=033
-pkgrel=1.1
+pkgver=034
+pkgrel=1
pkgdesc='Console client for status.net, without Twitter support'
arch=('i686' 'x86_64' 'mips64el')
url='http://gregkh.github.com/bti/'
license=('GPL')
depends=('pcre' 'libxml2' 'curl' 'liboauth' 'json-c')
-provides=$_pkgname
+provides=$_pkgname=$pkgver
conflicts=$_pkgname
replaces=$_pkgname
source=(http://www.kernel.org/pub/software/web/$_pkgname/$_pkgname-$pkgver.tar.xz
nonprism.patch)
-sha256sums=('a3d9d8a86a718a4820387c75ac2af24fecfe754ee562163d700acb7cf795d753'
- '184f2a134d44ae4c901ffdc824f833b477148f146e23f5d3680496658c9ca393')
+sha256sums=('8b4a1a11f529f83956468acadaea9d11db4f03e82afe07fecb84b2d00e9eae83'
+ '86eab6c949e3c19d3a4088fac78fba4709845e9d5871b12c17a944127347498c')
prepare() {
- cd ${srcdir}/$_pkgname-$pkgver
+ cd "${srcdir}"/$_pkgname-$pkgver
patch -Np1 -i ${srcdir}/nonprism.patch
}
build() {
- cd ${srcdir}/$_pkgname-$pkgver
+ cd "${srcdir}"/$_pkgname-$pkgver
./configure --prefix=/usr
make
}
package() {
- cd ${srcdir}/$_pkgname-$pkgver
+ cd "${srcdir}"/$_pkgname-$pkgver
- make DESTDIR=${pkgdir} install
+ make DESTDIR="${pkgdir}" install
}
-
diff --git a/nonprism/bti-nonprism/nonprism.patch b/nonprism/bti-nonprism/nonprism.patch
index 009c26d1e..9423d03a7 100644
--- a/nonprism/bti-nonprism/nonprism.patch
+++ b/nonprism/bti-nonprism/nonprism.patch
@@ -1,47 +1,61 @@
-diff -Nur bti-033/bti.1 bti-nonprism/bti.1
---- bti-033/bti.1 2013-06-27 18:23:38.000000000 -0300
-+++ bti-nonprism/bti.1 2013-08-21 18:24:32.693871946 -0300
+diff --git a/bti-bashcompletion b/bti-bashcompletion
+index fa55d75..f957b32 100644
+--- a/bti-bashcompletion
++++ b/bti-bashcompletion
+@@ -12,7 +12,7 @@ _bti()
+ fi
+
+ if [[ "${prev}" == "--host" ]] ; then
+- COMPREPLY=( $(compgen -W "twitter identica" -- ${cur} ) )
++ COMPREPLY=( $(compgen -W "statusnet" -- ${cur} ) )
+ fi
+
+ if [[ "${prev}" == "--action" ]] ; then
+diff --git a/bti.1 b/bti.1
+index bdd6c76..3577e98 100644
+--- a/bti.1
++++ b/bti.1
@@ -28,23 +28,23 @@
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
.SH "NAME"
--bti \- send a tweet to twitter\&.com or identi\&.ca from the command line
+-bti \- send a tweet to twitter\&.com from the command line
+bti \- send a tweet to status\&.net from the command line
.SH "SYNOPSIS"
.HP \w'\fBbti\fR\ 'u
\fBbti\fR [\fB\-\-account\ account\fR] [\fB\-\-password\ password\fR] [\fB\-\-action\ action\fR] [\fB\-\-user\ screenname\fR] [\fB\-\-host\ HOST_NAME\fR] [\fB\-\-proxy\ PROXY:PORT\fR] [\fB\-\-logfile\ LOGFILE\fR] [\fB\-\-config\ CONFIGFILE\fR] [\fB\-\-replyto\ ID\fR] [\fB\-\-retweet\ ID\fR] [\fB\-\-page\ PAGENUMBER\fR] [\fB\-\-bash\fR] [\fB\-\-shrink\-urls\fR] [\fB\-\-debug\fR] [\fB\-\-dry\-run\fR] [\fB\-\-verbose\fR] [\fB\-\-version\fR] [\fB\-\-help\fR]
.SH "DESCRIPTION"
.PP
--bti sends a tweet message to twitter\&.com or identi\&.ca\&.
+-bti sends a tweet message to twitter\&.com\&.
+bti sends a tweet message to status\&.net\&.
.SH "OPTIONS"
.PP
\fB\-\-account account\fR
.RS 4
--Specify the twitter\&.com or identi\&.ca account name\&.
+-Specify the twitter\&.com account name\&.
+Specify the status\&.net account name\&.
.RE
.PP
\fB\-\-password password\fR
.RS 4
--Specify the password of your twitter\&.com or identi\&.ca account\&.
+-Specify the password of your twitter\&.com account\&.
+Specify the password of your status\&.net account\&.
.RE
.PP
\fB\-\-action action\fR
-@@ -59,9 +59,9 @@
+@@ -59,9 +59,9 @@ Specify the user whose messages you want to see when the action is "user", and t
.PP
\fB\-\-host HOST_NAME\fR
.RS 4
--Specify the host which you want to send your message to\&. Valid options are "twitter" to send to twitter\&.com and "identica" to send to identi\&.ca\&. If you want to send the message to a custom StatusNet installation, you should specify the API URI\&. For example identi\&.ca\*(Aqs URI is: https://identi\&.ca/api/statuses
-+Specify the host which you want to send your message to\&. Valid options are "statusnet" to send to status\&.net\&. If you want to send the message to a custom StatusNet installation, you should specify the API URI\&. For example status\&.net\*(Aqs URI is: https://status\&.net/api/statuses
+-Specify the host which you want to send your message to\&. Valid options are "twitter" to send to twitter\&.com\&.
++Specify the host which you want to send your message to\&. Valid options are "statusnet" to send to status\&.net\&.
.sp
-If no host is specified, the default is to send to twitter\&.com\&.
+If no host is specified, the default is to send to status\&.net\&.
.RE
.PP
\fB\-\-proxy PROXY:PORT\fR
-@@ -85,8 +85,6 @@
+@@ -85,8 +85,6 @@ Specify a config file for bti to read from\&. By default, bti looks in the ~/\&.
.RS 4
Status ID of a single post to which you want to create a threaded reply to\&.
.sp
@@ -50,46 +64,35 @@ diff -Nur bti-033/bti.1 bti-nonprism/bti.1
For status\&.net, this can link any two messages into context with each other\&. Status\&.net will also link a message that contains an @name without this without regard to context\&.
.RE
.PP
-@@ -167,12 +165,12 @@
+@@ -167,12 +165,12 @@ The account and password can be stored in a configuration file in the users home
.PP
\fBaccount\fR
.RS 4
--The twitter\&.com or identi\&.ca account name you wish to use to send this message with\&.
+-The twitter\&.com account name you wish to use to send this message with\&.
+The status\&.net account name you wish to use to send this message with\&.
.RE
.PP
\fBpassword\fR
.RS 4
--The twitter\&.com or identi\&.ca password for the account you wish to use to send this message with\&.
+-The twitter\&.com password for the account you wish to use to send this message with\&.
+The status\&.net password for the account you wish to use to send this message with\&.
.RE
.PP
\fB\-\-action action\fR
-@@ -187,7 +185,7 @@
+@@ -187,7 +185,7 @@ Specify the user you want to see his/her messages while the action is "user"\&.
.PP
\fBhost\fR
.RS 4
--The host you want to use to send the message to\&. Valid options are either "twitter" or "identica" to send to twitter\&.com or identi\&.ca respectively\&. If you want to send the message to a custom StatusNet installation, you should specify the API URI\&. For example identi\&.ca\*(Aqs URI is: https://identi\&.ca/api/statuses\&.
-+The host you want to use to send the message to\&. Valid options are either "statusnet" to send to status\&.net respectively\&. If you want to send the message to a custom StatusNet installation, you should specify the API URI\&. For example status\&.net\*(Aqs URI is: https://status\&.net/api/statuses\&.
+-The host you want to use to send the message to\&. Valid options is "twitter" or "custom" to specify your own server\&.
++The host you want to use to send the message to\&. Valid options is "statusnet" or "custom" to specify your own server\&.
.RE
.PP
\fBproxy\fR
-diff -Nur bti-033/bti-bashcompletion bti-nonprism/bti-bashcompletion
---- bti-033/bti-bashcompletion 2013-06-27 18:23:38.000000000 -0300
-+++ bti-nonprism/bti-bashcompletion 2013-08-21 18:19:46.889928804 -0300
-@@ -12,7 +12,7 @@
- fi
-
- if [[ "${prev}" == "--host" ]] ; then
-- COMPREPLY=( $(compgen -W "twitter identica" -- ${cur} ) )
-+ COMPREPLY=( $(compgen -W "statusnet" -- ${cur} ) )
- fi
-
- if [[ "${prev}" == "--action" ]] ; then
-diff -Nur bti-033/bti.c bti-nonprism/bti.c
---- bti-033/bti.c 2013-06-27 18:23:38.000000000 -0300
-+++ bti-nonprism/bti.c 2013-08-21 18:31:54.013583020 -0300
-@@ -53,7 +53,7 @@
+diff --git a/bti.c b/bti.c
+index f4b2c4d..226e111 100644
+--- a/bti.c
++++ b/bti.c
+@@ -53,7 +53,7 @@ int debug;
static void display_help(void)
{
@@ -98,50 +101,39 @@ diff -Nur bti-033/bti.c bti-nonprism/bti.c
"Version: %s\n"
"Usage:\n"
" bti [options]\n"
-@@ -258,19 +258,12 @@
+@@ -258,14 +258,12 @@ static void bti_curl_buffer_free(struct bti_curl_buffer *buffer)
free(buffer);
}
--const char twitter_host[] = "http://api.twitter.com/1.1/statuses";
+-const char twitter_host[] = "https://api.twitter.com/1.1/statuses";
-const char twitter_host_stream[] = "https://stream.twitter.com/1.1/statuses"; /*this is not reset, and doesnt work */
--const char twitter_host_simple[] = "http://api.twitter.com/1.1";
--const char identica_host[] = "https://identi.ca/api/statuses";
+-const char twitter_host_simple[] = "https://api.twitter.com/1.1";
-const char twitter_name[] = "twitter";
--const char identica_name[] = "identi.ca";
--
++const char statusnet_host[] = "https://status.net/api/statuses";
++const char statusnet_name[] = "statusnet";
+
-static const char twitter_request_token_uri[] = "https://twitter.com/oauth/request_token";
-static const char twitter_access_token_uri[] = "https://twitter.com/oauth/access_token";
-static const char twitter_authorize_uri[] = "https://twitter.com/oauth/authorize?oauth_token=";
--static const char identica_request_token_uri[] = "https://identi.ca/api/oauth/request_token?oauth_callback=oob";
--static const char identica_access_token_uri[] = "https://identi.ca/api/oauth/access_token";
--static const char identica_authorize_uri[] = "https://identi.ca/api/oauth/authorize?oauth_token=";
-+const char statusnet_host[] = "https://status.net/api/statuses";
-+const char statusnet_name[] = "status.net";
-+
-+static const char statusnet_request_token_uri[] = "https://status.net/api/oauth/request_token?oauth_callback=oob";
-+static const char statusnet_access_token_uri[] = "https://status.net/api/oauth/access_token";
-+static const char statusnet_authorize_uri[] = "https://status.net/api/oauth/authorize?oauth_token=";
++static const char statusnet_request_token_uri[] = "https://status.net/api/oauth/request_token?oauth_callback=oob";
++static const char statusnet_access_token_uri[] = "https://status.net/api/oauth/access_token";
++static const char statusnet_authorize_uri[] = "https://status.net/api/oauth/authorize?oauth_token=";
static const char custom_request_token_uri[] = "/../oauth/request_token?oauth_callback=oob";
static const char custom_access_token_uri[] = "/../oauth/access_token";
static const char custom_authorize_uri[] = "/../oauth/authorize?oauth_token=";
-@@ -855,14 +848,9 @@
+@@ -792,9 +790,9 @@ static int request_access_token(struct session *session)
if (!session)
return -EINVAL;
- if (session->host == HOST_TWITTER)
-- request_url = oauth_sign_url2(
-- twitter_request_token_uri, NULL,
-- OA_HMAC, NULL, session->consumer_key,
-- session->consumer_secret, NULL, NULL);
-- else if (session->host == HOST_IDENTICA)
+ if (session->host == HOST_STATUSNET)
request_url = oauth_sign_url2(
-- identica_request_token_uri, NULL,
+- twitter_request_token_uri, NULL,
+ statusnet_request_token_uri, NULL,
OA_HMAC, NULL, session->consumer_key,
session->consumer_secret, NULL, NULL);
else {
-@@ -893,16 +881,11 @@
+@@ -825,11 +823,11 @@ static int request_access_token(struct session *session)
"Please open the following link in your browser, and "
"allow 'bti' to access your account. Then paste "
"back the provided PIN in here.\n");
@@ -152,16 +144,11 @@ diff -Nur bti-033/bti.c bti-nonprism/bti.c
verifier = session->readline(NULL);
sprintf(at_uri, "%s?oauth_verifier=%s",
- twitter_access_token_uri, verifier);
-- } else if (session->host == HOST_IDENTICA) {
-- fprintf(stdout, "%s%s\nPIN: ", identica_authorize_uri, at_key);
-- verifier = session->readline(NULL);
-- sprintf(at_uri, "%s?oauth_verifier=%s",
-- identica_access_token_uri, verifier);
+ statusnet_access_token_uri, verifier);
} else {
fprintf(stdout, "%s%s%s\nPIN: ",
session->hosturl, custom_authorize_uri, at_key);
-@@ -956,7 +939,7 @@
+@@ -883,7 +881,7 @@ static int send_request(struct session *session)
return -EINVAL;
if (!session->hosturl)
@@ -170,7 +157,7 @@ diff -Nur bti-033/bti.c bti-nonprism/bti.c
if (session->no_oauth || session->guest) {
curl_buf = bti_curl_buffer_alloc(session->action);
-@@ -971,7 +954,7 @@
+@@ -898,7 +896,7 @@ static int send_request(struct session *session)
}
if (!session->hosturl)
@@ -179,7 +166,7 @@ diff -Nur bti-033/bti.c bti-nonprism/bti.c
switch (session->action) {
case ACTION_UPDATE:
-@@ -1032,7 +1015,7 @@
+@@ -959,7 +957,7 @@ static int send_request(struct session *session)
case ACTION_PUBLIC:
/*snprintf(endpoint, endpoint_size, "%s%s?page=%d", session->hosturl,*/
@@ -188,7 +175,7 @@ diff -Nur bti-033/bti.c bti-nonprism/bti.c
public_uri);
curl_easy_setopt(curl, CURLOPT_URL, endpoint);
break;
-@@ -1045,7 +1028,6 @@
+@@ -972,7 +970,6 @@ static int send_request(struct session *session)
break;
case ACTION_DIRECT:
@@ -196,7 +183,7 @@ diff -Nur bti-033/bti.c bti-nonprism/bti.c
break;
default:
-@@ -1125,7 +1107,6 @@
+@@ -1052,7 +1049,6 @@ static int send_request(struct session *session)
} else {
switch (session->action) {
case ACTION_UPDATE:
@@ -204,7 +191,7 @@ diff -Nur bti-033/bti.c bti-nonprism/bti.c
if (strlen_utf8(session->tweet) > 140 + 1000 ) {
printf("E: tweet is too long!\n");
goto skip_tweet;
-@@ -1156,7 +1137,7 @@
+@@ -1083,7 +1079,7 @@ static int send_request(struct session *session)
mentions_uri, session->page);
break;
case ACTION_PUBLIC:
@@ -213,7 +200,7 @@ diff -Nur bti-033/bti.c bti-nonprism/bti.c
public_uri);
break;
case ACTION_GROUP:
-@@ -1175,7 +1156,7 @@
+@@ -1102,7 +1098,7 @@ static int send_request(struct session *session)
break;
case ACTION_DIRECT:
escaped_tweet = oauth_url_escape(session->tweet);
@@ -222,7 +209,7 @@ diff -Nur bti-033/bti.c bti-nonprism/bti.c
direct_uri, session->user, escaped_tweet);
is_post = 1;
break;
-@@ -1766,14 +1747,10 @@
+@@ -1691,10 +1687,10 @@ int main(int argc, char *argv[], char *envp[])
free(session->hosturl);
if (session->hostname)
free(session->hostname);
@@ -230,10 +217,6 @@ diff -Nur bti-033/bti.c bti-nonprism/bti.c
- session->host = HOST_TWITTER;
- session->hosturl = strdup(twitter_host);
- session->hostname = strdup(twitter_name);
-- } else if (strcasecmp(optarg, "identica") == 0) {
-- session->host = HOST_IDENTICA;
-- session->hosturl = strdup(identica_host);
-- session->hostname = strdup(identica_name);
+ if (strcasecmp(optarg, "statusnet") == 0) {
+ session->host = HOST_STATUSNET;
+ session->hosturl = strdup(statusnet_host);
@@ -241,7 +224,7 @@ diff -Nur bti-033/bti.c bti-nonprism/bti.c
} else {
session->host = HOST_CUSTOM;
session->hosturl = strdup(optarg);
-@@ -1829,31 +1806,8 @@
+@@ -1750,31 +1746,8 @@ int main(int argc, char *argv[], char *envp[])
if (debug)
display_version();
@@ -275,9 +258,10 @@ diff -Nur bti-033/bti.c bti-nonprism/bti.c
if (session->no_oauth) {
if (!session->account) {
-diff -Nur bti-033/bti.example bti-nonprism/bti.example
---- bti-033/bti.example 2012-06-22 18:45:42.000000000 -0300
-+++ bti-nonprism/bti.example 2013-08-21 18:24:54.398011375 -0300
+diff --git a/bti.example b/bti.example
+index 57c55c9..29afa11 100644
+--- a/bti.example
++++ b/bti.example
@@ -5,7 +5,7 @@
# a message.
account=twitmaster
@@ -287,40 +271,39 @@ diff -Nur bti-033/bti.example bti-nonprism/bti.example
# Example of a custom StatusNet installation
#host=http://army.twit.tv/api/statuses
logfile=.bti.log
-diff -Nur bti-033/bti.h bti-nonprism/bti.h
---- bti-033/bti.h 2013-06-27 18:23:38.000000000 -0300
-+++ bti-nonprism/bti.h 2013-08-21 18:19:22.865702111 -0300
-@@ -17,8 +17,7 @@
+diff --git a/bti.h b/bti.h
+index 3d5ed9c..e466c2a 100644
+--- a/bti.h
++++ b/bti.h
+@@ -17,7 +17,7 @@
#define __BTI_H
enum host {
- HOST_TWITTER = 0,
-- HOST_IDENTICA = 1,
-+ HOST_STATUSNET = 1,
++ HOST_STATUSNET = 1,
HOST_CUSTOM = 2
};
-@@ -76,10 +75,8 @@
+@@ -75,8 +75,8 @@ struct bti_curl_buffer {
int length;
};
-extern const char twitter_host[];
--extern const char identica_host[];
-extern const char twitter_name[];
--extern const char identica_name[];
+extern const char statusnet_host[];
+extern const char statusnet_name[];
extern int debug;
extern void bti_parse_configfile(struct session *session);
-diff -Nur bti-033/bti.xml bti-nonprism/bti.xml
---- bti-033/bti.xml 2013-06-27 18:23:38.000000000 -0300
-+++ bti-nonprism/bti.xml 2013-08-21 18:22:20.722310079 -0300
+diff --git a/bti.xml b/bti.xml
+index c0b89ee..00ad9a8 100644
+--- a/bti.xml
++++ b/bti.xml
@@ -21,7 +21,7 @@
<refnamediv>
<refname>bti</refname>
-- <refpurpose>send a tweet to twitter.com or identi.ca from the command line</refpurpose>
+- <refpurpose>send a tweet to twitter.com from the command line</refpurpose>
+ <refpurpose>send a tweet to status.net from the command line</refpurpose>
</refnamediv>
@@ -329,8 +312,8 @@ diff -Nur bti-033/bti.xml bti-nonprism/bti.xml
</refsynopsisdiv>
<refsect1><title>DESCRIPTION</title>
-- <para>bti sends a tweet message to twitter.com or identi.ca.
-+ <para>bti sends a tweet message or status.net.
+- <para>bti sends a tweet message to twitter.com.
++ <para>bti sends a tweet message to status.net.
</para>
</refsect1>
@@ -338,7 +321,7 @@ diff -Nur bti-033/bti.xml bti-nonprism/bti.xml
<term><option>--account account</option></term>
<listitem>
<para>
-- Specify the twitter.com or identi.ca account name.
+- Specify the twitter.com account name.
+ Specify the status.net account name.
</para>
</listitem>
@@ -347,25 +330,17 @@ diff -Nur bti-033/bti.xml bti-nonprism/bti.xml
<term><option>--password password</option></term>
<listitem>
<para>
-- Specify the password of your twitter.com or identi.ca account.
+- Specify the password of your twitter.com account.
+ Specify the password of your status.net account.
</para>
</listitem>
</varlistentry>
-@@ -100,15 +100,15 @@
+@@ -100,10 +100,10 @@
<listitem>
<para>
Specify the host which you want to send your message to. Valid
-- options are "twitter" to send to twitter.com and "identica" to
-- send to identi.ca.
-+ options are "statusnet" to
-+ send to status.net.
-
- If you want to send the message to a custom StatusNet installation,
-- you should specify the API URI. For example identi.ca's URI is:
-- https://identi.ca/api/statuses
-+ you should specify the API URI. For example status.net's URI is:
-+ https://status.net/api/statuses
+- options are "twitter" to send to twitter.com.
++ options are "statusnet" to send to status.net.
</para>
<para>
- If no host is specified, the default is to send to twitter.com.
@@ -373,7 +348,7 @@ diff -Nur bti-033/bti.xml bti-nonprism/bti.xml
</para>
</listitem>
</varlistentry>
-@@ -154,10 +154,6 @@
+@@ -149,10 +149,6 @@
reply to.
</para>
<para>
@@ -384,45 +359,38 @@ diff -Nur bti-033/bti.xml bti-nonprism/bti.xml
For status.net, this can link any two messages into context with
each other. Status.net will also link a message that contains an
@name without this without regard to context.
-@@ -306,7 +302,7 @@
+@@ -301,7 +297,7 @@
<term><option>account</option></term>
<listitem>
<para>
-- The twitter.com or identi.ca account name you wish to use to send this
+- The twitter.com account name you wish to use to send this
+ The status.net account name you wish to use to send this
message with.
</para>
</listitem>
-@@ -315,7 +311,7 @@
+@@ -310,7 +306,7 @@
<term><option>password</option></term>
<listitem>
<para>
-- The twitter.com or identi.ca password for the account you wish to use
+- The twitter.com password for the account you wish to use
+ The status.net password for the account you wish to use
to send this message with.
</para>
</listitem>
-@@ -346,12 +342,12 @@
+@@ -341,7 +337,7 @@
<listitem>
<para>
The host you want to use to send the message to. Valid
-- options are either "twitter" or "identica" to send to
-- twitter.com or identi.ca respectively.
-+ options are either "statusnet" to send to
-+ status.net respectively.
+- options is "twitter" or "custom" to specify your own server.
++ options is "statusnet" or "custom" to specify your own server.
- If you want to send the message to a custom StatusNet installation,
-- you should specify the API URI. For example identi.ca's URI is:
-- https://identi.ca/api/statuses.
-+ you should specify the API URI. For example status.net's URI is:
-+ https://status.net/api/statuses.
</para>
</listitem>
- </varlistentry>
-diff -Nur bti-033/config.c bti-nonprism/config.c
---- bti-033/config.c 2013-04-23 20:18:04.000000000 -0300
-+++ bti-nonprism/config.c 2013-08-21 18:17:39.798533227 -0300
-@@ -219,14 +219,10 @@
+diff --git a/config.c b/config.c
+index e6fecc1..0bbc186 100644
+--- a/config.c
++++ b/config.c
+@@ -219,10 +219,10 @@ static int retweet_callback(struct session *session, char *value)
static int host_callback(struct session *session, char *value)
{
@@ -430,10 +398,6 @@ diff -Nur bti-033/config.c bti-nonprism/config.c
- session->host = HOST_TWITTER;
- session->hosturl = strdup(twitter_host);
- session->hostname = strdup(twitter_name);
-- } else if (strcasecmp(value, "identica") == 0) {
-- session->host = HOST_IDENTICA;
-- session->hosturl = strdup(identica_host);
-- session->hostname = strdup(identica_name);
+ if (strcasecmp(value, "statusnet") == 0) {
+ session->host = HOST_STATUSNET;
+ session->hosturl = strdup(statusnet_host);
diff --git a/nonprism/claws-mail-nonprism/PKGBUILD b/nonprism/claws-mail-nonprism/PKGBUILD
index 1e48c65bd..fed2bb82c 100644
--- a/nonprism/claws-mail-nonprism/PKGBUILD
+++ b/nonprism/claws-mail-nonprism/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 201547 2013-12-14 21:56:36Z andyrtr $
+# $Id: PKGBUILD 205518 2014-02-06 16:12:34Z andyrtr $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
_pkgname=claws-mail
pkgname=$_pkgname-nonprism
pkgver=3.9.3
-pkgrel=1
+pkgrel=2
pkgdesc="A GTK+ based e-mail client, without libgdata support"
arch=('i686' 'x86_64' 'mips64el')
license=('GPL3')
url="http://www.$_pkgname.org"
-depends=('gtk2' 'gnutls' 'startup-notification' 'enchant' 'gpgme' 'libetpan>=1.1-4' 'compface'
+depends=('gtk2' 'gnutls' 'startup-notification' 'enchant' 'gpgme' 'libetpan' 'compface'
'libsm' 'dbus-glib' 'hicolor-icon-theme' 'desktop-file-utils')
makedepends=('spamassassin' 'bogofilter' 'valgrind'
# dependencies for plugins
diff --git a/nonprism/darktable-nonprism/PKGBUILD b/nonprism/darktable-nonprism/PKGBUILD
index 767694185..2f4b6ecca 100644
--- a/nonprism/darktable-nonprism/PKGBUILD
+++ b/nonprism/darktable-nonprism/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 104671 2014-01-24 14:19:50Z lcarlier $
+# $Id: PKGBUILD 105572 2014-02-10 13:31:04Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: Christian Himpel <chressie at gmail dot com>
# Contributor: Johannes Hanika <hanatos at gmail dot com>
_pkgname=darktable
pkgname=darktable-nonprism
-pkgver=1.4
+pkgver=1.4.1
_pkgver=1.4
-pkgrel=3
+pkgrel=1
pkgdesc="Utility to organize and develop raw images, without flickcurl support"
arch=('i686' 'x86_64' 'mips64el')
url=http://darktable.sf.net/
@@ -21,15 +21,8 @@ depends=('exiv2>=0.18' 'intltool>=0.40' 'lcms2' 'lensfun>=0.2.3' 'libglade' 'dbu
makedepends=('intltool>=0.40' 'cmake' 'librsvg')
optdepends=('librsvg')
install=darktable.install
-source=(http://downloads.sourceforge.net/project/darktable/darktable/${_pkgver}/darktable-$pkgver.tar.xz
- https://github.com/darktable-org/darktable/commit/74dbfa3b24bcc216ec91e12551b6b434e4a43a22.diff)
-md5sums=('896416931ded4579f528cd11edad470c'
- 'f959e371f8648eeef8ad6dd6e1403d29')
-
-prepare() {
- cd "$srcdir/$_pkgname-$pkgver"
- patch -p1 <$srcdir/74dbfa3b24bcc216ec91e12551b6b434e4a43a22.diff
-}
+source=(http://downloads.sourceforge.net/project/darktable/darktable/${_pkgver}/darktable-$pkgver.tar.xz)
+md5sums=('78252618bb7b1df30109ef5484d46f3c')
build() {
cd "$srcdir/$_pkgname-$pkgver"
diff --git a/nonprism/duplicity-nonprism/PKGBUILD b/nonprism/duplicity-nonprism/PKGBUILD
index bd0f54cb9..79163db90 100644
--- a/nonprism/duplicity-nonprism/PKGBUILD
+++ b/nonprism/duplicity-nonprism/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 105116 2014-01-31 20:58:38Z lfleischer $
+# $Id: PKGBUILD 105458 2014-02-08 15:39:04Z bgyorgy $
# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
# Contributor: Kaiting Chen <kaitocracy@gmail.com>
# Contributor: Aaron Schaefer <aaron@elasticdog.com>
@@ -7,7 +7,7 @@
_pkgname=duplicity
pkgname=duplicity-nonprism
pkgver=0.6.23
-pkgrel=2
+pkgrel=3
pkgdesc='A utility for encrypted, bandwidth-efficient backups using the rsync algorithm, without python2-gdata recommendation'
arch=('i686' 'x86_64')
url='http://www.nongnu.org/duplicity/'
@@ -23,9 +23,18 @@ optdepends=('lftp: FTPS backend'
replaces=$_pkgname
conflicts=$_pkgname
provides=$_pkgname=$pkgver
-source=("http://savannah.nongnu.org/download/$_pkgname/$_pkgname-$pkgver.tar.gz"{,.sig})
+source=("http://savannah.nongnu.org/download/$_pkgname/$_pkgname-$pkgver.tar.gz"{,.sig}
+ "gpg-encode.patch")
md5sums=('ae0e84446bcf114735de1057ed53c977'
- 'SKIP')
+ 'SKIP'
+ '366555c73aeebf7f15f6f37ec65176ce')
+
+prepare() {
+ cd "${srcdir}/${_pkgname}-${pkgver}"
+
+ # Fix gpg encrypted backup (FS#38838, upstream revision 961, will be fixed in 0.6.24).
+ patch -Np0 -i ../gpg-encode.patch
+}
build() {
cd "${srcdir}/${_pkgname}-${pkgver}"
diff --git a/nonprism/duplicity-nonprism/gpg-encode.patch b/nonprism/duplicity-nonprism/gpg-encode.patch
new file mode 100644
index 000000000..f9159a3ca
--- /dev/null
+++ b/nonprism/duplicity-nonprism/gpg-encode.patch
@@ -0,0 +1,216 @@
+=== modified file 'bin/duplicity'
+--- bin/duplicity 2014-01-21 21:04:27 +0000
++++ bin/duplicity 2014-02-05 02:57:13 +0000
+@@ -27,7 +27,7 @@
+ # Please send mail to me or the mailing list if you find bugs or have
+ # any suggestions.
+
+-import getpass, gzip, os, sys, time, types
++import gzip, os, sys, time, types
+ import traceback, platform, statvfs, resource, re
+ import threading
+ from datetime import datetime
+@@ -37,9 +37,6 @@
+ if os.path.exists(os.path.join(pwd, "../duplicity")):
+ sys.path.insert(0, os.path.abspath(os.path.join(pwd, "../.")))
+
+-import gettext
+-gettext.install('duplicity', codeset='utf8')
+-
+ from duplicity import log
+ log.setup()
+
+@@ -65,6 +62,13 @@
+ # If exit_val is not None, exit with given value at end.
+ exit_val = None
+
++def getpass_safe(message):
++ # getpass() in Python 2.x will call str() on our prompt. So we can't pass
++ # in non-ascii characters.
++ import getpass, locale
++ message = message.encode(locale.getpreferredencoding(), 'replace')
++ return getpass.getpass(message)
++
+ def get_passphrase(n, action, for_signing = False):
+ """
+ Check to make sure passphrase is indeed needed, then get
+@@ -160,19 +164,19 @@
+ if use_cache and globals.gpg_profile.signing_passphrase:
+ pass1 = globals.gpg_profile.signing_passphrase
+ else:
+- pass1 = getpass.getpass(_("GnuPG passphrase for signing key:")+" ")
++ pass1 = getpass_safe(_("GnuPG passphrase for signing key:")+" ")
+ else:
+ if use_cache and globals.gpg_profile.passphrase:
+ pass1 = globals.gpg_profile.passphrase
+ else:
+- pass1 = getpass.getpass(_("GnuPG passphrase:")+" ")
++ pass1 = getpass_safe(_("GnuPG passphrase:")+" ")
+
+ if n == 1:
+ pass2 = pass1
+ elif for_signing:
+- pass2 = getpass.getpass(_("Retype passphrase for signing key to confirm: "))
++ pass2 = getpass_safe(_("Retype passphrase for signing key to confirm: "))
+ else:
+- pass2 = getpass.getpass(_("Retype passphrase to confirm: "))
++ pass2 = getpass_safe(_("Retype passphrase to confirm: "))
+
+ if not pass1 == pass2:
+ print _("First and second passphrases do not match! Please try again.")
+
+=== modified file 'bin/rdiffdir'
+--- bin/rdiffdir 2013-12-27 06:39:00 +0000
++++ bin/rdiffdir 2014-02-05 02:57:13 +0000
+@@ -27,9 +27,6 @@
+
+ import sys, getopt, gzip, os
+
+-import gettext
+-gettext.install('duplicity', codeset='utf8')
+-
+ from duplicity import diffdir
+ from duplicity import patchdir
+ from duplicity import log
+
+=== added directory 'testing/overrides'
+=== added file 'testing/overrides/gettext.py'
+--- testing/overrides/gettext.py 1970-01-01 00:00:00 +0000
++++ testing/overrides/gettext.py 2014-02-05 02:57:13 +0000
+@@ -0,0 +1,34 @@
++# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf8 -*-
++#
++# Copyright 2014 Michael Terry <mike@mterry.name>
++#
++# This file is part of duplicity.
++#
++# Duplicity is free software; you can redistribute it and/or modify it
++# under the terms of the GNU General Public License as published by the
++# Free Software Foundation; either version 2 of the License, or (at your
++# option) any later version.
++#
++# Duplicity is distributed in the hope that it will be useful, but
++# WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++# General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with duplicity; if not, write to the Free Software Foundation,
++# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++
++# This is just a small override to the system gettext.py which allows us to
++# always return a string with fancy unicode characters, which will notify us
++# if we ever get a unicode->ascii translation by accident.
++
++def translation(*args, **kwargs):
++ class Translation:
++ ZWSP = u"​" # ZERO WIDTH SPACE, basically an invisible space separator
++ def install(self, **kwargs):
++ import __builtin__
++ __builtin__.__dict__['_'] = lambda x: x + self.ZWSP
++ def ungettext(self, one, more, n):
++ if n == 1: return one + self.ZWSP
++ else: return more + self.ZWSP
++ return Translation()
+
+=== modified file 'testing/run-tests'
+--- testing/run-tests 2011-11-24 01:49:53 +0000
++++ testing/run-tests 2014-02-05 02:57:13 +0000
+@@ -25,9 +25,9 @@
+
+ THISDIR=$(pwd)
+ export TZ=US/Central
+-export LANG=
++export LANG=en_US.UTF-8
+ # up for 'duplicity' module and here for 'helper.py'
+-export PYTHONPATH="$(dirname $THISDIR):$THISDIR/helpers"
++export PYTHONPATH="$THISDIR/overrides:$(dirname $THISDIR):$THISDIR/helpers"
+ export GNUPGHOME="$THISDIR/gnupg"
+ export PATH="$(dirname $THISDIR)/bin:$PATH"
+
+
+=== modified file 'testing/tests/finaltest.py'
+--- testing/tests/finaltest.py 2012-11-24 19:45:09 +0000
++++ testing/tests/finaltest.py 2014-02-05 02:57:13 +0000
+@@ -20,6 +20,7 @@
+ # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+ import helper
++import pexpect
+ import sys, os, unittest
+
+ import duplicity.backend
+@@ -50,7 +51,8 @@
+ """
+ Test backup/restore using duplicity binary
+ """
+- def run_duplicity(self, arglist, options = [], current_time = None):
++ def run_duplicity(self, arglist, options = [], current_time = None,
++ passphrase_input = None):
+ """Run duplicity binary with given arguments and options"""
+ options.append("--archive-dir testfiles/cache")
+ cmd_list = ["duplicity"]
+@@ -62,22 +64,23 @@
+ cmd_list.extend(arglist)
+ cmdline = " ".join(cmd_list)
+ #print "Running '%s'." % cmdline
+- if not os.environ.has_key('PASSPHRASE'):
++ if passphrase_input is None and not os.environ.has_key('PASSPHRASE'):
+ os.environ['PASSPHRASE'] = 'foobar'
+- return_val = os.system(cmdline)
++ (output, return_val) = pexpect.run(cmdline, withexitstatus=True,
++ events={'passphrase.*:': passphrase_input})
+ if return_val:
+ raise CmdError(return_val)
+
+- def backup(self, type, input_dir, options = [], current_time = None):
++ def backup(self, type, input_dir, options = [], **kwargs):
+ """Run duplicity backup to default directory"""
+ options = options[:]
+ if type == "full":
+ options.insert(0, 'full')
+ args = [input_dir, "'%s'" % backend_url]
+- self.run_duplicity(args, options, current_time)
++ self.run_duplicity(args, options, **kwargs)
+
+ def restore(self, file_to_restore = None, time = None, options = [],
+- current_time = None):
++ **kwargs):
+ options = options[:] # just nip any mutability problems in bud
+ assert not os.system("rm -rf testfiles/restore_out")
+ args = ["'%s'" % backend_url, "testfiles/restore_out"]
+@@ -85,17 +88,17 @@
+ options.extend(['--file-to-restore', file_to_restore])
+ if time:
+ options.extend(['--restore-time', str(time)])
+- self.run_duplicity(args, options, current_time)
++ self.run_duplicity(args, options, **kwargs)
+
+ def verify(self, dirname, file_to_verify = None, time = None, options = [],
+- current_time = None):
++ **kwargs):
+ options = ["verify"] + options[:]
+ args = ["'%s'" % backend_url, dirname]
+ if file_to_verify:
+ options.extend(['--file-to-restore', file_to_verify])
+ if time:
+ options.extend(['--restore-time', str(time)])
+- self.run_duplicity(args, options, current_time)
++ self.run_duplicity(args, options, **kwargs)
+
+ def deltmp(self):
+ """Delete temporary directories"""
+@@ -255,6 +258,12 @@
+ assert chain.start_time == 30000, chain.start_time
+ assert chain.end_time == 40000, chain.end_time
+
++ def test_piped_password(self):
++ """Make sure that prompting for a password works"""
++ self.backup("full", "testfiles/empty_dir",
++ passphrase_input="foobar\nfoobar\n")
++ self.restore(passphrase_input="foobar\n")
++
+ class FinalTest1(FinalTest, unittest.TestCase):
+ def setUp(self):
+ assert not os.system("tar xzf testfiles.tar.gz > /dev/null 2>&1")
+
diff --git a/nonprism/evolution-data-server-nonprism/PKGBUILD b/nonprism/evolution-data-server-nonprism/PKGBUILD
index f8e78ee1a..0ce7ceefd 100644
--- a/nonprism/evolution-data-server-nonprism/PKGBUILD
+++ b/nonprism/evolution-data-server-nonprism/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 201344 2013-12-09 08:01:08Z heftig $
+# $Id: PKGBUILD 205631 2014-02-10 09:46:35Z heftig $
# Maintainer: Jan de Groot <jgc@archlinux.org>
_pkgname=evolution-data-server
pkgname=evolution-data-server-nonprism
-pkgver=3.10.3
+pkgver=3.10.4
pkgrel=1
pkgdesc="Centralized access to appointments and contacts, without libgdata support"
arch=(i686 x86_64)
@@ -16,7 +16,7 @@ replaces=("$_pkgname" 'evolution-data-server-coherence')
conflicts=$_pkgname
provides=$_pkgname=$pkgver
source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.xz)
-sha256sums=('41af5c658255230de47423fad73f19bfab15b9e0df80141b13f66b55bf295bd2')
+sha256sums=('5c2d5e19af19ecfa81f31306411ab6155c3c62cf407d5a5aaa675a8ce940fa2d')
build() {
cd "$_pkgname-$pkgver"
diff --git a/nonprism/grilo-plugins-nonprism/PKGBUILD b/nonprism/grilo-plugins-nonprism/PKGBUILD
index b27e9ac91..ccae9590e 100644
--- a/nonprism/grilo-plugins-nonprism/PKGBUILD
+++ b/nonprism/grilo-plugins-nonprism/PKGBUILD
@@ -1,37 +1,36 @@
-# $Id: PKGBUILD 201648 2013-12-17 11:32:11Z heftig $
+# $Id: PKGBUILD 205839 2014-02-11 12:53:30Z heftig $
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
_pkgname=grilo-plugins
pkgname=grilo-plugins-nonprism
-pkgver=0.2.9
-pkgrel=3
-pkgdesc="Plugins for Grilo, without libgdata support"
+pkgver=0.2.10
+pkgrel=1
+pkgdesc="Plugins for Grilo, without libgdata support and gnome-online-accounts recommendation"
url="http://www.gnome.org"
arch=(i686 x86_64)
license=(LGPL)
+replaces=$_pkgname
+conflicts=$_pkgname
+provides=$_pkgname=$pkgver
depends=(grilo sqlite libgcrypt)
-makedepends=(gupnp-av gmime rest libtracker-sparql totem-plparser libdmapsharing
- json-glib intltool)
+makedepends=(gupnp-av gmime libtracker-sparql libdmapsharing
+ json-glib intltool avahi itstool)
optdepends=('gupnp-av: uPnP plugin'
'gmime: Podcasts plugin'
- 'rest: Blip.tv plugin'
'libtracker-sparql: Tracker plugin'
- 'totem-plparser: Youtube plugin, Vimeo plugin, Optical media plugin'
'libdmapsharing: DMAP sharing plugin'
- 'json-glib: TMDb plugin')
+ 'json-glib: TMDb plugin'
+ 'avahi: Freebox plugin')
options=('!emptydirs')
groups=('gnome')
-replaces=$_pkgname
-conflicts=$_pkgname
-provides=$_pkgname=$pkgver
source=(http://ftp.gnome.org/pub/gnome/sources/${_pkgname}/${pkgver%.*}/${_pkgname}-${pkgver}.tar.xz)
-sha256sums=('902b839bd1cdc27613d9e44af2afe00d1ef3b7471ae72c66c622560007e1023e')
+sha256sums=('5a7dd406ed58145847553e6dbb5f766e9d58dc5d4cfeb7e290d5b38c88163871')
build() {
cd $_pkgname-$pkgver
./configure --prefix=/usr --sysconfdir=/etc --disable-static \
- --enable-shoutcast
+ --enable-shoutcast --disable-pocket
make
}
diff --git a/nonprism/icedove-libre-nonprism/PKGBUILD b/nonprism/icedove-libre-nonprism/PKGBUILD
index 196536ea0..5097c1d2c 100644
--- a/nonprism/icedove-libre-nonprism/PKGBUILD
+++ b/nonprism/icedove-libre-nonprism/PKGBUILD
@@ -1,9 +1,9 @@
-# Maintainer : Márcio Silva <coadde@lavabit.com>
# Maintainer : André Silva <emulatorman@parabola.nu>
+# Contributor : Márcio Silva <coadde@parabola.nu>
-# We're getting this from Debian Experimental
+# We're getting this from Debian Sid
_debname=icedove
-_debver=24.1.1
+_debver=24.3.0
_debrel=deb1
_debrepo=http://ftp.debian.org/debian/pool/main/
debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -16,22 +16,22 @@ pkgrel=1
pkgdesc="A libre version of Debian Icedove, the standalone mail/news reader based on Mozilla Thunderbird, without support for unsafe and dangerous for privacy protocols"
arch=('i686' 'x86_64' 'mips64el')
license=('MPL' 'GPL' 'LGPL')
-url="http://packages.debian.org/experimental/${_pkgname}"
-depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss' 'sqlite' 'startup-notification')
-makedepends=('unzip' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'quilt')
+url="http://packages.debian.org/sid/${_pkgname}"
+depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss' 'sqlite' 'startup-notification')
+makedepends=('unzip' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'quilt' 'jquery-ui')
optdepends=('libcanberra: for sound support')
replaces=('thunderbird' "${pkgname%-nonprism}")
conflicts=('thunderbird' "${pkgname%-nonprism}")
provides=('thunderbird' "${pkgname%-nonprism}=$epoch:$pkgver")
install=${_pkgname}.install
source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.xz"
- "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel#deb}.debian.tar.gz"
+ "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel#deb}.debian.tar.xz"
mozconfig
vendor.js
${_pkgname}.desktop)
options=(!emptydirs)
-md5sums=('91ddfb44481e6cb456d835a832d885c1'
- '9f060324dbed3f8d27c896703bda6078'
+md5sums=('cbf58e11a8eb1ded01167fa927ce9cc0'
+ 'a8ef513d211c60bd2e77810c10a3c25c'
'c46cf2a671c8fdefcabd4c87e38f3d40'
'5a53179d14ae9631b7afe5e4d0fc0b25'
'e785e0c267f4435ae1a9aa0b03bcacfb')
@@ -106,6 +106,10 @@ prepare() {
# configure script misdetects the preprocessor without an optimization level
# https://bugs.archlinux.org/task/34644
sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' mozilla/configure
+
+ # Add symlinks to use jquery files built for us
+ ln -s /usr/share/javascript/jquery/jquery.min.js mail/jquery
+ ln -s /usr/share/javascript/jquery-ui/jquery-ui.min.js mail/jquery
}
build() {
diff --git a/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD b/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD
index 4e904a5b7..bb3d74ade 100644
--- a/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD
+++ b/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 203932 2014-01-14 07:49:31Z svenstaro $
+# $Id: PKGBUILD 205344 2014-02-04 14:04:24Z svenstaro $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
_pkgname=kdenetwork-kopete
pkgname=kdenetwork-kopete-libre-nonprism
-pkgver=4.12.1
+pkgver=4.12.2
pkgrel=1
pkgdesc='Instant Messenger, without Skype and support for unsafe and dangerous for privacy protocols'
url='http://kde.org/applications/internet/kopete/'
@@ -20,7 +20,7 @@ conflicts=$_pkgname
provides=$_pkgname=$pkgver
source=("http://download.kde.org/stable/${pkgver}/src/kopete-${pkgver}.tar.xz"
'libre-nonprism.patch')
-sha1sums=('e6ad13cb81842961df0e6e9ecda309b47db0af29'
+sha1sums=('6b5ebab916f4527157cf7f979724538f38052bad'
'ddde6ed0b6f281512dc12cb80f712f33c6932c92')
prepare() {
diff --git a/nonprism/kdepim-runtime-nonprism/PKGBUILD b/nonprism/kdepim-runtime-nonprism/PKGBUILD
index 222f86473..ecdf5bc50 100644
--- a/nonprism/kdepim-runtime-nonprism/PKGBUILD
+++ b/nonprism/kdepim-runtime-nonprism/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 203696 2014-01-14 07:35:24Z svenstaro $
+# $Id: PKGBUILD 205108 2014-02-04 13:51:21Z svenstaro $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
_pkgname=kdepim-runtime
pkgname=kdepim-runtime-nonprism
-pkgver=4.12.1
+pkgver=4.12.2
pkgrel=1
pkgdesc='Extends the functionality of kdepim, without libkgapi and libkfbapi support'
arch=('i686' 'x86_64')
@@ -18,7 +18,7 @@ replaces=('kdepim-runtime' 'kdepim-runtime-coherence')
conflicts=kdepim-runtime
provides=kdepim-runtime=$pkgver
source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz")
-sha1sums=('0df4bc061f5c6aca896361358befb58a0425347f')
+sha1sums=('9ec15431754f8ea49f764cafa5bb87eda5fef5b6')
prepare() {
mkdir build
diff --git a/nonprism/pidgin-nonprism/PKGBUILD b/nonprism/pidgin-nonprism/PKGBUILD
index 9f80eb57a..848606fd0 100644
--- a/nonprism/pidgin-nonprism/PKGBUILD
+++ b/nonprism/pidgin-nonprism/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 204921 2014-01-31 12:35:03Z foutrelis $
+# $Id: PKGBUILD 205034 2014-02-03 14:10:06Z foutrelis $
# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
# Contributor: Ionut Biru <ibiru@archlinux.org>
# Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -7,20 +7,18 @@
_pkgname=pidgin
pkgname=('pidgin-nonprism' 'libpurple-nonprism' 'finch-nonprism')
-pkgver=2.10.8
-pkgrel=2
+pkgver=2.10.9
+pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
url="http://pidgin.im/"
license=('GPL')
makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm'
'libidn' 'python2' 'hicolor-icon-theme' 'farstream-0.1' 'avahi'
'tk' 'ca-certificates' 'intltool' 'networkmanager')
-source=(http://downloads.sourceforge.net/$_pkgname/$_pkgname-$pkgver.tar.bz2{,.asc}
- pidgin-2.10.8-fix-login-issues-with-certain-xmpp-servers.patch
+source=(https://downloads.sourceforge.net/project/$_pkgname/Pidgin/$pkgver/$_pkgname-$pkgver.tar.bz2{,.asc}
nonprism.patch)
-sha256sums=('b633367e3588ff3e615d68e812302dfdbe32e73693cbe42a0d827b7aed7a8227'
+sha256sums=('dc362ed8577f623eea4554a79e917073aa726825074fea402f2e515f0f51f319'
'SKIP'
- '4b4cc2d0816bbc7de83d34de6880935163007193a36dcc13afc89fc1ffacc5d2'
'f7acfb852cdecfed16e8b116546b643cad1c44d28b56f28ff5485f92af68e9e2')
prepare() {
@@ -32,9 +30,6 @@ prepare() {
sed -i 's|on Linux|on GNU/Linux|' libpurple/valgrind.h
sed -i 's|On Linux|On GNU/Linux|' libpurple/connection.h
- # https://developer.pidgin.im/ticket/15879
- patch -Np1 -i "$srcdir/pidgin-2.10.8-fix-login-issues-with-certain-xmpp-servers.patch"
-
# Use Python 2
sed -i 's/env python$/&2/' */plugins/*.py \
libpurple/purple-{remote,notifications-example,url-handler}
diff --git a/nonprism/pidgin-nonprism/pidgin-2.10.8-fix-login-issues-with-certain-xmpp-servers.patch b/nonprism/pidgin-nonprism/pidgin-2.10.8-fix-login-issues-with-certain-xmpp-servers.patch
deleted file mode 100644
index 32f28aa25..000000000
--- a/nonprism/pidgin-nonprism/pidgin-2.10.8-fix-login-issues-with-certain-xmpp-servers.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-
-# HG changeset patch
-# User Mark Doliner <mark@kingant.net>
-# Date 1391153359 28800
-# Node ID b8e2a5fbffd3052ccba7160b56eac70f8e19c49a
-# Parent e733020a9d3840275ffa931a9aeefe4d8befc08e
-Fix problems logging into some servers including jabber.org and
-chat.facebook.com.
-
-See my length comment in iq.c for details.
-
-diff --git a/libpurple/protocols/jabber/iq.c b/libpurple/protocols/jabber/iq.c
---- a/libpurple/protocols/jabber/iq.c
-+++ b/libpurple/protocols/jabber/iq.c
-@@ -283,6 +283,52 @@
- g_hash_table_remove(js->iq_callbacks, id);
- }
-
-+/**
-+ * Verify that the 'from' attribute of an IQ reply is a valid match for
-+ * a given IQ request. The expected behavior is outlined in section
-+ * 8.1.2.1 of the XMPP CORE spec (RFC 6120). We consider the reply to
-+ * be a valid match if any of the following is true:
-+ * - Request 'to' matches reply 'from' (including the case where
-+ * neither are set).
-+ * - Request 'to' was empty and reply 'from' is server JID.
-+ * - Request 'to' was empty and reply 'from' is my JID. The spec says
-+ * we should only allow bare JID, but we also allow full JID for
-+ * compatibility with some servers.
-+ *
-+ * These rules should allow valid IQ replies while preventing spoofed
-+ * ones.
-+ *
-+ * For more discussion see the "Spoofing of iq ids and misbehaving
-+ * servers" email thread from January 2014 on the jdev and security
-+ * mailing lists.
-+ *
-+ * @return TRUE if this reply is valid for the given request.
-+ */
-+static gboolean does_reply_from_match_request_to(JabberStream *js, JabberID *to, JabberID *from)
-+{
-+ if (jabber_id_equal(to, from)) {
-+ /* Request 'to' matches reply 'from' */
-+ return TRUE;
-+ }
-+
-+ if (!to && purple_strequal(from->domain, js->user->domain)) {
-+ /* Request 'to' is empty and reply 'from' domain matches our domain */
-+
-+ if (!from->node && !from->resource) {
-+ /* Reply 'from' is server bare JID */
-+ return TRUE;
-+ }
-+
-+ if (purple_strequal(from->node, js->user->node)
-+ && (!from->resource || purple_strequal(from->resource, js->user->resource))) {
-+ /* Reply 'from' is my full or bare JID */
-+ return TRUE;
-+ }
-+ }
-+
-+ return FALSE;
-+}
-+
- void jabber_iq_parse(JabberStream *js, xmlnode *packet)
- {
- JabberIqCallbackData *jcd;
-@@ -377,8 +423,9 @@
-
- /* First, lets see if a special callback got registered */
- if(type == JABBER_IQ_RESULT || type == JABBER_IQ_ERROR) {
-- if((jcd = g_hash_table_lookup(js->iq_callbacks, id))) {
-- if(jabber_id_equal(js, jcd->to, from_id)) {
-+ jcd = g_hash_table_lookup(js->iq_callbacks, id);
-+ if (jcd) {
-+ if (does_reply_from_match_request_to(js, jcd->to, from_id)) {
- jcd->callback(js, from, type, id, packet, jcd->data);
- jabber_iq_remove_callback_by_id(js, id);
- jabber_id_free(from_id);
-diff --git a/libpurple/protocols/jabber/jutil.c b/libpurple/protocols/jabber/jutil.c
---- a/libpurple/protocols/jabber/jutil.c
-+++ b/libpurple/protocols/jabber/jutil.c
-@@ -510,30 +510,21 @@
-
-
- gboolean
--jabber_id_equal(JabberStream *js, const JabberID *jid1, const JabberID *jid2)
-+jabber_id_equal(const JabberID *jid1, const JabberID *jid2)
- {
-- const JabberID *j1, *j2;
-- JabberID *bare_user_jid;
-- gboolean equal;
-+ if (!jid1 && !jid2) {
-+ /* Both are null therefore equal */
-+ return TRUE;
-+ }
-
-- /* If an outgoing stanza has no 'to', or an incoming has no 'from',
-- * then those are "the server acting as my account". This function will
-- * handle that correctly.
-- */
-- if (!jid1 && !jid2)
-- return TRUE;
-+ if (!jid1 || !jid2) {
-+ /* One is null, other is non-null, therefore not equal */
-+ return FALSE;
-+ }
-
-- bare_user_jid = jabber_id_to_bare_jid(js->user);
-- j1 = jid1 ? jid1 : bare_user_jid;
-- j2 = jid2 ? jid2 : bare_user_jid;
--
-- equal = purple_strequal(j1->node, j2->node) &&
-- purple_strequal(j1->domain, j2->domain) &&
-- purple_strequal(j1->resource, j2->resource);
--
-- jabber_id_free(bare_user_jid);
--
-- return equal;
-+ return purple_strequal(jid1->node, jid2->node) &&
-+ purple_strequal(jid1->domain, jid2->domain) &&
-+ purple_strequal(jid1->resource, jid2->resource);
- }
-
- char *jabber_get_domain(const char *in)
-diff --git a/libpurple/protocols/jabber/jutil.h b/libpurple/protocols/jabber/jutil.h
---- a/libpurple/protocols/jabber/jutil.h
-+++ b/libpurple/protocols/jabber/jutil.h
-@@ -46,12 +46,10 @@
- JabberID* jabber_id_new(const char *str);
-
- /**
-- * Compare two JIDs for equality.
-- *
-- * Warning: If either JID is NULL then this function uses the user's
-- * bare JID, instead!
-+ * Compare two JIDs for equality. In addition to the node and domain,
-+ * the resources of the two JIDs must also be equal (or both absent).
- */
--gboolean jabber_id_equal(JabberStream *js, const JabberID *jid1, const JabberID *jid2);
-+gboolean jabber_id_equal(const JabberID *jid1, const JabberID *jid2);
-
- void jabber_id_free(JabberID *jid);
-
-
diff --git a/pcr/gnuhealth/PKGBUILD b/pcr/gnuhealth/PKGBUILD
index ba7639b90..c10b4e7c9 100644
--- a/pcr/gnuhealth/PKGBUILD
+++ b/pcr/gnuhealth/PKGBUILD
@@ -2,7 +2,7 @@
# Contributor: SpepS <dreamspepser at yahoo dot it>
pkgname=gnuhealth
-pkgver=2.2.2
+pkgver=2.4.0
pkgrel=1
pkgdesc="A free Health and Hospital Information System"
arch=any
@@ -12,8 +12,8 @@ depends=(
postgresql
pygtk
python2-dateutil
- python2-imaging
python2-ldap
+ python2-pillow
python2-pip
python2-psycopg2
python2-pytz
@@ -27,7 +27,7 @@ depends=(
"trytond-stock-lot>=3.0"
)
source=http://ftp.gnu.org/gnu/health/$pkgname-$pkgver.tar.gz
-sha512sums=45e6965b583c08c3a457dc733274253f5ff66fa5760509d42291271e4b6237f1b34829f0403235d8a457d1236c8ffec3f22b7495859cbe399abc8f3f71556c0e
+sha512sums=ee33b3efd731a7dc688e20c09a0aff58001e5e9b24d01420da20021e13ac3ca90c4fb141c4ca49d7d27144d1ef0255d09fd4eab83c86b782052c2244a57ba36d
package() {
MODULES=(
@@ -50,6 +50,8 @@ package() {
health_ntd_dengue
health_nursing
health_pediatrics
+ health_pediatrics_growth_charts
+ health_pediatrics_growth_charts_who
health_profile
health_qrcodes
health_reporting
diff --git a/pcr/ocsync/PKGBUILD b/pcr/ocsync/PKGBUILD
index 8da91f41d..cc780cfbb 100644
--- a/pcr/ocsync/PKGBUILD
+++ b/pcr/ocsync/PKGBUILD
@@ -10,27 +10,27 @@
# See http://techbase.kde.org/Development/CMake/Addons_for_KDE#Buildtypes to check what is supported.
# Default is RelWithDebInfo to help with debugging.
-_buildtype="Release"
+_buildtype='Release'
##############################################################
pkgname=ocsync
-pkgver=0.90.4
-pkgrel=1
-pkgdesc="A file synchronizer especially designed for you, the normal user. Dependency of owncloud-client."
-arch=("i686" "x86_64")
-url="http://www.csync.org"
+pkgver=0.91.4
+pkgrel=2
+pkgdesc='A file synchronizer especially designed for you, the normal user. Dependency of owncloud-client.'
+arch=('i686' 'x86_64' 'armv7h')
+url='http://www.csync.org'
license=('GPL2')
depends=('sqlite3' 'iniparser' 'neon' 'libssh')
makedepends=('cmake')
provides=('csync' 'csync-owncloud')
conflicts=('csync' 'csync-owncloud')
+options=('staticlibs')
backup=('etc/ocsync/ocsync.conf' 'etc/ocsync/ocsync_exclude.conf')
-source=("http://download.owncloud.com/download/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('4724730cf7376983c06bc83133c06a3f')
+source=("http://download.owncloud.com/desktop/stable/${pkgname}-${pkgver}.tar.bz2")
-if [[ ! ${_buildtype} == "Release" ]] && [[ ! ${_buildtype} == "release" ]]; then
- options=(!strip)
+if [[ ! ${_buildtype} == 'Release' ]] && [[ ! ${_buildtype} == 'release' ]]; then
+ options+=('debug')
fi
prepare() {
@@ -51,3 +51,4 @@ package() {
cd ${srcdir}/${pkgname}-${pkgver}-build
make DESTDIR=${pkgdir} install
}
+sha256sums=('9ce5d04ff0475be4c3d3bfff43a554980d88277e95de4128a3f18611529b2cb6')
diff --git a/pcr/owncloud-app-roundcube/PKGBUILD b/pcr/owncloud-app-roundcube/PKGBUILD
new file mode 100644
index 000000000..050925d8c
--- /dev/null
+++ b/pcr/owncloud-app-roundcube/PKGBUILD
@@ -0,0 +1,20 @@
+# $Id: PKGBUILD 103944 2014-01-13 20:31:53Z spupykin $
+# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer : Parabola Aurélien Desbrières <aurelien@hackers.guru>
+
+pkgname=owncloud-app-roundcube
+pkgver=1.3.1
+pkgrel=1
+pkgdesc="Roundcubemail integration for owncloud"
+arch=('any')
+url="http://apps.owncloud.com/content/show.php/?content=151523"
+license=('GPL')
+depends=('owncloud')
+makedepends=()
+options=('!strip')
+source=("https://github.com/hypery2k/owncloud/releases/download/v$pkgver/roundcube.zip")
+
+package() {
+ install -d ${pkgdir}/usr/share/webapps/owncloud/apps
+ cp -a ${srcdir}/roundcube ${pkgdir}/usr/share/webapps/owncloud/apps/roundcube
+}
diff --git a/pcr/owncloud-client/PKGBUILD b/pcr/owncloud-client/PKGBUILD
index a28aae986..2e1e82c15 100644
--- a/pcr/owncloud-client/PKGBUILD
+++ b/pcr/owncloud-client/PKGBUILD
@@ -10,17 +10,17 @@
# See http://techbase.kde.org/Development/CMake/Addons_for_KDE#Buildtypes to check what is supported.
# Default is RelWithDebInfo to help with debugging.
-_buildtype="Release"
+_buildtype='Release'
##############################################################
_name=mirall
pkgname=owncloud-client
-pkgver=1.4.2
+pkgver=1.5.1
pkgrel=1
-pkgdesc="ownCloud client based on mirall"
-arch=('i686' 'x86_64')
-url="http://owncloud.org/"
+pkgdesc='ownCloud client based on mirall'
+arch=('i686' 'x86_64' 'armv7h')
+url='http://owncloud.org/'
license=('GPL2')
depends=('qt4' 'ocsync' 'qtkeychain' 'qtwebkit')
makedepends=('cmake')
@@ -28,11 +28,9 @@ provides=('mirall' 'owncloud-client')
conflicts=('mirall-git')
install=owncloud-client.install
backup=('etc/ownCloud/sync-exclude.lst')
-source=("http://download.owncloud.com/download/${_name}-${pkgver}.tar.bz2")
-md5sums=('089a9df66f31d6915a60e48ca4a027a8')
+source=("http://download.owncloud.com/desktop/stable/${_name}-${pkgver}.tar.bz2")
-
-if [[ ! ${_buildtype} == "Release" ]] && [[ ! ${_buildtype} == "release" ]]; then
+if [[ ! ${_buildtype} == 'Release' ]] && [[ ! ${_buildtype} == 'release' ]]; then
options=(!strip)
fi
@@ -58,3 +56,4 @@ package() {
cd ${srcdir}/${_name}-${pkgver}-build
make DESTDIR=${pkgdir} install
}
+sha256sums=('79c41f8c72c994ab803b7053a1c7e0a46bbd20c25c1eed900e1c98433745daee')
diff --git a/pcr/pdsh/PKGBUILD b/pcr/pdsh/PKGBUILD
new file mode 100644
index 000000000..0f4fc2461
--- /dev/null
+++ b/pcr/pdsh/PKGBUILD
@@ -0,0 +1,33 @@
+# Contributor: drrossum <d.r.vanrossum at gmx.de>
+# Contributor: sh0 <mee@sh0.org>
+# Maintainer : Aurelien Desbrieres <aurelien@xload.io>
+
+pkgname=pdsh
+pkgver=2.29
+pkgrel=2
+pkgdesc='Parallel Distributed Shell'
+url='http://code.google.com/p/pdsh/'
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('glibc' 'openssh' 'readline')
+optdepends=('perl: required by the dshbak utility')
+options=('libtool')
+source=("http://pdsh.googlecode.com/files/$pkgname-$pkgver.tar.bz2")
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ ./configure --prefix=/usr --mandir=/usr/share/man \
+ --without-rsh \
+ --with-ssh \
+ --with-dshgroups \
+ --with-readline || return 1
+ make || return 1
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}/" install || return 1
+ rmdir "${pkgdir}/usr/sbin"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/perspectives-server/PKGBUILD b/pcr/perspectives-server/PKGBUILD
new file mode 100644
index 000000000..8867faa37
--- /dev/null
+++ b/pcr/perspectives-server/PKGBUILD
@@ -0,0 +1,51 @@
+# Maintainer: fauno
+# Based on the git version by
+# Maintainer: Robert Štětka <robert dot stetka at gmail dot com>
+pkgname=perspectives-server
+pkgver=3.4
+pkgrel=1
+url='https://perspectives-project.org/'
+pkgdesc='Perspectives notary server'
+arch=('any')
+license=('GPL3')
+depends=('openssl' 'python2>=2.7' 'python2-m2crypto'
+ 'python2-cherrypy' 'python2-sqlalchemy')
+source=("https://repo.parabolagnulinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+ perspectives-server.{conf,cron,service,install})
+install="${pkgname}.install"
+optdepends=('python2-psycopg2: for postgresql storage'
+ 'memcache: for caching'
+ 'redis: for caching')
+md5sums=('de34f288c54cdfa81b6f8d67672515a0'
+ '00c42be9b00186cd660645a0cf20fa4b'
+ '2343fe5f9756ffd7a70e39d04ba21d46'
+ '870bf3020c73c02853cf1c0d1668d005'
+ '7d51646e864e895d13a3eb682ebf78ec')
+
+mkdepends=('git')
+mksource=("$pkgname-$pkgver::git+https://github.com/danwent/Perspectives-Server/#tag=v$pkgver")
+mkmd5sums=('SKIP')
+
+mksource() {
+ :
+}
+
+package() {
+ install -dm 750 ${pkgdir}/usr/share/webapps/${pkgname}
+ install -dm 750 ${pkgdir}/etc/webapps/${pkgname}
+
+ install -Dm 640 ${srcdir}/${pkgname}.conf \
+ ${pkgdir}/etc/conf.d/${pkgname}.conf
+
+ install -Dm 755 ${srcdir}/${pkgname}.cron \
+ ${pkgdir}/etc/cron.daily/${pkgname}
+
+ cp -av "$srcdir/$pkgname-$pkgver/"* \
+ "${pkgdir}/usr/share/webapps/${pkgname}/"
+
+ install -Dm 644 ${srcdir}/${pkgname}.service \
+ ${pkgdir}/usr/lib/systemd/system/${pkgname}.service
+}
+
+
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/perspectives-server/perspectives-server.conf b/pcr/perspectives-server/perspectives-server.conf
new file mode 100644
index 000000000..fad23db68
--- /dev/null
+++ b/pcr/perspectives-server/perspectives-server.conf
@@ -0,0 +1,17 @@
+# Perspectives env vars
+FLAGS="--sni --metricsdb"
+
+# See notary_http.py -h to get this working
+NOTARY_PUBLIC_KEY=/etc/webapps/perspectives-server/notary.pub
+NOTARY_PRIVATE_KEY=/etc/webapps/perspectives-server/notary.priv
+PORT=8080
+
+#MEMCACHE_SERVER=
+#MEMCACHE_USERNAME=
+#MEMCACHE_PASSWORD=
+#MEMCACHIER_SERVERS=
+#MEMCACHIER_USERNAME=
+#MEMCACHIER_PASSWORD=
+#REDISTOGO_URL=
+#DATABASE_URL=
+#NOTARY_DB_PASSWORD=
diff --git a/pcr/perspectives-server/perspectives-server.cron b/pcr/perspectives-server/perspectives-server.cron
new file mode 100644
index 000000000..73a18ec44
--- /dev/null
+++ b/pcr/perspectives-server/perspectives-server.cron
@@ -0,0 +1,7 @@
+#!/bin/bash
+set -e
+
+pushd /usr/share/webapps/perspectives-server &>/dev/null
+
+/usr/bin/python2 notary_util/list_services.py |
+/usr/bin/python2 notary_util/threaded_scanner.py
diff --git a/pcr/perspectives-server/perspectives-server.install b/pcr/perspectives-server/perspectives-server.install
new file mode 100644
index 000000000..d07664cb7
--- /dev/null
+++ b/pcr/perspectives-server/perspectives-server.install
@@ -0,0 +1,27 @@
+_chown() {
+ chown -R perspectives:perspectives \
+ /usr/share/webapps/perspectives-server \
+ /etc/webapps/perspectives-server \
+ /etc/conf.d/perspectives-server.conf
+}
+
+post_install() {
+ groupadd --system perspectives
+
+ useradd --system \
+ --comment "Perspectives Notary Server" \
+ --gid perspectives \
+ --home /usr/share/webapps/perspectives-server -M \
+ --shell /bin/false \
+ perspectives &>/dev/null
+ _chown
+}
+
+post_upgrade() {
+ _chown
+}
+
+post_remove() {
+ userdel perspectives
+ groupdel perspectives
+}
diff --git a/pcr/perspectives-server/perspectives-server.service b/pcr/perspectives-server/perspectives-server.service
new file mode 100644
index 000000000..db5ca8808
--- /dev/null
+++ b/pcr/perspectives-server/perspectives-server.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Perspectives notary server
+After=network.target
+
+[Service]
+User=perspectives
+Type=forking
+EnvironmentFile=/etc/conf.d/perspectives-server.conf
+WorkingDirectory=/usr/share/webapps/perspectives-server
+ExecStart=/bin/sh -c "/usr/bin/python2 notary_http.py $FLAGS &"
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/pcr/python-lirc/PKGBUILD b/pcr/python-lirc/PKGBUILD
new file mode 100644
index 000000000..06e6988ef
--- /dev/null
+++ b/pcr/python-lirc/PKGBUILD
@@ -0,0 +1,28 @@
+# $Id$
+# Contributor: Eelco Cramer <eelco@servicelab.org>
+# Maintainer : Parabola Aurélien Desbrières <aurelien@xload.io>
+
+pkgname=python-lirc
+pkgver=1.2.1
+pkgrel=1
+pkgdesc="LIRC extension written in Cython for Python 3"
+arch=('any')
+url="https://github.com/piface/pifacecad"
+license=('GPL3')
+depends=('python'
+ 'lirc'
+ 'cython')
+makedepends=('python-distribute')
+source=(https://github.com/tompreston/python-lirc/archive/v${pkgver}.tar.gz)
+
+build() {
+ cd $srcdir/$pkgname-${pkgver}
+ make py3
+ python setup.py build
+}
+
+package() {
+ cd $srcdir/$pkgname-${pkgver}
+ python setup.py install --prefix=/usr --root=$pkgdir install
+}
+
diff --git a/pcr/python2-sql/PKGBUILD b/pcr/python2-sql/PKGBUILD
new file mode 100644
index 000000000..4ad9ed510
--- /dev/null
+++ b/pcr/python2-sql/PKGBUILD
@@ -0,0 +1,20 @@
+pkgname=python2-sql
+pkgver=r84.7f7e8fb84cdc
+pkgrel=1
+pkgdesc="Python 2 SQL library"
+arch=('any')
+url="https://code.google.com/p/python-sql/"
+license=('GPL3')
+depends=('python2')
+optdepends=()
+makedepends=('python2-setuptools' 'mercurial')
+md5sums=('SKIP')
+source=('hg+https://code.google.com/p/python-sql/')
+pkgver() {
+ cd $srcdir/python-sql
+ printf "r%s.%s" "$(hg identify -n)" "$(hg identify -i)"
+}
+package() {
+ cd $srcdir/python-sql
+ python2 setup.py install --root="$pkgdir/" --optimize=1
+}
diff --git a/pcr/roundcube-carddav/PKGBUILD b/pcr/roundcube-carddav/PKGBUILD
new file mode 100644
index 000000000..840834106
--- /dev/null
+++ b/pcr/roundcube-carddav/PKGBUILD
@@ -0,0 +1,24 @@
+# $Id$
+# Contributor: tang francescoallara.it
+# Maintainer : Parabola Aurélien Desbrières <aurelien@hackers.guru>
+
+pkgname=roundcube-carddav
+pkgver=git
+pkgrel=1
+pkgdesc="This plugin allows users to export their contacts via CardDAV"
+arch=('any')
+url="http://www.graviox.de/"
+license=('GPL')
+depends=('roundcubemail>=0.9.0')
+makedepends=('git')
+source=(https://github.com/graviox/Roundcube-CardDAV.git)
+
+package() {
+ _instdir=${pkgdir}/usr/share/webapps/roundcubemail/plugins/carddav
+ git clone ${source} ${_instdir}
+ install -dm755 ${_instdir}
+
+ # fix all the 644 perms on files
+ find ${_instdir} -type f -exec chmod 644 {} \;
+}
+md5sums=('a7c2e71f5d7a0d36c6682be6ff3413bd')
diff --git a/pcr/roundcube-rcguard-plugin-git/PKGBUILD b/pcr/roundcube-rcguard-plugin-git/PKGBUILD
new file mode 100644
index 000000000..d19298af7
--- /dev/null
+++ b/pcr/roundcube-rcguard-plugin-git/PKGBUILD
@@ -0,0 +1,32 @@
+# Contributor: achterin
+# Maintainer : Parabola Aurélien Desbrières <aurelien@hackers.guru>
+
+pkgname=roundcube-rcguard-plugin-git
+_gitname=rcguard
+pkgver=47.baadec2
+pkgrel=1
+pkgdesc="Roundcube plugin that enforces reCAPTCHA for users that have too many failed logins"
+arch=('any')
+url="https://github.com/dennylin93/rcguard"
+license=('BSD')
+depends=('roundcubemail>=0.9.0')
+makedepends=('git')
+optdepends=('mysql'
+ 'sqlite'
+ 'postgresql')
+source=(git+https://github.com/dennylin93/rcguard.git)
+
+pkgver() {
+ cd $_gitname
+ echo $(git rev-list --count HEAD).$(git rev-parse --short HEAD)
+}
+
+package() {
+ _instdir=${pkgdir}/usr/share/webapps/roundcubemail/plugins
+ install -dm755 ${_instdir}
+ rm -r ${srcdir}/rcguard/.git
+ cp -r ${srcdir}/rcguard ${_instdir}
+
+ # fix all the 644 perms on files
+ find ${_instdir} -type f -exec chmod 644 {} \;
+}
diff --git a/pcr/trytond-account-invoice/PKGBUILD b/pcr/trytond-account-invoice/PKGBUILD
index c1f3a4636..d19d696bb 100644
--- a/pcr/trytond-account-invoice/PKGBUILD
+++ b/pcr/trytond-account-invoice/PKGBUILD
@@ -2,9 +2,9 @@
# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
pkgname=trytond-account-invoice
_pkgname=trytond_account_invoice
-pkgver=3.0.0
+pkgver=3.0.1
_pkgdir=3.0
-pkgrel=2
+pkgrel=1
pkgdesc="The account_invoice module of the Tryton application platform"
arch=('any')
url='http://www.tryton.org/'
@@ -13,7 +13,7 @@ groups=('trytond-modules')
depends=('trytond>=3.0' 'trytond-account>=3.0' 'trytond-account-product>=3.0' 'trytond-company>=3.0' 'trytond-currency>=3.0' 'trytond-party>=3.0' 'trytond-product>=3.0')
makedepends=('python2-distribute')
source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz")
-md5sums=("d225505a8ba66bfd95f22a454951dd15")
+md5sums=("161e3c2e2d9a0601c22b785dad0a6983")
build() {
cd $srcdir/$_pkgname-$pkgver
diff --git a/pcr/trytond-account-product/PKGBUILD b/pcr/trytond-account-product/PKGBUILD
index 5a780d1dd..07ba82b70 100644
--- a/pcr/trytond-account-product/PKGBUILD
+++ b/pcr/trytond-account-product/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=trytond-account-product
_pkgname=trytond_account_product
pkgver=3.0.0
_pkgdir=3.0
-pkgrel=2
+pkgrel=3
pkgdesc="The account_product module of the Tryton application platform"
arch=('any')
url='http://www.tryton.org/'
diff --git a/pcr/trytond-account/PKGBUILD b/pcr/trytond-account/PKGBUILD
index 319f7c872..65389ad40 100644
--- a/pcr/trytond-account/PKGBUILD
+++ b/pcr/trytond-account/PKGBUILD
@@ -2,7 +2,7 @@
# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
pkgname=trytond-account
_pkgname=trytond_account
-pkgver=3.0.0
+pkgver=3.0.1
_pkgdir=3.0
pkgrel=2
pkgdesc="The account module of the Tryton application platform"
@@ -10,11 +10,10 @@ arch=('any')
url='http://www.tryton.org/'
license=('GPL3')
groups=('trytond-modules')
-depends=('trytond>=3.0' 'trytond-company>=3.0' 'trytond-currency>=3.0'
- 'trytond-party>=3.0')
+depends=('trytond>=3.0' 'trytond-company>=3.0' 'trytond-currency>=3.0' 'trytond-party>=3.0')
makedepends=('python2-distribute')
source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz")
-md5sums=("33e28b72249e97891e00fccb5a588ea8")
+md5sums=("810d4f5babe89dd401a9e5439e678812")
build() {
cd $srcdir/$_pkgname-$pkgver
diff --git a/pcr/trytond-calendar/PKGBUILD b/pcr/trytond-calendar/PKGBUILD
index 67db70dfa..034b3aac8 100644
--- a/pcr/trytond-calendar/PKGBUILD
+++ b/pcr/trytond-calendar/PKGBUILD
@@ -2,7 +2,7 @@
# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
pkgname=trytond-calendar
_pkgname=trytond_calendar
-pkgver=3.0.0
+pkgver=3.0.2
_pkgdir=3.0
pkgrel=1
pkgdesc="The calendar module of the Tryton application platform"
@@ -13,7 +13,12 @@ groups=('trytond-modules')
depends=('trytond>=3.0')
makedepends=('python2-distribute')
source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz")
-md5sums=("fad4dee756bbf97ce9aef47bed185704")
+md5sums=("c3bcd829ac048be07f304177aed0ee4c")
+
+build() {
+ cd $srcdir/$_pkgname-$pkgver
+ python2 setup.py build
+}
package() {
cd $srcdir/$_pkgname-$pkgver
diff --git a/pcr/trytond-company/PKGBUILD b/pcr/trytond-company/PKGBUILD
index 8c9b4dd47..a0faaaaf1 100644
--- a/pcr/trytond-company/PKGBUILD
+++ b/pcr/trytond-company/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=trytond-company
_pkgname=trytond_company
pkgver=3.0.0
_pkgdir=3.0
-pkgrel=1
+pkgrel=3
pkgdesc="The company module of the Tryton application platform"
arch=('any')
url='http://www.tryton.org/'
@@ -15,6 +15,11 @@ makedepends=('python2-distribute')
source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz")
md5sums=("87623bc65e2c629c0c5541877bfec8cb")
+build() {
+ cd $srcdir/$_pkgname-$pkgver
+ python2 setup.py build
+}
+
package() {
cd $srcdir/$_pkgname-$pkgver
python2 setup.py install --root=$pkgdir
diff --git a/pcr/trytond-country/PKGBUILD b/pcr/trytond-country/PKGBUILD
index 7a0108996..521738879 100644
--- a/pcr/trytond-country/PKGBUILD
+++ b/pcr/trytond-country/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=trytond-country
_pkgname=trytond_country
pkgver=3.0.0
_pkgdir=3.0
-pkgrel=1
+pkgrel=3
pkgdesc="The country module of the Tryton application platform"
arch=('any')
url='http://www.tryton.org/'
@@ -15,6 +15,11 @@ makedepends=('python2-distribute')
source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz")
md5sums=("c365bd0ac6e04a88427cb5366c1ce493")
+build() {
+ cd $srcdir/$_pkgname-$pkgver
+ python2 setup.py build
+}
+
package() {
cd $srcdir/$_pkgname-$pkgver
python2 setup.py install --root=$pkgdir
diff --git a/pcr/trytond-currency/PKGBUILD b/pcr/trytond-currency/PKGBUILD
index 21386024b..caa38fc4a 100644
--- a/pcr/trytond-currency/PKGBUILD
+++ b/pcr/trytond-currency/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=trytond-currency
_pkgname=trytond_currency
pkgver=3.0.0
_pkgdir=3.0
-pkgrel=1
+pkgrel=3
pkgdesc="The currency module of the Tryton application platform"
arch=('any')
url='http://www.tryton.org/'
@@ -15,6 +15,11 @@ makedepends=('python2-distribute')
source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz")
md5sums=("5507619d11d186fc041d1de7c0eea012")
+build() {
+ cd $srcdir/$_pkgname-$pkgver
+ python2 setup.py build
+}
+
package() {
cd $srcdir/$_pkgname-$pkgver
python2 setup.py install --root=$pkgdir
diff --git a/pcr/trytond-party/PKGBUILD b/pcr/trytond-party/PKGBUILD
index 61de6605b..91ffd4e54 100644
--- a/pcr/trytond-party/PKGBUILD
+++ b/pcr/trytond-party/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=trytond-party
_pkgname=trytond_party
pkgver=3.0.0
_pkgdir=3.0
-pkgrel=1
+pkgrel=3
pkgdesc="The party module of the Tryton application platform"
arch=('any')
url='http://www.tryton.org/'
@@ -15,6 +15,11 @@ makedepends=('python2-distribute')
source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz")
md5sums=("43c6d17fbe723beec0339da27f3e188e")
+build() {
+ cd $srcdir/$_pkgname-$pkgver
+ python2 setup.py build
+}
+
package() {
cd $srcdir/$_pkgname-$pkgver
python2 setup.py install --root=$pkgdir
diff --git a/pcr/trytond-product/PKGBUILD b/pcr/trytond-product/PKGBUILD
index 4dc09354d..03c58c676 100644
--- a/pcr/trytond-product/PKGBUILD
+++ b/pcr/trytond-product/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=trytond-product
_pkgname=trytond_product
pkgver=3.0.0
_pkgdir=3.0
-pkgrel=1
+pkgrel=3
pkgdesc="The product module of the Tryton application platform"
arch=('any')
url='http://www.tryton.org/'
@@ -15,6 +15,11 @@ makedepends=('python2-distribute')
source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz")
md5sums=("756dabade95f67f49a253af1bd5513a6")
+build() {
+ cd $srcdir/$_pkgname-$pkgver
+ python2 setup.py build
+}
+
package() {
cd $srcdir/$_pkgname-$pkgver
python2 setup.py install --root=$pkgdir
diff --git a/pcr/trytond-stock-lot/PKGBUILD b/pcr/trytond-stock-lot/PKGBUILD
index ae39373f7..0bad5fa9c 100644
--- a/pcr/trytond-stock-lot/PKGBUILD
+++ b/pcr/trytond-stock-lot/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=trytond-stock-lot
_pkgname=trytond_stock_lot
pkgver=3.0.0
_pkgdir=3.0
-pkgrel=1
+pkgrel=3
pkgdesc="The stock_lot module of the Tryton application platform"
arch=('any')
url='http://www.tryton.org/'
@@ -15,6 +15,11 @@ makedepends=('python2-distribute')
source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz")
md5sums=("b8424f738dc5e98d0a1de8643315e605")
+build() {
+ cd $srcdir/$_pkgname-$pkgver
+ python2 setup.py build
+}
+
package() {
cd $srcdir/$_pkgname-$pkgver
python2 setup.py install --root=$pkgdir
diff --git a/pcr/trytond-stock/PKGBUILD b/pcr/trytond-stock/PKGBUILD
index 31f1fc9e9..44883e1ce 100644
--- a/pcr/trytond-stock/PKGBUILD
+++ b/pcr/trytond-stock/PKGBUILD
@@ -2,7 +2,7 @@
# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
pkgname=trytond-stock
_pkgname=trytond_stock
-pkgver=3.0.0
+pkgver=3.0.1
_pkgdir=3.0
pkgrel=1
pkgdesc="The stock module of the Tryton application platform"
@@ -13,7 +13,12 @@ groups=('trytond-modules')
depends=('trytond>=3.0' 'trytond-company>=3.0' 'trytond-currency>=3.0' 'trytond-party>=3.0' 'trytond-product>=3.0')
makedepends=('python2-distribute')
source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz")
-md5sums=("ec0d35080f68f7fa3218d8a30729ed22")
+md5sums=("db1ae125ce3101bf43d11cc39d44bf00")
+
+build() {
+ cd $srcdir/$_pkgname-$pkgver
+ python2 setup.py build
+}
package() {
cd $srcdir/$_pkgname-$pkgver
diff --git a/pcr/trytond/PKGBUILD b/pcr/trytond/PKGBUILD
index eaa9d6f7b..35ee42068 100644
--- a/pcr/trytond/PKGBUILD
+++ b/pcr/trytond/PKGBUILD
@@ -4,12 +4,13 @@
pkgname=trytond
pkgver=3.0.0
_pkgdir=3.0
-pkgrel=2
+pkgrel=3
pkgdesc="A three-tiers high-level general purpose application platform (server application)"
arch=('any')
url="http://www.tryton.org/"
license=('GPL3')
-depends=('python2>=2.7' 'python2-lxml' 'python2-relatorio>=0.6.0' 'python2-genshi>=0.7' 'python2-polib')
+depends=('python2>=2.7' 'python2-lxml' 'python2-relatorio>=0.6.0'
+ 'python2-genshi>=0.7' 'python2-polib' 'python2-sql')
optdepends=('python2-psycopg2: support for PostgreSQL database'
'python-pywebdav: support for WebDAV feature'
'pydot: support for displaying workflow graphs'
@@ -22,6 +23,11 @@ source=("http://downloads.tryton.org/$_pkgdir/$pkgname-$pkgver.tar.gz"
md5sums=('812daa29409881adc4001c1c810bc8e8'
'b1535a8528dfd8f655624bf6faea6985')
+build() {
+ cd $srcdir/$pkgname-$pkgver
+ python2 setup.py build
+}
+
package() {
cd $srcdir/$pkgname-$pkgver
python2 setup.py install --root=$pkgdir
diff --git a/pcr/ums/PKGBUILD b/pcr/ums/PKGBUILD
new file mode 100644
index 000000000..329120adb
--- /dev/null
+++ b/pcr/ums/PKGBUILD
@@ -0,0 +1,63 @@
+# Contributor: Red Squirrel <iam at redsquirrel87 dot com>
+# Maintainer : Parabola Aurélien DESBRIÈRES <aurelien@xload.io>
+# Based on PMS PKGBUILD
+
+pkgname=ums
+pkgver=3.4.0
+pkgrel=1
+pkgdesc="Universal Media Server: a DLNA-compliant UPnP Media Server."
+arch=('i686' 'x86_64')
+url="http://www.universalmediaserver.com/"
+license=('GPL2')
+depends=('mplayer' 'ffmpeg' 'mencoder' 'libmediainfo' 'java-runtime')
+makedepends=("unzip")
+[ "$CARCH" = "i686" ] && \
+optdepends=("vlc: For Internet video/audio")
+[ "$CARCH" = "x86_64" ] && \
+optdepends=("vlc: Internet video/audio support"
+ "lib32-gcc-libs: tsMuxeR support"
+ "lib32-glibc: tsMuxeR support")
+backup=(opt/ums/UMS.conf \
+ opt/ums/WEB.conf)
+source=("http://downloads.sourceforge.net/project/unimediaserver/Official%20Releases/Linux/UMS-$pkgver.tgz")
+
+package() {
+ mkdir -p $pkgdir/opt/ums
+ mkdir $pkgdir/opt/ums/database
+ mkdir -p $pkgdir/usr/bin
+ chmod -R 755 $srcdir/$pkgname-$pkgver/plugins $srcdir/$pkgname-$pkgver/documentation
+ cp -r $srcdir/$pkgname-$pkgver/* $pkgdir/opt/ums/
+ chmod +x $pkgdir/opt/ums/UMS.sh \
+ $pkgdir/opt/ums/linux/tsMuxeR
+ touch $pkgdir/opt/ums/UMS.conf
+ touch $pkgdir/opt/ums/debug.log
+ chgrp users $pkgdir/opt/ums/UMS.conf \
+ $pkgdir/opt/ums/WEB.conf \
+ $pkgdir/opt/ums/debug.log \
+ $pkgdir/opt/ums/database
+
+ chmod g+w $pkgdir/opt/ums/UMS.conf \
+ $pkgdir/opt/ums/WEB.conf \
+ $pkgdir/opt/ums/debug.log \
+ $pkgdir/opt/ums/database
+
+ unzip -q -u $srcdir/$pkgname-$pkgver/ums.jar -d ums_jar
+ install -d -m 755 $pkgdir/usr/share/pixmaps
+ install -D -m 644 $srcdir/ums_jar/resources/images/logo.png $pkgdir/usr/share/pixmaps/ums.png
+
+ cat > ums.desktop << EoF
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Name=Universal Media Server
+Comment=A DLNA-compliant UPnP Media Server.
+Exec=/opt/ums/UMS.sh
+Icon=ums.png
+Terminal=false
+Type=Application
+Categories=Java;Multimedia;AudioVideo;
+EoF
+
+ install -D -m 644 $srcdir/ums.desktop $pkgdir/usr/share/applications/ums.desktop
+
+}
diff --git a/pcr/youtube-dl-current/PKGBUILD b/pcr/youtube-dl-current/PKGBUILD
index 7e25e0295..354ef7569 100644
--- a/pcr/youtube-dl-current/PKGBUILD
+++ b/pcr/youtube-dl-current/PKGBUILD
@@ -5,7 +5,7 @@
pkgname=youtube-dl-current
_pkgname=youtube-dl
provides=(youtube-dl)
-pkgver=2014.01.30.2
+pkgver=2014.02.13
pkgrel=1
pkgdesc="A small command-line program to download videos from YouTube.com and a few more sites"
arch=('any')
@@ -28,5 +28,5 @@ package() {
"${pkgdir}/usr/share/bash-completion/completions/youtube-dl"
install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
}
-md5sums=('4a6dded4aff1a43b2492de38f8ea1ed3'
+md5sums=('323101220bdd348a4251e622746609ce'
'SKIP')
diff --git a/~emulatorman/nodejs-grunt-cli/PKGBUILD b/~emulatorman/nodejs-grunt-cli/PKGBUILD
new file mode 100644
index 000000000..e18327bfc
--- /dev/null
+++ b/~emulatorman/nodejs-grunt-cli/PKGBUILD
@@ -0,0 +1,25 @@
+# Maintainer: Mario Finelli <mtfinelli at gmail dot com>
+# Contributor: Andy Weidenbaum <archbaum at gmail dot com>
+# Contributor: Peter Wu <lekensteyn at gmail dot com>
+
+_npmname=grunt-cli
+pkgname=nodejs-$_npmname
+pkgver=0.1.13
+pkgrel=2
+pkgdesc="The grunt command line interface"
+arch=('any')
+url="http://gruntjs.com/"
+license=('MIT')
+depends=('nodejs')
+install=nodejs-grunt-cli.install
+source=(https://registry.npmjs.org/$_npmname/-/$_npmname-$pkgver.tgz)
+noextract=($_npmname-$pkgver.tgz)
+md5sums=('fe47325c8b6f48d752c33c9ea57d9217')
+
+package() {
+ cd "$srcdir"
+ local _npmdir="$pkgdir/usr/lib/node_modules/"
+ mkdir -p "$_npmdir"
+ cd "$_npmdir"
+ npm install --user root -g --prefix "$pkgdir/usr" $_npmname@$pkgver
+} \ No newline at end of file
diff --git a/~emulatorman/nodejs-grunt-cli/nodejs-grunt-cli.install b/~emulatorman/nodejs-grunt-cli/nodejs-grunt-cli.install
new file mode 100644
index 000000000..0dbae687b
--- /dev/null
+++ b/~emulatorman/nodejs-grunt-cli/nodejs-grunt-cli.install
@@ -0,0 +1,63 @@
+post_install() {
+ printf "$grunt\n"
+ echo "************************************************************************"
+ echo "*"
+ echo "* Starting with grunt v0.4, you should never install grunt itself"
+ echo "* globally. For more information about why, please read this:"
+ echo "* http://blog.nodejs.org/2011/03/23/npm-1-0-global-vs-local-installation"
+ echo "*"
+ echo "************************************************************************"
+}
+
+post_upgrade() {
+ printf "$grunt\n"
+}
+
+read -d '' grunt <<"EOF"
+########################################################################
+########################################################################
+## ##
+## ##
+## cc ##
+## .,;;,. :, :OKc .. .',;;'. ##
+## ;x0OdoooxOx: .OKkoKKKOlO0. .lOkdooox00o. ##
+## .';d00xxdcck0c.dKKKKKKKKKKk .d0d:lxxk0Ol,.. ##
+## :Kl:o0xlOK0OkxdooooddxkOKKkoOOc:k0. ##
+## .lKkclO0kdc,,,,,,,,,,,,,,;lxOKxcl00,. ##
+## .xOddddxO0koc;,,,,,,,,,,,,,,,:ld00kxdddxOc ##
+## cKc,,,,,,;cokxc,,,,,,,,,,,,,okxl:,,,,,,,d0. ##
+## .xOl,,,,,,,,,:ol;,,,,,,,,,:ol;,,,,,,,,:d0: ##
+## OO,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,oKl ##
+## OO;;dOkxdl:;,,,,;loooc,,,,,;:oxkkkc,oKl ##
+## .lKd,,kOK,;x0xc,,,,,,;,,,,,;ok0l'oKOo,:OO; ##
+## ;0kd:,,;oK; .o0xl::,,,,;:coOO: d0c;,,ldOO. ##
+## oKo:;,,,,lxdlclx00xl,,,,;dkKOdcclxx:,,,,;:kK, ##
+## o0xo:;;,,;;:cc:xl,,,,,,,,,kl:cc:;,,;;;cdOO; ##
+## ,lkko:;,,,,;;:,,,,,,,,,,;:;,,,,,:cxOxc. ##
+## ,0x:;,,,,,,,,,,,,,,,,,,,,,,,;cOx. ##
+## xO::,,,,,,,,,,,,,,,,,,,,,,;:lK, ##
+## . xO::,,,,;l,,,,,,,,,,;o,,,,;:lK, . ##
+## :0; kO:;,,,;k:,,,,,,,,,,,do,,,,:lK: xO. ##
+## ,KoOc.0k:,,,;xd,,,,,,,,,,,,;Ol;,,;c0l.xxdk ##
+## l0..o0Kkl:;:dO;,,,,,,,,,,,,,o0l:;:o00O: :K. ##
+## :K; .;lod0KdcccccccccccccccO0Odoc,. .o0 ##
+## kk'. dOdoooooooooooooooodxO; ..:0: ##
+## lOo:'..lK:;dxxxxl,,,,;dxxxxl,dK'..,cxk; ##
+## ,l0OkOKx,o0KKO:,,,,,o0KKO:;O0kk0kc. ##
+## .kOll0d;:cc;,,,,,,,:lc;:kkcd0o ##
+## ;xkOKkl:;;;,,,,;;;;:d00kOo. ##
+## ':ckOxolcccclldk0oc;. ##
+## .':clooolc;. ##
+## ##
+## .;lddddl;. ldddool:. ldd, cdd, lol. .dd; ,dddddddddo ##
+## .dKKOoccok0; kKKx:ckKKl kKK: xKKc kKK0l ,KKo 'ccl0KKdccc ##
+## xKKx kKKl cKKx kKK: xKKc kKK0KO, ,KKo 0KK; ##
+## 0KK: .xxxxo kKK0kOK0l. kKK: xKKc kKK,o0KxlKKo 0KK; ##
+## lKKO. ,cKKk kKKo,OKKo dKKx .OKK; kKK. .kKKKKo 0KK; ##
+## ;xKKkddkKKx kKKl dKKk. l0K0kk0KO: kKK. ;OKKo 0KK; ##
+## 'oO00Od, dOO: oOOx .lO00kc dOk. .xOc kOO, ##
+## ##
+## ##
+########################################################################
+########################################################################
+EOF
diff --git a/~emulatorman/nodejs-grunt/PKGBUILD b/~emulatorman/nodejs-grunt/PKGBUILD
new file mode 100644
index 000000000..fea5c6ae2
--- /dev/null
+++ b/~emulatorman/nodejs-grunt/PKGBUILD
@@ -0,0 +1,30 @@
+# Author: "Cowboy" Ben Alman (http://benalman.com/)
+# Contributor: "Cowboy" Ben Alman (http://benalman.com/)
+# Contributor: Kyle Robinson Young (http://dontkry.com/)
+# Contributor: Tyler Kellen (http://goingslowly.com)
+# Contributor: Sindre Sorhus (http://sindresorhus.com)
+# Contributor: cowboy <cowboy@rj3.net>
+# Contributor: tkellen <tyler@sleekcode.net>
+# Maintainer: cracoucass14 (http://twitter.com/cracoucass14)
+
+_npmname=grunt
+pkgname=nodejs-grunt # All lowercase
+pkgver=0.4.2
+pkgrel=1
+pkgdesc="The JavaScript Task Runner"
+arch=(any)
+url="http://gruntjs.com/"
+license=(MIT)
+depends=('nodejs')
+optdepends=()
+source=(http://registry.npmjs.org/$_npmname/-/$_npmname-$pkgver.tgz)
+noextract=($_npmname-$pkgver.tgz)
+sha1sums=(895b4f28a6102bffd41d365a65e8be2d6a293d93)
+
+package() {
+ cd $srcdir
+ local _npmdir="$pkgdir/usr/lib/node_modules/"
+ mkdir -p $_npmdir
+ cd $_npmdir
+ npm install -g --prefix "$pkgdir/usr" $_npmname@$pkgver
+}