summaryrefslogtreecommitdiff
path: root/libre
diff options
context:
space:
mode:
authorMárcio Alexandre Silva Delgado <coadde@lavabit.com>2013-02-14 12:13:51 -0200
committerMárcio Alexandre Silva Delgado <coadde@lavabit.com>2013-02-14 12:13:51 -0200
commitf67b20d8da80cc120dcfea0d3405de74a8e5f84a (patch)
tree2d57e7cdc4772adc20017980fda13f1267cfc127 /libre
parent327433a2a7ae50151dcf0e6f6840a3eb5c065808 (diff)
parent9e33e61c00e3da5565b47e16b6618ab98c9ea38f (diff)
downloadabslibre-f67b20d8da80cc120dcfea0d3405de74a8e5f84a.tar.gz
abslibre-f67b20d8da80cc120dcfea0d3405de74a8e5f84a.tar.bz2
abslibre-f67b20d8da80cc120dcfea0d3405de74a8e5f84a.zip
Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre
Diffstat (limited to 'libre')
-rw-r--r--libre/abiword-libre/PKGBUILD29
-rw-r--r--libre/abiword-libre/abiword-2.8.6-glib-2.31.patch40
-rw-r--r--libre/cdfs-libre/PKGBUILD13
-rw-r--r--libre/grub-legacy/PKGBUILD4
-rw-r--r--libre/grub/05_archtheme6
-rw-r--r--libre/grub/PKGBUILD10
-rw-r--r--libre/grub/fix_stack_pointer_handling_16_relocator.patch13
-rw-r--r--libre/grub/grub-install.fix11
-rw-r--r--libre/grub/grub-mkconfig-Use_outside_GRUB_PREFIX_if_defined.patch15
-rw-r--r--libre/grub/grub.default2
-rw-r--r--libre/grub/grub2.install33
-rw-r--r--libre/grub/grub2_automake_1.11.2_pkglib_to_pkgdata.patch134
-rw-r--r--libre/grub/grub2_bzr_export.sh113
-rw-r--r--libre/grub/grub_extras_lua_args_fix.patch13
-rw-r--r--libre/grub/parabola-mkconfig.patch32
-rw-r--r--libre/grub/parabola_grub_mkconfig_fixes.patch32
-rw-r--r--libre/hydrogen-libre/PKGBUILD48
-rw-r--r--libre/hydrogen-libre/install.patch12
-rw-r--r--libre/hydrogen-libre/lrdf_raptor2.patch11
-rw-r--r--libre/iceweasel-l10n/PKGBUILD178
-rw-r--r--libre/iceweasel-libre/PKGBUILD8
-rw-r--r--libre/kdebase-konqueror-libre/PKGBUILD7
-rw-r--r--libre/kdebase-runtime-libre/PKGBUILD28
-rw-r--r--libre/kdelibs-libre/PKGBUILD14
-rw-r--r--libre/kdenetwork-kopete-libre/PKGBUILD11
-rw-r--r--libre/kdepim-libre/PKGBUILD40
-rw-r--r--libre/kdepim-libre/boost152.patch13
-rw-r--r--libre/kdepim-libre/kdepim-akregator.install12
-rw-r--r--libre/kdeutils-ark-libre/PKGBUILD9
-rw-r--r--libre/linux-libre-kmod-alx/PKGBUILD10
-rw-r--r--libre/linux-libre-lts-kmod-alx/PKGBUILD13
-rw-r--r--libre/linux-libre-lts/PKGBUILD8
-rw-r--r--libre/linux-libre-lts/linux-libre-lts.install2
-rw-r--r--libre/linux-libre-tools/PKGBUILD39
-rw-r--r--libre/linux-libre/PKGBUILD8
-rw-r--r--libre/linux-libre/linux-libre.install2
-rw-r--r--libre/lirc-libre/PKGBUILD2
-rw-r--r--libre/parabola-keyring/PKGBUILD2
-rw-r--r--libre/tp_smapi-libre/PKGBUILD2
-rw-r--r--libre/vhba-module-libre/PKGBUILD2
-rw-r--r--libre/virtualbox-libre-modules/PKGBUILD4
-rw-r--r--libre/your-freedom/your-freedom.install6
42 files changed, 405 insertions, 586 deletions
diff --git a/libre/abiword-libre/PKGBUILD b/libre/abiword-libre/PKGBUILD
index 4286d258a..9d1800989 100644
--- a/libre/abiword-libre/PKGBUILD
+++ b/libre/abiword-libre/PKGBUILD
@@ -1,28 +1,30 @@
-# $Id: PKGBUILD 146945 2012-01-19 14:58:28Z giovanni $
+# $Id: PKGBUILD 173824 2012-12-24 15:08:34Z jgc $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Maël Lavault <moimael@neuf.fr>
-# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
_pkgbase=abiword
pkgbase=abiword-libre
pkgname=('abiword-libre' 'abiword-libre-plugins')
pkgver=2.8.6
-pkgrel=7.1
+pkgrel=8
arch=('i686' 'x86_64' 'mips64el')
license=('GPL')
url="http://www.abisource.com"
-makedepends=('pkgconfig' 'asio' 'boost' 'fribidi' 'goffice' 'libwmf' 'wv' 'link-grammar' 'gtkmathview'
- 'aiksaurus' 'libxslt' 'enchant' 'libots' 'libwpg' 'librsvg' 'loudmouth' 'libsoup' 'ttf-liberation')
+makedepends=('pkgconfig' 'asio' 'boost' 'fribidi' 'goffice0.8' 'libwmf' 'wv' 'link-grammar' 'gtkmathview'
+ 'aiksaurus' 'libxslt' 'enchant' 'libots' 'libwpg' 'librsvg' 'loudmouth' 'libsoup' 'psiconv' 'ttf-liberation')
options=('!makeflags' '!libtool')
-source=("http://www.abisource.com/downloads/${_pkgbase}/${pkgver}/source/${_pkgbase}-${pkgver}.tar.gz"
- 'compat_libwpg_0_9.patch'
- 'abiword-2.8.6-no-undefined.patch'
- 'abiword-2.8.6-libpng15.patch'
- 'liberation-fonts.patch')
+source=(http://www.abisource.com/downloads/${_pkgbase}/${pkgver}/source/${_pkgbase}-${pkgver}.tar.gz
+ compat_libwpg_0_9.patch
+ abiword-2.8.6-no-undefined.patch
+ abiword-2.8.6-libpng15.patch
+ abiword-2.8.6-glib-2.31.patch
+ liberation-fonts.patch)
md5sums=('f883b0a7f26229a9c66fd6a1a94381aa'
'09446a2ebba8288fc611e88f7cf17298'
'42e2614b6e0aad457d91f6ce20b6f225'
'40e370e7e88c5437140ef18037abfbd3'
+ '6ec338a27a6fb590c348724ddb545849'
'880b17db6f249d977d2a7cd012d9ce02')
build() {
@@ -32,6 +34,11 @@ build() {
# fix a gcc 4.6.x build issue, patch from Fedora
patch -Np1 -i "${srcdir}/abiword-2.8.6-no-undefined.patch"
patch -Np0 -i "${srcdir}/abiword-2.8.6-libpng15.patch"
+
+ # Fix build with recent glib, patch from Gentoo
+ patch -Np0 -i "${srcdir}/abiword-2.8.6-glib-2.31.patch"
+
+ # Replace non-free fonts support to liberation fonts
patch -Np1 -i "${srcdir}/liberation-fonts.patch"
libtoolize --force
@@ -54,7 +61,7 @@ build() {
package_abiword-libre() {
pkgdesc="A fully-featured word processor that doesn't recommend unfree fonts"
- depends=('fribidi' 'wv' 'goffice' 'librsvg' 'enchant' 'desktop-file-utils')
+ depends=('fribidi' 'wv' 'goffice0.8' 'librsvg' 'enchant' 'desktop-file-utils')
install=$pkgname.install
optdepends=('abiword-libre-plugins')
conflicts=("abiword-libre-plugins<${pkgver}-${pkgrel}" 'abiword')
diff --git a/libre/abiword-libre/abiword-2.8.6-glib-2.31.patch b/libre/abiword-libre/abiword-2.8.6-glib-2.31.patch
new file mode 100644
index 000000000..8b938cc25
--- /dev/null
+++ b/libre/abiword-libre/abiword-2.8.6-glib-2.31.patch
@@ -0,0 +1,40 @@
+------------------------------------------------------------------------
+r30479 | hub | 2011-11-29 00:39:09 -0500 (Tue, 29 Nov 2011) | 2 lines
+Changed paths:
+ M /abiword/trunk/src/af/util/xp/ut_go_file.h
+
+Bug 13197: only import glib.h
+Patch by Dominique Leuenberger.
+------------------------------------------------------------------------
+r30602 | hub | 2012-01-30 02:00:38 -0500 (Mon, 30 Jan 2012) | 2 lines
+Changed paths:
+ M /abiword/trunk/goffice-bits/goffice/app/goffice-app.h
+
+Bug 13247 - Fix glib headers. Patch by Funda Wang
+(safe to backport)
+------------------------------------------------------------------------
+Index: src/af/util/xp/ut_go_file.h
+===================================================================
+--- src/af/util/xp/ut_go_file.h (revision 30478)
++++ src/af/util/xp/ut_go_file.h (revision 30479)
+@@ -31,7 +31,6 @@
+
+ #include <glib.h>
+ #include <gsf/gsf.h>
+-#include <glib/gerror.h>
+ #include <time.h>
+
+ G_BEGIN_DECLS
+Index: goffice-bits/goffice/app/goffice-app.h
+===================================================================
+--- goffice-bits/goffice/app/goffice-app.h (revision 30601)
++++ goffice-bits/goffice/app/goffice-app.h (revision 30602)
+@@ -22,7 +22,7 @@
+ #ifndef GOFFICE_APP_H
+ #define GOFFICE_APP_H
+
+-#include <glib/gmacros.h>
++#include <glib.h>
+
+ G_BEGIN_DECLS
+
diff --git a/libre/cdfs-libre/PKGBUILD b/libre/cdfs-libre/PKGBUILD
index 8eada2132..12e461519 100644
--- a/libre/cdfs-libre/PKGBUILD
+++ b/libre/cdfs-libre/PKGBUILD
@@ -6,7 +6,7 @@
_pkgname=cdfs
pkgname=cdfs-libre
pkgver=2.6.27
-pkgrel=35
+pkgrel=36
pkgdesc="File system module that 'exports' all tracks and boot images on a CD as normal files (built for the linux-libre kernel package)"
arch=(i686 x86_64 mips64el)
url="http://www.elis.UGent.be/~ronsse/cdfs/"
@@ -25,16 +25,21 @@ md5sums=('ac64c014a90e3c488394832ea29605b3'
'e934407b3460257a301822ffc4ab3933'
'9215e7bdac728bd2f889fb525e543454')
+_kernver=`pacman -Q linux-libre | cut -d . -f 2 | cut -f 1 -d -`
+_kernverfull=`cat /usr/lib/modules/extramodules-3.${_kernver}-LIBRE/version`
+
build() {
- _kernver=`pacman -Q linux-libre | cut -d . -f 2 | cut -f 1 -d -`
depends=("linux-libre>=3.${_kernver}" "linux-libre<3.`expr ${_kernver} + 1`")
- _kernverfull=`cat /usr/lib/modules/extramodules-3.${_kernver}-LIBRE/version`
cd $srcdir/$_pkgname-$pkgver
patch -p1 <$srcdir/cdfs-3.0.patch
patch -p1 <$srcdir/cdfs-3.2.patch
patch -p1 <$srcdir/cdfs-3.4.patch
make KDIR=/usr/lib/modules/${_kernverfull}/build
- install -Dm0644 cdfs.ko $pkgdir/usr/lib/modules/extramodules-3.${_kernver}-LIBRE/cdfs.ko
sed -i "s|extramodules-.*-LIBRE|extramodules-3.${_kernver}-LIBRE|" $startdir/cdfs.install
}
+
+package() {
+ cd $srcdir/$_pkgname-$pkgver
+ install -Dm0644 cdfs.ko $pkgdir/usr/lib/modules/extramodules-3.${_kernver}-LIBRE/cdfs.ko
+}
diff --git a/libre/grub-legacy/PKGBUILD b/libre/grub-legacy/PKGBUILD
index 20e9fdb43..6c2afd3a8 100644
--- a/libre/grub-legacy/PKGBUILD
+++ b/libre/grub-legacy/PKGBUILD
@@ -7,7 +7,7 @@
pkgname=grub-legacy
_srcname=grub
pkgver=0.97
-pkgrel=23
+pkgrel=24
pkgdesc="A GNU multiboot boot loader (Parabola rebranded)"
arch=('i686' 'x86_64')
license=('GPL')
@@ -72,7 +72,7 @@ build() {
## recreate ./configure script with the required changes in LDFLAGS and objcopy
aclocal
autoconf
- autoreconf
+ autoreconf -i
automake
if [ "$CARCH" = "x86_64" ]; then
diff --git a/libre/grub/05_archtheme b/libre/grub/05_archtheme
deleted file mode 100644
index 4d1b6fb20..000000000
--- a/libre/grub/05_archtheme
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash -e
-
-cat << EOF
-set menu_color_normal=light-blue/black
-set menu_color_highlight=light-cyan/blue
-EOF
diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD
index 8a1c01434..b94aed44c 100644
--- a/libre/grub/PKGBUILD
+++ b/libre/grub/PKGBUILD
@@ -9,7 +9,7 @@ _grub_915_ver=9
pkgname=('grub-common' 'grub-bios' 'grub-efi-i386')
pkgbase=grub
pkgver=2.00
-pkgrel=1
+pkgrel=1.2
url="https://www.gnu.org/software/grub/"
arch=('i686' 'x86_64')
license=('GPL3')
@@ -34,14 +34,18 @@ sha1sums=('274d91e96b56a5b9dd0a07accff69dbb6dfb596b'
'89290031b974780c6df76893836d2477d4add895'
'eb4b35b4c36b64f9405cbcbc538cb205171c1c0a'
'd5ae2efec25616028a9d89e98b6e454f1c4c415f'
- '31aa740fc225b3f3ed4917843038f9e8658a71be'
- '79a0e597f19e15bd4c256384e0ef998bc6d06cc8'
+ 'c631ec04d458c60a3ceffe60d2d1806d54554d9c'
+ '06b926320cb2add6c157d59d46e553b89dd3aa03'
'fb69af1ff6c0b7fdf7ce7d42d0f048edc1a50a45'
'ce35d7ae75cd1b5b677e894e528f96add40e77b9'
'0cfd4e51cdb14a92f06cfd3c607f2aa21f3e55fc')
_build_grub-common_and_bios() {
+ ## fix outdated gnulib on the source
+ sed 's|#undef gets|#undef gets\n#if 0|' -i "${srcdir}/grub-${pkgver}/grub-core/gnulib/stdio.in.h"
+ sed 's|use fgets instead");|use fgets instead");\n#endif|' -i "${srcdir}/grub-${pkgver}/grub-core/gnulib/stdio.in.h"
+
## copy the source for building the common/bios package
cp -r "${srcdir}/grub-${pkgver}" "${srcdir}/grub_bios-${pkgver}"
cd "${srcdir}/grub_bios-${pkgver}"
diff --git a/libre/grub/fix_stack_pointer_handling_16_relocator.patch b/libre/grub/fix_stack_pointer_handling_16_relocator.patch
deleted file mode 100644
index edc0ef502..000000000
--- a/libre/grub/fix_stack_pointer_handling_16_relocator.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/grub-core/lib/i386/relocator16.S b/grub-core/lib/i386/relocator16.S
-index c3768f4..982415d 100644
---- a/grub-core/lib/i386/relocator16.S
-+++ b/grub-core/lib/i386/relocator16.S
-@@ -130,7 +130,7 @@ VARIABLE(grub_relocator16_ss)
- .byte 0xb8
- VARIABLE(grub_relocator16_sp)
- .word 0
-- movw %ax, %ss
-+ movzwl %ax, %esp
-
- /* movw imm32, %edx. */
- .byte 0x66, 0xba
diff --git a/libre/grub/grub-install.fix b/libre/grub/grub-install.fix
deleted file mode 100644
index 29e74bd44..000000000
--- a/libre/grub/grub-install.fix
+++ /dev/null
@@ -1,11 +0,0 @@
-=== modified file 'grub-core/kern/emu/hostdisk.c'
---- grub-core/kern/emu/hostdisk.c 2012-04-18 21:48:52 +0000
-+++ grub-core/kern/emu/hostdisk.c 2012-04-19 18:35:06 +0000
-@@ -1081,7 +1081,7 @@
- {
- int fd;
- grub_disk_addr_t max = ~0ULL;
-- fd = open_device (disk, sector, O_RDONLY, &max);
-+ fd = open_device (disk, sector, O_WRONLY, &max);
- if (fd < 0)
- return grub_errno;
diff --git a/libre/grub/grub-mkconfig-Use_outside_GRUB_PREFIX_if_defined.patch b/libre/grub/grub-mkconfig-Use_outside_GRUB_PREFIX_if_defined.patch
deleted file mode 100644
index e1de26859..000000000
--- a/libre/grub/grub-mkconfig-Use_outside_GRUB_PREFIX_if_defined.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index 859c2e8..c4391dc 100644
---- a/util/grub-mkconfig.in
-+++ b/util/grub-mkconfig.in
-@@ -40,7 +40,9 @@ self=`basename $0`
- grub_probe="${sbindir}/`echo grub-probe | sed "${transform}"`"
- grub_script_check="${bindir}/`echo grub-script-check | sed "${transform}"`"
-
--GRUB_PREFIX=`echo '/@bootdirname@/@grubdirname@' | sed "s,//*,/,g"`
-+if test -z "${GRUB_PREFIX}"; then
-+ GRUB_PREFIX=`echo '/@bootdirname@/@grubdirname@' | sed "s,//*,/,g"`
-+fi
-
- . "${datadir}/@PACKAGE@/grub-mkconfig_lib"
-
diff --git a/libre/grub/grub.default b/libre/grub/grub.default
index 2ceb40543..8455b67dd 100644
--- a/libre/grub/grub.default
+++ b/libre/grub/grub.default
@@ -1,6 +1,6 @@
GRUB_DEFAULT=0
GRUB_TIMEOUT=5
-GRUB_DISTRIBUTOR="Parabola GNU/Linux-libre"
+GRUB_DISTRIBUTOR="Parabola"
GRUB_CMDLINE_LINUX_DEFAULT="quiet"
GRUB_CMDLINE_LINUX=""
diff --git a/libre/grub/grub2.install b/libre/grub/grub2.install
deleted file mode 100644
index 000533553..000000000
--- a/libre/grub/grub2.install
+++ /dev/null
@@ -1,33 +0,0 @@
-infodir=usr/share/info
-filelist=(grub.info grub-dev.info)
-
-post_install() {
- if [ -f /boot/grub/grub.cfg.pacsave ]; then
- echo "Copying /boot/grub/grub.cfg.pacsave to /boot/grub/grub.cfg"
- install -Dm644 /boot/grub/grub.cfg.pacsave /boot/grub/grub.cfg
- fi
-
- cat << 'EOM'
-Generating grub.cfg.example config file...
-This may fail on some machines running a custom kernel.
-EOM
-
- grub-mkconfig -o /boot/grub/grub.cfg.example 2> /dev/null
- echo "done."
-
- for file in ${filelist[@]}; do
- install-info $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
-
-post_upgrade() {
- for file in ${filelist[@]}; do
- install-info $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
-
-pre_remove() {
- for file in ${filelist[@]}; do
- install-info --delete $infodir/$file $infodir/dir 2> /dev/null
- done
-}
diff --git a/libre/grub/grub2_automake_1.11.2_pkglib_to_pkgdata.patch b/libre/grub/grub2_automake_1.11.2_pkglib_to_pkgdata.patch
deleted file mode 100644
index 0e396b210..000000000
--- a/libre/grub/grub2_automake_1.11.2_pkglib_to_pkgdata.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-diff --git a/ChangeLog_Keshav b/ChangeLog_Keshav
-new file mode 100644
-index 0000000..0eafd65
---- /dev/null
-+++ b/ChangeLog_Keshav
-@@ -0,0 +1,12 @@
-+2012-01-04 Keshav P R <the.ridikulus.rat@gmail.com>
-+
-+ Fixes for automake 1.11.2
-+
-+ * conf/Makefile.common: Change pkglib_SCRIPTS to pkgdata_SCRIPTS.
-+ * conf/Makefile.common: Change pkglib_DATA to pkgdata_DATA.
-+ * Makefile.am: Likewise.
-+ * gentpl.py: Likewise.
-+ * util/grub-mkstandalone.in: Likewise.
-+ * util/grub-mknetdir.in: Likewise.
-+ * util/grub-mkrescue.in: Likewise.
-+ * util/grub-mkstandalone.in: Likewise.
-diff --git a/Makefile.am b/Makefile.am
-index c5f486e..395b0dd 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -101,8 +101,8 @@ CLEANFILES += widthspec.h
- # Install config.h into platformdir
- platform_HEADERS = config.h
-
--pkglib_DATA += grub-mkconfig_lib
--pkglib_DATA += update-grub_lib
-+pkgdata_DATA += grub-mkconfig_lib
-+pkgdata_DATA += update-grub_lib
-
-
- if COND_i386_coreboot
-diff --git a/conf/Makefile.common b/conf/Makefile.common
-index 751188b..bbd59cc 100644
---- a/conf/Makefile.common
-+++ b/conf/Makefile.common
-@@ -137,7 +137,7 @@ KERNEL_HEADER_FILES =
-
- man_MANS =
- noinst_DATA =
--pkglib_DATA =
-+pkgdata_DATA =
- bin_SCRIPTS =
- sbin_SCRIPTS =
- bin_PROGRAMS =
-@@ -147,7 +147,7 @@ check_SCRIPTS =
- grubconf_DATA =
- check_PROGRAMS =
- noinst_SCRIPTS =
--pkglib_SCRIPTS =
-+pkgdata_SCRIPTS =
- noinst_PROGRAMS =
- grubconf_SCRIPTS =
- noinst_LIBRARIES =
-diff --git a/gentpl.py b/gentpl.py
-index 3008b80..a935f4d 100644
---- a/gentpl.py
-+++ b/gentpl.py
-@@ -512,7 +512,7 @@ def script(platform):
- r += "[+ ENDIF +]"
-
- r += rule("[+ name +]", platform_sources(platform) + " $(top_builddir)/config.status", """
--$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
-+$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
- chmod a+x [+ name +]
- """)
-
-diff --git a/util/grub-mknetdir.in b/util/grub-mknetdir.in
-index e5a2172..7f6a36d 100644
---- a/util/grub-mknetdir.in
-+++ b/util/grub-mknetdir.in
-@@ -30,7 +30,7 @@ PACKAGE_VERSION=@PACKAGE_VERSION@
- host_os=@host_os@
- localedir=@datadir@/locale
- datarootdir=@datarootdir@
--pkglib_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst"
-+pkgdata_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst"
-
- self=`basename $0`
-
-@@ -183,7 +183,7 @@ process_input_dir ()
- cp -f "$file" "$grubdir/"
- fi
- done
-- for file in ${pkglib_DATA}; do
-+ for file in ${pkgdata_DATA}; do
- if test -f "${input_dir}/${file}"; then
- cp -f "${input_dir}/${file}" "$grubdir/"
- fi
-diff --git a/util/grub-mkrescue.in b/util/grub-mkrescue.in
-index eff7708..f6b96d4 100644
---- a/util/grub-mkrescue.in
-+++ b/util/grub-mkrescue.in
-@@ -27,7 +27,7 @@ libdir=@libdir@
- PACKAGE_NAME=@PACKAGE_NAME@
- PACKAGE_TARNAME=@PACKAGE_TARNAME@
- PACKAGE_VERSION=@PACKAGE_VERSION@
--pkglib_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst"
-+pkgdata_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst"
-
- self=`basename $0`
-
-@@ -163,7 +163,7 @@ process_input_dir ()
- cp -f "$file" ${iso9660_dir}/boot/grub/${platform}/
- fi
- done
-- for file in ${pkglib_DATA}; do
-+ for file in ${pkgdata_DATA}; do
- if test -f "${input_dir}/${file}"; then
- cp -f "${input_dir}/${file}" ${iso9660_dir}/boot/grub/${platform}/
- fi
-diff --git a/util/grub-mkstandalone.in b/util/grub-mkstandalone.in
-index b0dbf9b..92b7306 100644
---- a/util/grub-mkstandalone.in
-+++ b/util/grub-mkstandalone.in
-@@ -27,7 +27,7 @@ libdir=@libdir@
- PACKAGE_NAME=@PACKAGE_NAME@
- PACKAGE_TARNAME=@PACKAGE_TARNAME@
- PACKAGE_VERSION=@PACKAGE_VERSION@
--pkglib_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst"
-+pkgdata_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst"
-
- self=`basename $0`
-
-@@ -163,7 +163,7 @@ for file in "${source_directory}/"*.mod "${source_directory}/"efiemu32.o "${sour
- fi
- done
-
--for file in ${pkglib_DATA}; do
-+for file in ${pkgdata_DATA}; do
- if test -f "${source_directory}/${file}"; then
- cp -f "${source_directory}/${file}" "${memdisk_dir}"/boot/grub/
- fi
diff --git a/libre/grub/grub2_bzr_export.sh b/libre/grub/grub2_bzr_export.sh
deleted file mode 100644
index f40588f82..000000000
--- a/libre/grub/grub2_bzr_export.sh
+++ /dev/null
@@ -1,113 +0,0 @@
-#!/bin/bash
-
-## For actual repos
-
-# bzr branch bzr://bzr.savannah.gnu.org/grub-extras/lua lua
-# bzr branch bzr://bzr.savannah.gnu.org/grub-extras/gpxe gpxe
-# bzr branch bzr://bzr.savannah.gnu.org/grub-extras/ntldr-img ntldr-img
-# bzr branch bzr://bzr.savannah.gnu.org/grub-extras/915resolution 915resolution
-
-## For launchpad mirror
-
-# bzr branch lp:~the-ridikulus-rat/grub/grub2-extras-lua lua
-# bzr branch lp:~the-ridikulus-rat/grub/grub2-extras-gpxe gpxe
-# bzr branch lp:~the-ridikulus-rat/grub/grub2-extras-ntldr-img ntldr-img
-# bzr branch lp:~the-ridikulus-rat/grub/grub2-extras-915resolution 915resolution
-
-## grub-extras zfs is integrated into grub2 bzr main repo and is no longer needed separately.
-
-_WD="${PWD}/"
-_OUTPUT_DIR="${_WD}/"
-
-_ACTUAL_PKGVER="1.99"
-
-_GRUB2_BZR_REPO_DIR="${_WD}/grub2_BZR/"
-_GRUB2_BZR_EXP_REPO_DIR="${_WD}/grub2_experimental_BZR/"
-_GRUB2_EXTRAS_REPOS_DIR="${_WD}/grub2_extras_BZR/"
-
-_MAIN_SNAPSHOT() {
-
- cd "${_GRUB2_BZR_REPO_DIR}/"
- echo
-
- _REVNUM="$(bzr revno ${_GRUB2_BZR_REPO_DIR})"
- bzr export --root="grub-${_ACTUAL_PKGVER}" --format="tar" "${_OUTPUT_DIR}/grub2_r${_REVNUM}.tar"
- echo
-
- cd "${_OUTPUT_DIR}/"
-
- xz -9 "${_OUTPUT_DIR}/grub2_r${_REVNUM}.tar"
- echo
-
-}
-
-_EXP_SNAPSHOT() {
-
- cd "${_GRUB2_BZR_EXP_REPO_DIR}/"
- echo
-
- _REVNUM="$(bzr revno ${_GRUB2_BZR_EXP_REPO_DIR})"
- bzr export --root="grub-${_ACTUAL_PKGVER}" --format="tar" "${_OUTPUT_DIR}/grub2_exp_r${_REVNUM}.tar"
- echo
-
- cd "${_OUTPUT_DIR}/"
-
- xz -9 "${_OUTPUT_DIR}/grub2_exp_r${_REVNUM}.tar"
- echo
-
-}
-
-_EXTRAS_SNAPSHOT() {
-
- cd "${_GRUB2_EXTRAS_REPOS_DIR}/${_GRUB2_EXTRAS_NAME}/"
- echo
-
- _REVNUM="$(bzr revno ${_GRUB2_EXTRAS_REPOS_DIR}/${_GRUB2_EXTRAS_NAME})"
- bzr export --root="${_GRUB2_EXTRAS_NAME}" --format=tar "${_OUTPUT_DIR}/grub2_extras_${_GRUB2_EXTRAS_NAME}_r${_REVNUM}.tar"
- echo
-
- cd "${_OUTPUT_DIR}/"
- echo
-
- xz -9 "${_OUTPUT_DIR}/grub2_extras_${_GRUB2_EXTRAS_NAME}_r${_REVNUM}.tar"
- echo
-
-}
-
-echo
-
-set -x -e
-
-echo
-
-_MAIN_SNAPSHOT
-
-echo
-
-# _EXP_SNAPSHOT
-
-echo
-
-_GRUB2_EXTRAS_NAME="lua"
-_EXTRAS_SNAPSHOT
-
-_GRUB2_EXTRAS_NAME="gpxe"
-_EXTRAS_SNAPSHOT
-
-_GRUB2_EXTRAS_NAME="ntldr-img"
-_EXTRAS_SNAPSHOT
-
-_GRUB2_EXTRAS_NAME="915resolution"
-_EXTRAS_SNAPSHOT
-
-echo
-
-set +x +e
-
-echo
-
-unset _WD
-unset _OUTPUT_DIR
-unset _GRUB2_BZR_REPO_DIR
-unset _GRUB2_EXTRAS_REPOS_DIR
-unset _GRUB2_EXTRAS_NAME
diff --git a/libre/grub/grub_extras_lua_args_fix.patch b/libre/grub/grub_extras_lua_args_fix.patch
deleted file mode 100644
index 5cb317ce3..000000000
--- a/libre/grub/grub_extras_lua_args_fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/grub-extras/lua/grub_lib.c b/grub-extras/lua/grub_lib.c
-index 9014320..055d620 100644
---- a/grub-extras/lua/grub_lib.c
-+++ b/grub-extras/lua/grub_lib.c
-@@ -466,7 +466,7 @@ grub_lua_add_menu (lua_State *state)
- if (! p)
- return push_result (state);
-
-- grub_normal_add_menu_entry (n, args, NULL, NULL, NULL, NULL, p, 0);
-+ grub_normal_add_menu_entry (n, args, NULL, NULL, NULL, NULL, NULL, p, 0);
- }
- else
- {
diff --git a/libre/grub/parabola-mkconfig.patch b/libre/grub/parabola-mkconfig.patch
deleted file mode 100644
index 7c18a4cc2..000000000
--- a/libre/grub/parabola-mkconfig.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -ru grub-1.99.orig/util/grub.d/10_linux.in grub-1.99/util/grub.d/10_linux.in
---- grub-1.99.orig/util/grub.d/10_linux.in 2011-08-11 15:54:52.051246328 +0200
-+++ grub-1.99/util/grub.d/10_linux.in 2011-08-11 15:55:41.297910793 +0200
-@@ -134,7 +134,7 @@
-
- case x`uname -m` in
- xi?86 | xx86_64)
-- list=`for i in /boot/vmlinuz-* /vmlinuz-* /boot/kernel-* /boot/vmlinuz26-* ; do
-+ list=`for i in /boot/vmlinuz-* /vmlinuz-* /boot/kernel-* /boot/vmlinuz26-* /boot/vmlinuz26 ; do
- if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi
- done` ;;
- *)
-@@ -163,7 +163,8 @@
- "initrd-${alt_version}" "initramfs-${alt_version}.img" \
- "initramfs-genkernel-${version}" \
- "initramfs-genkernel-${alt_version}" \
-- "${basename/vmlinuz/kernel}.img"; do
-+ "${basename/vmlinuz/kernel}.img" \
-+ "${basename/vmlinuz/initramfs}.img"; do
- if test -e "${dirname}/${i}" ; then
- initrd="$i"
- break
-@@ -194,7 +195,8 @@
- linux_entry "${OS}" "${version}" false \
- "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
- for i in "initramfs-${version}-fallback.img" \
-- "${basename/vmlinuz/kernel}-fallback.img"; do
-+ "${basename/vmlinuz/kernel}-fallback.img" \
-+ "${basename/vmlinuz/initramfs}-fallback.img"; do
- if test -e "${dirname}/${i}"; then
- initrd="$i"
- linux_entry "${OS}" "${version}" true \
diff --git a/libre/grub/parabola_grub_mkconfig_fixes.patch b/libre/grub/parabola_grub_mkconfig_fixes.patch
index 19022aec6..5324afa01 100644
--- a/libre/grub/parabola_grub_mkconfig_fixes.patch
+++ b/libre/grub/parabola_grub_mkconfig_fixes.patch
@@ -31,19 +31,25 @@ index 765bfdc..b148558 100644
gfxterm=0;
for x in ${GRUB_TERMINAL_INPUT} ${GRUB_TERMINAL_OUTPUT}; do
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index 14402e8..64c9bb5 100644
+index 14402e8..e85f7d6 100644
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
-@@ -31,7 +31,7 @@
+@@ -31,7 +31,13 @@ CLASS="--class gnu-linux --class gnu --class os"
if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
OS=GNU/Linux
else
- OS="${GRUB_DISTRIBUTOR} GNU/Linux"
-+ OS="${GRUB_DISTRIBUTOR}"
++ if [ "${GRUB_DISTRIBUTOR}" = "Parabola" ] ; then
++ OS="${GRUB_DISTRIBUTOR} GNU/Linux-libre"
++ elif [ "${GRUB_DISTRIBUTOR}" = "parabola" ] ; then
++ OS="${GRUB_DISTRIBUTOR} GNU/Linux-libre"
++ else
++ OS="${GRUB_DISTRIBUTOR} GNU/Linux"
++ fi
CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1) ${CLASS}"
fi
-
-@@ -87,6 +87,8 @@ linux_entry ()
+
+@@ -87,6 +93,8 @@ linux_entry ()
case $type in
recovery)
title="$(gettext_printf "%s, with Linux %s (recovery mode)" "${os}" "${version}")" ;;
@@ -52,7 +58,7 @@ index 14402e8..64c9bb5 100644
*)
title="$(gettext_printf "%s, with Linux %s" "${os}" "${version}")" ;;
esac
-@@ -100,7 +102,7 @@ linux_entry ()
+@@ -100,7 +108,7 @@ linux_entry ()
else
echo "menuentry '$(echo "$os" | grub_quote)' ${CLASS} \$menuentry_id_option 'gnulinux-simple-$boot_device_id' {" | sed "s/^/$submenu_indentation/"
fi
@@ -61,7 +67,7 @@ index 14402e8..64c9bb5 100644
save_default_entry | sed -e "s/^/\t/"
fi
-@@ -132,7 +134,8 @@ linux_entry ()
+@@ -132,7 +140,8 @@ linux_entry ()
fi
printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/"
fi
@@ -71,7 +77,7 @@ index 14402e8..64c9bb5 100644
sed "s/^/$submenu_indentation/" << EOF
echo '$message'
linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args}
-@@ -190,7 +193,22 @@ while [ "x$list" != "x" ] ; do
+@@ -190,7 +199,22 @@ while [ "x$list" != "x" ] ; do
alt_version=`echo $version | sed -e "s,\.old$,,g"`
linux_root_device_thisversion="${LINUX_ROOT_DEVICE}"
@@ -87,14 +93,14 @@ index 14402e8..64c9bb5 100644
+ fi
+ fi
+ fi
-+
++
initrd=
+ initrd_arch="`echo "${basename}" | sed -e 's,vmlinuz,initramfs,g'`"
+
for i in "initrd.img-${version}" "initrd-${version}.img" "initrd-${version}.gz" \
"initrd-${version}" "initramfs-${version}.img" \
"initrd.img-${alt_version}" "initrd-${alt_version}.img" \
-@@ -198,7 +216,8 @@ while [ "x$list" != "x" ] ; do
+@@ -198,7 +222,8 @@ while [ "x$list" != "x" ] ; do
"initramfs-genkernel-${version}" \
"initramfs-genkernel-${alt_version}" \
"initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \
@@ -104,7 +110,7 @@ index 14402e8..64c9bb5 100644
if test -e "${dirname}/${i}" ; then
initrd="$i"
break
-@@ -226,6 +245,22 @@ while [ "x$list" != "x" ] ; do
+@@ -226,6 +251,22 @@ while [ "x$list" != "x" ] ; do
linux_root_device_thisversion=${GRUB_DEVICE}
fi
@@ -127,7 +133,7 @@ index 14402e8..64c9bb5 100644
if [ "x$is_first_entry" = xtrue ]; then
linux_entry "${OS}" "${version}" simple \
"${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
-@@ -239,8 +274,11 @@ while [ "x$list" != "x" ] ; do
+@@ -239,8 +280,11 @@ while [ "x$list" != "x" ] ; do
echo "submenu '$(gettext_printf "Advanced options for %s" "${OS}" | grub_quote)' \$menuentry_id_option 'gnulinux-advanced-$boot_device_id' {"
fi
@@ -139,7 +145,7 @@ index 14402e8..64c9bb5 100644
if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then
linux_entry "${OS}" "${version}" recovery \
"single ${GRUB_CMDLINE_LINUX}"
-@@ -252,8 +290,10 @@ done
+@@ -252,8 +296,10 @@ done
# If at least one kernel was found, then we need to
# add a closing '}' for the submenu command.
diff --git a/libre/hydrogen-libre/PKGBUILD b/libre/hydrogen-libre/PKGBUILD
new file mode 100644
index 000000000..5f4eef1b9
--- /dev/null
+++ b/libre/hydrogen-libre/PKGBUILD
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Ray Rashif <schiv@archlinux.org>
+# Contributor: tobias <tobias@archlinux.org>
+# Contributor: K. Piche <kpiche@rogers.com>
+# Contributor: Giovanni Scafora <giovanni@archlinux.org>
+
+_pkgname=hydrogen
+pkgname=hydrogen-libre
+pkgver=0.9.5.1
+pkgrel=1
+pkgdesc="Advanced Drum Machine (without nonfree drumkits recommendation)"
+arch=('i686' 'x86_64' 'mips64el')
+license=('GPL')
+url="http://www.hydrogen-music.org/"
+depends=('libarchive' 'liblrdf' 'qt' 'jack')
+makedepends=('scons')
+#options=('!makeflags')
+replaces=("${_pkgname}")
+conflicts=("${_pkgname}")
+provides=("${_pkgname}=${pkgver}")
+source=(http://downloads.sourceforge.net/${_pkgname}/${_pkgname}-${pkgver}.tar.gz
+ lrdf_raptor2.patch
+ install.patch)
+md5sums=('52f3a528705818c65acf546a3be4c6fb'
+ '2124851e890f46158189b5fa90006d40'
+ 'ce3a83a069b55e46aa532b55e803c9a5')
+
+build() {
+ cd "${srcdir}/${_pkgname}-${pkgver}"
+
+ # Change to list with only free licensed drumkits
+ sed -i -e 's|www.hydrogen-music.org/feeds/drumkit_list.php|repo.parabolagnulinux.org/other/hydrogen-libre/feeds/drumkit_list.php|'\
+ {data/{hydrogen.default.conf,doc/manual{.docbook,_nl.html,_es.html,_fr.html,.pot,_fr.po,_es.po,_en.html,_ca.html,_it.html}},gui/src/SoundLibrary/SoundLibraryImportDialog.cpp,libs/hydrogen/src/preferences.cpp} || read
+
+ export QTDIR=/usr
+ patch -Np1 -i "${srcdir}/lrdf_raptor2.patch"
+ # http://www.assembla.com/spaces/hydrogen/tickets/204
+ patch -Np0 -i "${srcdir}/install.patch"
+ scons prefix=/usr libarchive=1
+}
+
+package() {
+ cd "${srcdir}/${_pkgname}-${pkgver}"
+
+ scons DESTDIR="${pkgdir}" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/libre/hydrogen-libre/install.patch b/libre/hydrogen-libre/install.patch
new file mode 100644
index 000000000..2e6e707a1
--- /dev/null
+++ b/libre/hydrogen-libre/install.patch
@@ -0,0 +1,12 @@
+*** Sconstruct.org 2011-11-06 12:15:40.018119106 +0100
+--- Sconstruct 2011-11-06 12:16:21.124122432 +0100
+***************
+*** 298,304 ****
+
+ for N in glob.glob('./data/i18n/hydrogen.*'):
+ env.Alias(target="install", source=env.Install(dir= env['DESTDIR'] + env['prefix'] + '/share/hydrogen/data/i18n', source=N))
+- env.Alias(target="install", source=env.Install(dir= env['DESTDIR'] + env['prefix'] + '/share/hydrogen/data', source="./data/img"))
+
+ #add every img in ./data/img to the install list.
+ os.path.walk("./data/img/",install_images,env)
+--- 298,303 ----
diff --git a/libre/hydrogen-libre/lrdf_raptor2.patch b/libre/hydrogen-libre/lrdf_raptor2.patch
new file mode 100644
index 000000000..ec176b716
--- /dev/null
+++ b/libre/hydrogen-libre/lrdf_raptor2.patch
@@ -0,0 +1,11 @@
+diff -baur hydrogen-0.9.5.old/Sconstruct hydrogen-0.9.5/Sconstruct
+--- hydrogen-0.9.5.old/Sconstruct 2011-08-11 18:00:07.889112348 +0800
++++ hydrogen-0.9.5/Sconstruct 2011-08-11 18:00:34.945632437 +0800
+@@ -83,6 +83,7 @@
+ includes.append( './' )
+ includes.append( 'gui/src/' )
+ includes.append( '3rdparty/install/include' )
++ includes.append( '/usr/include/raptor2' )
+
+ if sys.platform == "darwin":
+ ldflags.append( '-L/opt/local/lib' )
diff --git a/libre/iceweasel-l10n/PKGBUILD b/libre/iceweasel-l10n/PKGBUILD
index 8e0172208..2e7160daf 100644
--- a/libre/iceweasel-l10n/PKGBUILD
+++ b/libre/iceweasel-l10n/PKGBUILD
@@ -11,7 +11,7 @@
# - Run 'make'. It will take care of everything else for you.
_debname=iceweasel
-_debver=18.0.1
+_debver=18.0.2
_debrel=1
_debrepo=http://ftp.debian.org/debian/pool/main/
debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -75,91 +75,91 @@ package_iceweasel-l10n-$(echo $lang | tr A-Z a-z)() {
done
md5sums=('428246ef3fb64103ff2cf5eaae2a92ca'
- '5bff9acef5bdfd10fff5e3f36ff7c8bc'
- '5ada703cfdc40e32c5c145380e979e1a'
- 'e8b198ad4673ef12538f17e73529f9f8'
- 'ba77a8937f6d0bc84ad789950ef42c70'
- 'd940e1ccb7f501555500b17f5ea28e74'
- '7325a84d999c3ea5f884cff15e1a4210'
- 'f35c32e53f07774efa39bec386aa35c6'
- '2d2a628958c5ad0f66077ae1703f61ba'
- '458c5cee205f12ced09f8baab1605e11'
- '7271c461eb02608d193208c5da94280e'
- 'a505e69bf7cbb4caadcd5dfa67da1b78'
- '0b0e10b39d115aedc1dfc0967068df95'
- '09153faa23ca0a953aa22cc3989eba5e'
- 'da9779d4a64f1bbab1195c9801fb678c'
- '1815468f85d1eea9f018a72bb83889d3'
- '6103d52fb61b4bb7e921870ff05c98af'
- 'c3f0e46e2cfb68bf30363c92dcd9934d'
- '5214d31f5cd5c077f09a0c275f936c25'
- 'ad4f664710dfa896b969f25b824d7086'
- 'ba2339dce1b84f0e7c0b77331572d6f5'
- '28fb3e3e873cf5d03207e220eebf2ab0'
- 'a6f6ea487f6577ddf4cb2ef10ed5e401'
- '8143ba212c6ef5f1dfc311ce84861450'
- '5a6db78ee5cd6b41c02b7f65e666a045'
- '63869ca68431ee4c7d3769f4ef8b68e1'
- '5e87285fa518d1a95a7a63a2587497b7'
- '969c213166c8ecd7cc752c557a1c056d'
- '0c47f76ca2fb3d747be170fd61fa36cb'
- '01f67291435616996e968f41259b91bd'
- 'f785b30e48ea4ee4af286325b020c545'
- '58684c98cfc9d35d3d37f827268e72ac'
- '2ec870106c72d0772f65f6a129547cb1'
- '98d5cec52877790042830e8be41db1ca'
- '654ee0ebb10cfbfe9b8b6540548f08e7'
- '5a60a9cd96e0900a6cfbf37f7a68b715'
- 'e6e276eb4b8b7c1eb5a3593b07b9a84a'
- '0c788fece8760fb61509c0fe1ac7eff4'
- '98cba049bae024ae7dc7426f6adf09d2'
- '2d37f79f57d38008e64c9a52a05c91a4'
- 'aeffb314945de717ef8a417653bcba3d'
- '910b595a09b98f4eae1f4e6ddcae6ad5'
- '9c5babdcd0ecbac8e487bed05cf5fe1a'
- 'f94018f378dcd11d8d63ebbd4a595ca1'
- 'bb4cc3cdb7995333babe6462d1aaef06'
- '7a3d8e89625858fea797f33e7a426c25'
- 'd1fbf396db41d77da0b3f9f2528c8c96'
- 'cfa20a918d3adad42313fc2db86c63b8'
- 'fa213ce6abfa19a6067e64c149e90b27'
- '8c2a0ec2e38504c6f4657d9f00c3b4f0'
- '3ff17d0759b40c4d308b8f28b698dba1'
- '2fc7cc5a0d2d0794c7f08156fd65619d'
- 'ed57c5f168e53cec827695ac4c18ec10'
- 'c8b05f70068e8a8255d8f28f3171df5f'
- 'adc1d1e78c6c42624b1e312be7dec90c'
- '1f667156cd0b9e23effcbf8e26d01839'
- 'dd112d0dbbcc45b38036694e5c82a6aa'
- 'f37be06f19a3e6e60727466896bc6b65'
- 'ec947261ee12d58c1a9998ea8136f744'
- 'a3434e5da7b65559de7c4adcb14906d3'
- 'b8984e5ab770cd3f0fd70cbc33ba1150'
- 'a06634264be552d2e64189a761c7cc3c'
- '417246fb8b66c806bdb903801f975627'
- 'b9e367b2d4f96ea111ae46c22801b0bf'
- '0a245b319c1dc40ef95a24ca5b0fca9d'
- '7a08d4e4d7a10f12a4d79fe96e2c1f51'
- 'f4d71f4e0a1794ccc25463cced9457d4'
- '778089e056b6e8b1aaef1a4769153059'
- 'c3855b0c99342acddca0a7e6d9dc126f'
- '9bbd6dbf2df859fcbbf366e753dfcdd6'
- '338ea8d0681d2df2409a2398c3ae3694'
- 'e783a6e96d080413a60d1200fa0ac8a7'
- 'd1af3e947fc8a8aca39bec88aaeda708'
- 'e53c6a92a5533a706abb6abbe761508e'
- '5d139a83f2b5e1625142f06a63147a28'
- 'd671a0fd8a4f8eb08d4b9ab52372d667'
- 'af9bf9f8a04dc898fad49083824fea6a'
- '78184aa445a574ed6f57e926c7ab25c4'
- '62f54d64f86204a45fc12557a4a76eb0'
- '0ee43e97979aff7b7e2bb3d9e42a6e00'
- '6fe3c2ed768593d942461f462fadd508'
- '469ff3256c7322f15a71e0fd81e09f57'
- '74bb076c39c409d9c795722d692561dc'
- 'fc439b2e9dfff5111d0fea9fdeef30de'
- '546c8cac927262e9166e01f4634a22cb'
- '1009936f51fad91899c6f0144040f174'
- '700322fdfe534fa47579895c87a93808'
- 'fbdd5acbff2ef4d73665766d1f0cd815'
- 'b3cc9c95ce6146453c8929213b04d9fe')
+ '31f654187e17bc58997481e8a56496b1'
+ 'fade60b00eb508d48a84d23c0e6541e5'
+ '3d7a74dbce2d48f3c1ee8b60790835b8'
+ '48d1d9fae40e1bef02c58e61bf7f539b'
+ '065b8ea8d4545358188bf1246936eb8b'
+ '3c70cb0d4212e2efbc90111cc3134e33'
+ 'dbc87745091f8da747656fff12823910'
+ 'ecbae99a66b2ce71cbbec6c73df8844d'
+ 'a154b28a9b0de83e7e4caa8522fe3241'
+ 'a38131384cebd05f97da8e61b549361f'
+ '4dfabf91b1bcf5c5917a30b6042ded81'
+ '376e3652e406c57e7f7a760094dad0ab'
+ 'cb6b6fda241231881fc88dd4123ffa39'
+ 'e940765847d1f83d03df11850fb9147b'
+ '09ec90ab9c064ed95ec94ddf8323394f'
+ 'cb436e667812f9031d450e58d66d932d'
+ 'b8e033ebf0dbf8b0a230f97910d71505'
+ '19208ca1053d4e64d651a19376dcd24a'
+ '9e7b3895ddc0abb9e11588f594d6e4af'
+ '0aa6613e504e5a3c05c47ba1219fbd08'
+ '170fe69ee60cec853063a7da4a874c7e'
+ '317b03437e37d65140850b6bbe72e76d'
+ 'ff81fab8ad6dea85bfd2e6cf19e15168'
+ 'e963bd288d0eef928c639cf474f66106'
+ '02ad1252186b093aa08213bc8e178c96'
+ 'abe884cc2b185ca7ffdba54bbeb56069'
+ '4cc3a9db198329fb9612a4171619f177'
+ 'af14e936a7ad830987464abb251a7e64'
+ '96652e4a21ea60e4c29ecbd2f20ab93b'
+ 'cea50d05ef64864b52eced984cdb6d09'
+ 'a496720ade4c5e27dc265d953a63f4f3'
+ 'cc0cf100ebe57c765b278c3a11fc6898'
+ 'bda56ca990bb70ebc2b17a6d6d078cc0'
+ '0d16cf2741ea660acf781a156e64a60b'
+ 'b773827e9d806722b4164338b1307cdb'
+ '73166bc2a29b207e3b0d724957b0c5ed'
+ 'f1b0c9f9fa3aa50a1837988efef95cf2'
+ '9b08f5fab447bf210282f470e447a3d4'
+ '330c9304f9ab0038c892c248246aea24'
+ 'aa7237a6ad341e4d3463b470265cb6f7'
+ '631646b52dd480126a5efb41d4f5fda4'
+ '89b783cd706c960c217283e0ffba02c1'
+ '0a23686cca72fa95f1ff54eec885b306'
+ 'ee0e262a083429d8388412955314a6f0'
+ '0714162d56a436394b9165f7ad2bf549'
+ '76a5096315e019234b4fe6b9e86c7ae9'
+ '4dc4688b90d81881e89af6b2ee3720ce'
+ 'ce0c82cc666abe518a24231803883d68'
+ 'b67193f83bad38939aafb8bb7368862a'
+ 'f23ac7cdabd042cbc841c408fbe69dff'
+ '422741d2bb3c3a272a94b2977de188b8'
+ 'f88e8e651933640877e9f088e77d503b'
+ 'cf9445ebf2852bc40e140d5cfca269d9'
+ '1cdeb5e3a3e4ccea28299ab21559dc27'
+ '2c4e7209039d4cab5d614419e7612079'
+ '3a9909afb4d73c12e36bd721d1504788'
+ '9bf880dd4d142e0f7adc3bdccf196a13'
+ 'cc7dc9f622ecf277da1598f2a7391936'
+ '70be0726c473cb814cbb59d8efbffac5'
+ '42f43f6ea94dbcc20c9052e5c86edb40'
+ 'ab3b4068e17b5ac765e0bbb29332b935'
+ 'e135b2bf59fe4f03c87fcddb626da4a5'
+ 'f1df05798115e9c7db8cc1ff1713e87e'
+ 'be849695d961f94ecbe95141c5be9b63'
+ '5763fabc54b0a6cc5f7ecbade138c819'
+ '12fc8c500e44a36081963d0b591b5ec7'
+ 'aed0dd9b85788b43916a927234e25a39'
+ '4c0b62ea092c34f8bc22caaacab4206c'
+ 'e31d50bef08bdc2b5b6e526d4aed8aa9'
+ '283f98e2175e01bee3b8b84237d24284'
+ 'fbeb003e7d0819903c415900bd874e4a'
+ '44b6504f4f4158b8439263118bfac99b'
+ '4b692c497769eda8778fd14c747b2f90'
+ '9e6dc514be82e7d9c9702c301525876a'
+ '6cccbbaa7835f4538caaf5b170b42390'
+ 'e43d96c0c4758f327ef28555cbfe3e1b'
+ '65850ad55182fca2a91e213ab25c9c93'
+ '891de1295abfcf21651f5996f2f9c5b8'
+ 'b8497fc27cbc81c54fda917317c0dc3f'
+ 'e9eecc0fe4c3dc4b9ab4c21714eb45c5'
+ 'a3a898b665e4044ea77f6e2a48e3f448'
+ '1dcea4aeeebe6010b95e85d2c4fead6c'
+ 'e063a63b1dd3fc4ab5947079fbb496d4'
+ '9165ab1d8d0b62a460b955129d160c3f'
+ '25b2dff9bdd8592e2ce11dbf53cc995c'
+ 'fdf6b9c514269c39f032d08889f77576'
+ '377c3e6358622323681387a15bf4de1e'
+ '5e72c0853f73aa7e60c8f1ceb95d2910')
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 571ad31a0..00a6fb3b0 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -14,7 +14,7 @@ _pgo=false
# We're getting this from Debian Experimental
_debname=iceweasel
-_debver=18.0.1
+_debver=18.0.2
_debrel=1
_debrepo=http://ftp.debian.org/debian/pool/main/
debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -22,7 +22,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
_pkgname=iceweasel
pkgname=iceweasel-libre
pkgver=$_debver.$_debrel
-pkgrel=2
+pkgrel=1
if [ -z "$pkgname" ]; then pkgname=$_pkgname; fi
if $_pgo; then
@@ -54,8 +54,8 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2"
shared-libs.patch
replace-urls.txt
Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch)
-md5sums=('5d481dd35a304702d1f311eeb3f1149f'
- '6a4781e8ddc1b166f36930c4864e095f'
+md5sums=('9869f5aa42cf922526d34b4946fee867'
+ 'a7f261b9860b9af596e0d8614d52a8cd'
'f90c6a70d0a6d0a9e7f9a0eed6aeffd3'
'ac29b01c189f20abae2f3eef1618ffc0'
'1ee2d4bcacee73d671b9ffa17a02abaa'
diff --git a/libre/kdebase-konqueror-libre/PKGBUILD b/libre/kdebase-konqueror-libre/PKGBUILD
index 91d74ba15..efff37e2b 100644
--- a/libre/kdebase-konqueror-libre/PKGBUILD
+++ b/libre/kdebase-konqueror-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 174142 2013-01-02 15:56:20Z andrea $
+# $Id: PKGBUILD 176530 2013-01-31 14:43:11Z andrea $
# 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.9.5
+pkgver=4.10.0
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')
source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz"
"konq-about-fsdg.diff")
-sha1sums=('67d1c2c83570aac1d3c026cdecd82833e8d8b568'
+sha1sums=('5b0127bd946286f52d98a1779eabf65e416a66c3'
'd6cbb53c04179b8180f9439eca156b7ff2e76b3a')
pkgdesc='KDE File Manager & Web Browser (without Google and nonfree software recommendation)'
depends=('kdebase-dolphin' 'kdebase-keditbookmarks')
@@ -37,6 +37,7 @@ build() {
cd build
cmake ../kde-baseapps-${pkgver} \
-DCMAKE_BUILD_TYPE=Release \
+ -DKDE4_BUILD_TESTS=OFF \
-DCMAKE_SKIP_RPATH=ON \
-DCMAKE_INSTALL_PREFIX=/usr
for i in konqueror doc/konqueror nsplugins; do
diff --git a/libre/kdebase-runtime-libre/PKGBUILD b/libre/kdebase-runtime-libre/PKGBUILD
index 20219e40a..8e049cd0c 100644
--- a/libre/kdebase-runtime-libre/PKGBUILD
+++ b/libre/kdebase-runtime-libre/PKGBUILD
@@ -5,14 +5,14 @@
_pkgname=kdebase-runtime
pkgname=kdebase-runtime-libre
-pkgver=4.9.5
+pkgver=4.10.0
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'
license=('GPL' 'LGPL')
-depends=('nepomuk-core' 'smbclient' 'libssh' 'libcanberra' 'oxygen-icons' 'xorg-xauth'
- 'kactivities')
+depends=('kactivities' 'smbclient' 'libssh' 'libcanberra' 'oxygen-icons'
+ 'xorg-xauth')
makedepends=('pkg-config' 'cmake' 'automoc4' 'kdepimlibs' 'openslp' 'doxygen'
'networkmanager')
optdepends=('kdepimlibs: to generate drkonqi reports'
@@ -26,30 +26,30 @@ install="${_pkgname}.install"
source=("http://download.kde.org/stable/${pkgver}/src/kde-runtime-${pkgver}.tar.xz"
'duckduckgo_html.desktop'
'duckduckgo_lite.desktop')
-sha1sums=('6e2abeb8cc2d40d248dfabd49da264ac375fe6b5'
+sha1sums=('eff82d54383ece321dc93bdfb494c0a9abcbb998'
'aa6f39f4b0ad3c110fd05cd6c41190afae9773dd'
'ac3bac94a2c4b1444642524bc5fb539c4c5dcc5b')
build() {
- cd "${srcdir}"
+ cd "${srcdir}"
-# Removing non-privacy search providers
- rm -v kde-runtime-${pkgver}/kurifilter-plugins/ikws/searchproviders/{7digital,acronym,altavista,amazon{,_mp3},amg,austronaut,backports,baidu,bing,blip,cia,dbug,deb,duckduckgo{,_info,_shopping},facebook,ecosia,feedster,flickr,flickrcc,froogle,google,google_advanced,google_code,google_groups,google_images,google_lucky,google_maps,google_movie,google_news,gracenote,imdb,jeeves,katatudo,magnatune,metacrawler,msdn,nl-telephone,nl-teletekst,python,rpmfind,tvtome,uspto,vimeo,vivisimo,voila,yahoo,yahoo_image,yahoo_local,yahoo_shopping,yahoo_video,youtube}.desktop
+ # Removing non-privacy search providers
+ rm -v kde-runtime-${pkgver}/kurifilter-plugins/ikws/searchproviders/{7digital,acronym,altavista,amazon{,_mp3},amg,austronaut,backports,baidu,bing,blip,cia,dbug,deb,duckduckgo{,_info,_shopping},facebook,ecosia,feedster,flickr,flickrcc,froogle,google,google_advanced,google_code,google_groups,google_images,google_lucky,google_maps,google_movie,google_news,gracenote,imdb,jeeves,katatudo,magnatune,metacrawler,msdn,nl-telephone,nl-teletekst,python,rpmfind,tvtome,uspto,vimeo,vivisimo,voila,yahoo,yahoo_image,yahoo_local,yahoo_shopping,yahoo_video,youtube}.desktop
-# Adding DuckDuckGo HTML
- cp -v duckduckgo_html.desktop "kde-runtime-${pkgver}/kurifilter-plugins/ikws/searchproviders"
+ # Adding DuckDuckGo HTML
+ cp -v duckduckgo_html.desktop "kde-runtime-${pkgver}/kurifilter-plugins/ikws/searchproviders"
-# Adding DuckDuckGo Lite
- cp -v duckduckgo_lite.desktop "kde-runtime-${pkgver}/kurifilter-plugins/ikws/searchproviders"
+ # Adding DuckDuckGo Lite
+ cp -v duckduckgo_lite.desktop "kde-runtime-${pkgver}/kurifilter-plugins/ikws/searchproviders"
mkdir build
cd build
cmake ../kde-runtime-${pkgver} \
-DCMAKE_BUILD_TYPE=Release \
+ -DKDE4_BUILD_TESTS=OFF \
-DCMAKE_SKIP_RPATH=ON \
-DCMAKE_INSTALL_PREFIX=/usr \
- -DWITH_QNtrack=OFF \
- -DWITH_Xine=OFF
+ -DWITH_QNtrack=OFF
make
}
@@ -58,5 +58,5 @@ package() {
make DESTDIR="$pkgdir" install
rm -f "${pkgdir}/usr/share/icons/hicolor/index.theme"
- ln -sf /usr/lib/kde4/libexec/kdesu "${pkgdir}/usr/bin/"
+ ln -sf /usr/lib/kde4/libexec/kdesu "${pkgdir}/usr/bin/"
}
diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD
index e73cc2f36..77e5f3883 100644
--- a/libre/kdelibs-libre/PKGBUILD
+++ b/libre/kdelibs-libre/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 174033 2013-01-02 10:59:35Z andrea $
+# $Id: PKGBUILD 177595 2013-02-07 20:38:16Z eric $
# Maintainer: Andrea Scarpino <andrea@archlinux.org
# Contributor: Pierre Schmitz <pierre@archlinux.de>
# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
_pkgname=kdelibs
pkgname=kdelibs-libre
-pkgver=4.9.5
-pkgrel=1
+pkgver=4.10.0
+pkgrel=2
pkgdesc="KDE Core Libraries"
arch=('i686' 'x86_64' 'mips64el')
url='https://projects.kde.org/projects/kde/kdelibs'
@@ -14,7 +14,7 @@ license=('GPL' 'LGPL' 'FDL')
depends=('strigi' 'attica' 'libxss' 'soprano' 'krb5' 'grantlee'
'shared-desktop-ontologies' 'qca' 'libdbusmenu-qt' 'polkit-qt'
'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr'
- 'docbook-xsl' 'upower' 'udisks' 'libxcursor' 'phonon' 'qtwebkit'
+ 'docbook-xsl' 'upower' 'udisks2' 'libxcursor' 'phonon' 'qtwebkit'
'media-player-info' 'libxtst' 'libutempter')
makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell' 'mesa')
provides=("kdelibs=$pkgver")
@@ -24,7 +24,7 @@ install=${_pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz"
'kde-applications-menu.patch'
'khtml-fsdg.diff')
-sha1sums=('899a58c5cf2115a1a18fb1690c99b2b3815975c6'
+sha1sums=('093bfd214511bae7fda88242413c6ed4ff0b18f0'
'86ee8c8660f19de8141ac99cd6943964d97a1ed7'
'a1502a964081ad583a00cf90c56e74bf60121830')
@@ -41,6 +41,7 @@ build() {
cd build
cmake ../${_pkgname}-${pkgver} \
-DCMAKE_BUILD_TYPE=Release \
+ -DKDE4_BUILD_TESTS=OFF \
-DCMAKE_SKIP_RPATH=ON \
-DKDE_DISTRIBUTION_TEXT='Parabola GNU/Linux-libre' \
-DCMAKE_INSTALL_PREFIX=/usr \
@@ -48,7 +49,8 @@ build() {
-DHTML_INSTALL_DIR=/usr/share/doc/kde/html \
-DKDE_DEFAULT_HOME='.kde4' \
-DWITH_FAM=OFF \
- -DWITH_HUpnp=OFF
+ -DWITH_HUpnp=OFF \
+ -DWITH_SOLID_UDISKS2=ON
make
}
diff --git a/libre/kdenetwork-kopete-libre/PKGBUILD b/libre/kdenetwork-kopete-libre/PKGBUILD
index 8fea1b1c3..cbd38ec0f 100644
--- a/libre/kdenetwork-kopete-libre/PKGBUILD
+++ b/libre/kdenetwork-kopete-libre/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 174113 2013-01-02 11:04:46Z andrea $
+# $Id: PKGBUILD 176632 2013-01-31 14:46:22Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
pkgbase=kdenetwork
pkgname=('kdenetwork-kopete-libre')
-pkgver=4.9.5
+pkgver=4.10.0
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
url='http://www.kde.org'
@@ -17,7 +17,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr3' 'ppp'
'libktorrent' 'libmms' 'mediastreamer' 'telepathy-qt')
source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz"
'use-libotr3.patch')
-sha1sums=('26a607742b83211575802781b287f6f7f1c3ebbc'
+sha1sums=('974bd9aea71a583563667e7cdc4749fe9d5bd82e'
'9c3b0ee15538fbfa36aa0a4748b1f6b5a7905384')
build() {
@@ -33,12 +33,13 @@ build() {
cd build
cmake ../${pkgbase}-${pkgver} \
-DCMAKE_BUILD_TYPE=Release \
+ -DKDE4_BUILD_TESTS=OFF \
-DCMAKE_SKIP_RPATH=ON \
-DCMAKE_INSTALL_PREFIX=/usr \
-DMOZPLUGIN_INSTALL_DIR=/usr/lib/mozilla/plugins/ \
- -DWITH_Xmms=OFF \
+ -DWITH_Xmms=OFF \
-DWITH_LibMeanwhile=OFF \
- -DWITH_qq=OFF
+ -DWITH_qq=OFF
make
}
diff --git a/libre/kdepim-libre/PKGBUILD b/libre/kdepim-libre/PKGBUILD
index af28566e8..f72efd2cd 100644
--- a/libre/kdepim-libre/PKGBUILD
+++ b/libre/kdepim-libre/PKGBUILD
@@ -22,21 +22,29 @@ pkgname=('kdepim-akonadiconsole-libre'
'kdepim-ktimetracker-libre'
'kdepim-ktnef-libre'
'kdepim-libkdepim-libre')
-pkgver=4.9.5
+pkgver=4.10.0
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
url='http://pim.kde.org'
license=('GPL' 'LGPL' 'FDL')
groups=('kde' 'kdepim-libre')
-makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss' 'kde-agent')
-source=("http://download.kde.org/stable/${pkgver}/src/${_pkgbase}-${pkgver}.tar.xz")
-sha1sums=('a0d824dbb132cad8178767cfd881da2979ab399d')
+makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss'
+ 'kde-agent' 'nepomuk-widgets')
+source=("http://download.kde.org/stable/${pkgver}/src/${_pkgbase}-${pkgver}.tar.xz"
+ 'boost152.patch')
+sha1sums=('6074fcea53b10c3660c5cc9a00b65e777840fdc4'
+ '652de82dcc1c45de3123898ba46e1962bb0ed6d4')
build() {
+ cd ${_pkgbase}-${pkgver}
+ patch -p1 -i "${srcdir}"/boost152.patch
+ cd ../
+
mkdir build
cd build
cmake ../${_pkgbase}-${pkgver} \
-DCMAKE_BUILD_TYPE=Release \
+ -DKDE4_BUILD_TESTS=OFF \
-DCMAKE_SKIP_RPATH=ON \
-DCMAKE_INSTALL_PREFIX=/usr \
-DKDEPIM_BUILD_MOBILE=OFF
@@ -45,7 +53,7 @@ build() {
package_kdepim-akonadiconsole-libre() {
pkgdesc='Akonadi Management and Debugging Console (without nonfree pilot-link support)'
- depends=('kdepim-libkdepim')
+ depends=('kdepim-libkdepim' 'nepomuk-widgets')
url='http://pim.kde.org'
replaces=('kdepim-akonadiconsole')
conflicts=('kdepim-akonadiconsole')
@@ -62,7 +70,7 @@ package_kdepim-akregator-libre() {
replaces=('kdepim-akregator')
conflicts=('kdepim-akregator')
provides=("kdepim-akregator=${pkgver}")
- install='kdepim.install'
+ install='kdepim-akregator.install'
cd "${srcdir}"/build/akregator
make DESTDIR="${pkgdir}" install
cd "${srcdir}"/build/doc/akregator
@@ -173,9 +181,9 @@ package_kdepim-kmail-libre() {
replaces=('kdepim-kmail' 'kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve'
'kdepim-mimelib' 'kdepim-plugins')
provides=("kdepim-kmail=${pkgver}")
- for i in kmail doc/kmail kmailcvt archivemailagent backupmail \
+ for i in kmail doc/kmail kmailcvt archivemailagent \
importwizard ksendemail libksieve messagelist mailfilteragent \
- mailimporter ontologies kontact/plugins/kmail; do
+ ontologies kontact/plugins/kmail; do
cd "${srcdir}"/build/${i}
make DESTDIR="${pkgdir}" install
done
@@ -268,8 +276,6 @@ package_kdepim-ktimetracker-libre() {
make DESTDIR="${pkgdir}" install
cd "${srcdir}"/build/doc/ktimetracker
make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/kontact/plugins/ktimetracker
- make DESTDIR="${pkgdir}" install
}
package_kdepim-ktnef-libre() {
@@ -291,16 +297,16 @@ package_kdepim-libkdepim-libre() {
groups=()
depends=('kde-agent' 'kdepim-runtime')
url='http://pim.kde.org'
- conflicts=('kdepim-libkdepim' 'kdepim-icons' 'kdepim-libkleo'
- 'kdepim-libkpgp' 'kdepim-strigi-analyzer' 'kdepim-akonadi')
- replaces=('kdepim-libkdepim' 'kdepim-icons' 'kdepim-libkleo'
- 'kdepim-libkpgp' 'kdepim-strigi-analyzer' 'kdepim-akonadi')
+ conflicts=('kdepim-libkdepim' 'kdepim-icons' 'kdepim-libkleo' 'kdepim-libkpgp'
+ 'kdepim-strigi-analyzer' 'kdepim-akonadi')
+ replaces=('kdepim-libkdepim' 'kdepim-icons' 'kdepim-libkleo' 'kdepim-libkpgp'
+ 'kdepim-strigi-analyzer' 'kdepim-akonadi')
provides=("kdepim-libkdepim=${pkgver}")
for i in akonadi_next calendarsupport incidenceeditor-ng \
kdgantt2 libkdepim libkdepimdbusinterfaces libkleo libkpgp \
- mailcommon messagecomposer messagecore messageviewer icons \
- strigi-analyzer templateparser plugins/messageviewer \
- plugins/ktexteditor; do
+ mailcommon mailimporter messagecomposer messagecore messageviewer \
+ icons strigi-analyzer templateparser plugins/messageviewer \
+ plugins/ktexteditor pimcommon pimsettingexporter; do
cd "${srcdir}"/build/${i}
make DESTDIR="${pkgdir}" install
done
diff --git a/libre/kdepim-libre/boost152.patch b/libre/kdepim-libre/boost152.patch
new file mode 100644
index 000000000..c82b092f1
--- /dev/null
+++ b/libre/kdepim-libre/boost152.patch
@@ -0,0 +1,13 @@
+--- kdepim-4.10.0/kleopatra/models/keylistmodel.cpp~ 2013-01-31 09:40:34.270651208 +0000
++++ kdepim-4.10.0/kleopatra/models/keylistmodel.cpp 2013-01-31 09:41:26.570259714 +0000
+@@ -60,9 +60,9 @@
+ #ifdef _WIN32_WCE
+ #define BOOST_ALL_NO_LIB
+ #endif
+-#include <boost/graph/adjacency_list.hpp>
+
+ #ifndef Q_MOC_RUN // QTBUG-22829
++#include <boost/graph/adjacency_list.hpp>
+ #include <boost/graph/topological_sort.hpp>
+ #endif
+
diff --git a/libre/kdepim-libre/kdepim-akregator.install b/libre/kdepim-libre/kdepim-akregator.install
new file mode 100644
index 000000000..5787df72f
--- /dev/null
+++ b/libre/kdepim-libre/kdepim-akregator.install
@@ -0,0 +1,12 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
diff --git a/libre/kdeutils-ark-libre/PKGBUILD b/libre/kdeutils-ark-libre/PKGBUILD
index d6a1cc01e..75a906e72 100644
--- a/libre/kdeutils-ark-libre/PKGBUILD
+++ b/libre/kdeutils-ark-libre/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 174118 2013-01-02 11:05:08Z andrea $
+# $Id: PKGBUILD 176637 2013-01-31 14:46:33Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
_pkgname=kdeutils-ark
pkgname=kdeutils-ark-libre
-pkgver=4.9.5
+pkgver=4.10.0
pkgrel=1
pkgdesc='Archiving Tool'
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=('71018a85d489af1e119d2454d9b4e3166f63455c'
+sha1sums=('b4f4aaa7dc38ccd515066065ba2b9313d981cfc2'
'a0a836950f185d9b2245204579f969203036fdec')
build() {
@@ -34,6 +34,7 @@ build() {
cd build
cmake ../ark-${pkgver} \
-DCMAKE_BUILD_TYPE=Release \
+ -DKDE4_BUILD_TESTS=OFF \
-DCMAKE_INSTALL_PREFIX=/usr
make
}
@@ -41,6 +42,4 @@ build() {
package() {
cd $srcdir/build
make DESTDIR=$pkgdir install
- cd $srcdir/build/doc
- make DESTDIR=$pkgdir install
}
diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD
index f82a250bf..caaad4901 100644
--- a/libre/linux-libre-kmod-alx/PKGBUILD
+++ b/libre/linux-libre-kmod-alx/PKGBUILD
@@ -1,11 +1,11 @@
# Maintainer: André Silva <emulatorman@lavabit.com>
-_kernver=3.7.6
+_kernver=3.7.7
_kernrel=1
pkgname=('linux-libre-kmod-alx')
-_version=v3.8-rc5
-_pkgver=3.8-rc5-1-u
-pkgver=3.8rc5.1
+_version=v3.8-rc7
+_pkgver=3.8-rc7-1-u
+pkgver=3.8rc7.1
pkgrel=1
pkgdesc='Atheros alx ethernet device driver for linux-libre kernel'
arch=('i686' 'x86_64')
@@ -19,7 +19,7 @@ provides=('alx' 'alx-driver' 'dkms-alx')
conflicts=('alx' 'alx-driver' 'dkms-alx')
source=(http://www.kernel.org/pub/linux/kernel/projects/backports/stable/$_version/compat-drivers-$_pkgver.tar.xz)
-md5sums=('6ad873fbc6664aa4c15160e3ad7cb4c1')
+md5sums=('3a1c7f870ff2fb96534b0d69245a4dab')
build() {
diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD
index 5bea880cd..0840667de 100644
--- a/libre/linux-libre-lts-kmod-alx/PKGBUILD
+++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD
@@ -1,11 +1,12 @@
# Maintainer: André Silva <emulatorman@lavabit.com>
-_kernver=3.0.60
+_kernver=3.0.63
_kernrel=1
pkgname=('linux-libre-lts-kmod-alx')
-_pkgver=2012-12-04-1-u
-pkgver=20121204
-pkgrel=2
+_version=v3.8-rc7
+_pkgver=3.8-rc7-1-u
+pkgver=3.8rc7.1
+pkgrel=1
pkgdesc='Atheros alx ethernet device driver for linux-libre-lts kernel'
arch=('i686' 'x86_64')
url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx'
@@ -16,9 +17,9 @@ install=linux-libre-lts-kmod-alx.install
replaces=('alx' 'alx-driver' 'dkms-alx')
provides=('alx' 'alx-driver' 'dkms-alx')
conflicts=('alx' 'alx-driver' 'dkms-alx')
-source=(http://www.kernel.org/pub/linux/kernel/projects/backports/2012/12/04/compat-drivers-$_pkgver.tar.xz)
+source=(http://www.kernel.org/pub/linux/kernel/projects/backports/stable/$_version/compat-drivers-$_pkgver.tar.xz)
-md5sums=('0759f5668d20f420d6d9dc6d854a2ceb')
+md5sums=('3a1c7f870ff2fb96534b0d69245a4dab')
build() {
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index 4a4972307..f17cf91f5 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -7,10 +7,10 @@
pkgbase=linux-libre-lts # Build stock -LIBRE-LTS kernel
#pkgbase=linux-libre-custom # Build kernel with a different name
_basekernel=3.0
-_sublevel=62
+_sublevel=63
pkgver=${_basekernel}.${_sublevel}
pkgrel=1
-_lxopkgver=${_basekernel}.61 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.62 # nearly always the same as pkgver
arch=('i686' 'x86_64' 'mips64el')
url="http://linux-libre.fsfla.org/"
license=('GPL2')
@@ -32,7 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
'module-init-wait-3.0.patch'
"http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
md5sums=('5f64180fe7df4e574dac5911b78f5067'
- '90b2c4b9a05b108219bd44ac4804db84'
+ '5e4e976cce788a37cd17ea469dea7e6e'
'99f9c408b64393aceb2482c9a3e329ee'
'fba95bf1857ce6bf863e13a1ab73f584'
'c072b17032e80debc6a8626299245d46'
@@ -44,7 +44,7 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067'
'f36222e7ce20c8e4dc27376f9be60f6c'
'670931649c60fcb3ef2e0119ed532bd4'
'8a71abc4224f575008f974a099b5cf6f'
- '8436bee363b959651d12eeb21bf0ec23')
+ '00c97c232129ecd16c739b0da0de87ce')
if [ "$CARCH" != "mips64el" ]; then
# Don't use the Loongson-specific patches on non-mips64el arches.
unset source[${#source[@]}-1]
diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install
index dc9b9e2d1..df16319ea 100644
--- a/libre/linux-libre-lts/linux-libre-lts.install
+++ b/libre/linux-libre-lts/linux-libre-lts.install
@@ -2,7 +2,7 @@
# arg 2: the old package version
KERNEL_NAME=-lts
-KERNEL_VERSION=3.0.62-1-LIBRE-LTS
+KERNEL_VERSION=3.0.63-1-LIBRE-LTS
# set a sane PATH to ensure that critical utils like depmod will be found
export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD
index d3c01f28c..74216fe4c 100644
--- a/libre/linux-libre-tools/PKGBUILD
+++ b/libre/linux-libre-tools/PKGBUILD
@@ -3,12 +3,17 @@
# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
pkgbase=linux-libre-tools
-pkgname=('libtraceevent-libre' 'perf-libre' 'cpupower-libre' 'x86_energy_perf_policy-libre' 'usbip-libre')
+pkgname=('linux-libre-tools-meta'
+ 'libtraceevent-libre'
+ 'perf-libre'
+ 'cpupower-libre'
+ 'x86_energy_perf_policy-libre'
+ 'usbip-libre')
_basekernel=3.7
-#_sublevel=1
-#pkgver=${_basekernel}.${_sublevel}
-pkgver=${_basekernel}
-pkgrel=5
+_sublevel=6
+_pkgver=$_basekernel.$_sublevel
+pkgver=$_basekernel
+pkgrel=7
license=('GPL2')
arch=('i686' 'x86_64' 'mips64el')
url='http://linux-libre.fsfla.org/'
@@ -23,13 +28,14 @@ makedepends+=('pciutils')
# usbip-libre deps
makedepends+=('glib2' 'sysfsutils')
groups=("$pkgbase")
-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"
+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"
'cpupower.default'
'cpupower.systemd'
'cpupower.service'
'usbipd.service')
md5sums=('06bf9601d859531e7378eb43d4ca7dd3'
+ '90b2c4b9a05b108219bd44ac4804db84'
'56883c159381ba89e50ab8ea65efec77'
'7e0710c2f31c1eb1e1417a7972e676b1'
'2450e8ff41b30eb58d43b5fffbfde1f4'
@@ -37,9 +43,11 @@ md5sums=('06bf9601d859531e7378eb43d4ca7dd3'
build() {
# apply stable patching set
- if [ "${_basekernel}" != "${pkgver}" ]; then
+ if (( NOEXTRACT == 0 )) && [[ -e "$srcdir"/patch-$_basekernel-gnu-$_pkgver-gnu ]]; then
msg2 'Applying stable patch set'
- patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu-${pkgver}-gnu"
+ cd linux-$pkgver
+ patch -Np1 -i "$srcdir"/patch-$_basekernel-gnu-$_pkgver-gnu
+ cd ..
fi
msg2 'Build libtraceevent-libre'
@@ -81,6 +89,15 @@ build() {
popd
}
+package_linux-libre-tools-meta() {
+ pkgdesc='Linux kernel tools meta package'
+ groups=()
+ depends=('libtraceevent-libre' 'perf-libre' 'cpupower-libre' 'x86_energy_perf_policy-libre' 'usbip-libre')
+ replaces=('linux-tools-meta')
+ conflicts=('linux-tools-meta')
+ provides=("linux-tools-meta=$pkgver")
+}
+
package_libtraceevent-libre() {
pkgdesc='Linux kernel trace event library'
depends=('glibc')
@@ -109,6 +126,10 @@ package_perf-libre() {
NO_GTK2=1 \
PERF_VERSION=$pkgver-$pkgrel \
install install-man
+ # move completion in new directory
+ cd "$pkgdir"
+ install -Dm644 usr/etc/bash_completion.d/perf usr/share/bash-completion/perf
+ rm -r usr/etc
}
package_cpupower-libre() {
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index b37ac7027..0f7f9fa06 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -10,10 +10,10 @@
pkgbase=linux-libre # Build stock -LIBRE kernel
#pkgbase=linux-libre-custom # Build kernel with a different name
_basekernel=3.7
-_sublevel=6
+_sublevel=7
pkgver=${_basekernel}.${_sublevel}
pkgrel=1
-_lxopkgver=${_basekernel}.5 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.6 # nearly always the same as pkgver
arch=('i686' 'x86_64' 'mips64el')
url="http://linux-libre.fsfla.org/"
license=('GPL2')
@@ -32,7 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
'fat-3.6.x.patch'
"http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
md5sums=('06bf9601d859531e7378eb43d4ca7dd3'
- '90b2c4b9a05b108219bd44ac4804db84'
+ '6645c512b49498f17183298ab1ae98f2'
'53c782740eb3ddf875ad98c31c1bf213'
'71a6f703cb0bee098a76ea42d5836d06'
'e49ac236dfeef709f91a3d993ea7b62c'
@@ -41,7 +41,7 @@ md5sums=('06bf9601d859531e7378eb43d4ca7dd3'
'04b21c79df0a952c22d681dd4f4562df'
'9d3c56a4b999c8bfbd4018089a62f662'
'88d501404f172dac6fcb248978251560'
- '22056cd3540f16d19a4adfc83e055b1f')
+ '7e1f0776614380b36038a2baa1b0f54b')
if [ "$CARCH" != "mips64el" ]; then
# Don't use the Loongson-specific patches on non-mips64el arches.
unset source[${#source[@]}-1]
diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install
index d31ca0b7c..10833c845 100644
--- a/libre/linux-libre/linux-libre.install
+++ b/libre/linux-libre/linux-libre.install
@@ -2,7 +2,7 @@
# arg 2: the old package version
KERNEL_NAME=
-KERNEL_VERSION=3.7.6-1-LIBRE
+KERNEL_VERSION=3.7.7-1-LIBRE
# set a sane PATH to ensure that critical utils like depmod will be found
export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD
index 3210fad9f..63097f460 100644
--- a/libre/lirc-libre/PKGBUILD
+++ b/libre/lirc-libre/PKGBUILD
@@ -6,7 +6,7 @@ _pkgbase=lirc
pkgbase=lirc-libre
pkgname=('lirc-libre' 'lirc-utils-libre')
pkgver=0.9.0
-pkgrel=36
+pkgrel=37
epoch=1
_extramodules=extramodules-3.7-LIBRE
arch=('i686' 'x86_64' 'mips64el')
diff --git a/libre/parabola-keyring/PKGBUILD b/libre/parabola-keyring/PKGBUILD
index 937332360..287e6c311 100644
--- a/libre/parabola-keyring/PKGBUILD
+++ b/libre/parabola-keyring/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: André Silva <emulatorman@lavabit.com>
pkgname=parabola-keyring
-pkgver=20130205
+pkgver=$(LC_ALL=C date -u +%Y%m%d)
pkgrel=1
pkgdesc='Parabola GNU/Linux-libre PGP keyring'
arch=('any')
diff --git a/libre/tp_smapi-libre/PKGBUILD b/libre/tp_smapi-libre/PKGBUILD
index 594e6e98b..86e933e40 100644
--- a/libre/tp_smapi-libre/PKGBUILD
+++ b/libre/tp_smapi-libre/PKGBUILD
@@ -11,7 +11,7 @@
_pkgname=tp_smapi
pkgname=tp_smapi-libre
pkgver=0.41
-pkgrel=13
+pkgrel=14
pkgdesc="Modules for ThinkPad's SMAPI functionality (built for the linux-libre kernel package)"
arch=('i686' 'x86_64' 'mips64el')
url='https://github.com/evgeni/tp_smapi'
diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD
index cfbe70292..a9e23cc0a 100644
--- a/libre/vhba-module-libre/PKGBUILD
+++ b/libre/vhba-module-libre/PKGBUILD
@@ -8,7 +8,7 @@ _pkgname=vhba-module
pkgname=vhba-module-libre
pkgver=20120422
_extramodules=extramodules-3.7-LIBRE
-pkgrel=16
+pkgrel=17
pkgdesc="Kernel module that emulates SCSI devices (built for the linux-libre kernel package)"
arch=('i686' 'x86_64' 'mips64el')
url="http://cdemu.sourceforge.net/"
diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD
index 828e9e6aa..329ee26c4 100644
--- a/libre/virtualbox-libre-modules/PKGBUILD
+++ b/libre/virtualbox-libre-modules/PKGBUILD
@@ -1,13 +1,13 @@
# $Id$
# Maintainer: Ionut Biru <ibiru@archlinux.org>
-# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
+# Maintainer: Sébastien Luttringer <seblu@archlinux.org>
# Maintainer (Parabola): Jorge López <jorginho@lavabit.com>
# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
pkgbase=virtualbox-libre-modules
pkgname=('virtualbox-libre-host-modules' 'virtualbox-libre-guest-modules')
pkgver=4.2.6
-pkgrel=5
+pkgrel=6
arch=('i686' 'x86_64')
url='http://virtualbox.org'
license=('GPL')
diff --git a/libre/your-freedom/your-freedom.install b/libre/your-freedom/your-freedom.install
index 0786adabf..efa16e756 100644
--- a/libre/your-freedom/your-freedom.install
+++ b/libre/your-freedom/your-freedom.install
@@ -4,11 +4,11 @@ pre_install() {
== IMPORTANT NOTICE ==
This package will help you identify unfree packages that are installed
- on your system at the time of it's installation, as well as protecting
+ on your system at the time of its installation, as well as protecting
you from (accidentally) installing them.
Also, if any other unfree package is identified, later updates will ask
- you for it's removal.
+ you for its removal.
Have in mind that, if you want to retain certain unfree packages
installed on your system, you'll have to remove your-freedom :)
@@ -21,7 +21,7 @@ pre_install() {
Please report back to the Parabola Project on the usual channels:
* https://labs.parabola.nu
* irc://freenode.net/#parabola
- * mailto:dev@list.parabolagnulinux.org
+ * mailto:dev@lists.parabolagnulinux.org
EOM
}