summaryrefslogtreecommitdiff
path: root/libre
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2013-05-30 11:55:09 +0200
committerMichał Masłowski <mtjm@mtjm.eu>2013-05-30 11:55:09 +0200
commitb0fdec08ea3b6e162b710ca98b0dd56f9ae105eb (patch)
tree376cc5751d9a587815d7270caa61070f38832766 /libre
parent8abbf69cf497489fb7a0ac3538cb6975285486b7 (diff)
parent76ee9007095484a113d1856786b81e2d2fae8202 (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: community/apcupsd/PKGBUILD community/bmp-musepack/PKGBUILD community/bmp-wma/PKGBUILD community/bonnie++/PKGBUILD community/cantata/PKGBUILD community/checkinstall/PKGBUILD community/chrootuid/PKGBUILD community/compiz-bcop/PKGBUILD community/compiz-fusion-plugins-extra/PKGBUILD community/compiz-fusion-plugins-main/PKGBUILD community/compiz/PKGBUILD community/compizconfig-backend-gconf/PKGBUILD community/compizconfig-python/PKGBUILD community/ekg2/PKGBUILD community/emerald/PKGBUILD community/fbgetty/PKGBUILD community/flumotion/PKGBUILD community/leafnode/PKGBUILD community/libcompizconfig/PKGBUILD community/libdnet/PKGBUILD community/libee/PKGBUILD community/libtxc_dxtn/PKGBUILD community/linux-tools/PKGBUILD community/openntpd/PKGBUILD community/osiris/PKGBUILD community/perl-package-stash-xs/PKGBUILD community/perl-params-util/PKGBUILD community/procstatd/PKGBUILD community/scponly/PKGBUILD community/sniffit/PKGBUILD community/synergy/PKGBUILD community/turbojpeg/PKGBUILD community/unbound/PKGBUILD community/uucp/PKGBUILD core/gawk/PKGBUILD core/ifenslave/PKGBUILD core/jfsutils/PKGBUILD core/openldap/PKGBUILD core/rfkill/PKGBUILD core/systemd/PKGBUILD core/wireless_tools/PKGBUILD core/xinetd/PKGBUILD extra/avahi/PKGBUILD extra/calligra/PKGBUILD extra/clutter-gst/PKGBUILD extra/flac/PKGBUILD extra/hddtemp/PKGBUILD extra/libbluray/PKGBUILD extra/libdmx/PKGBUILD extra/libfs/PKGBUILD extra/libjpeg-turbo/PKGBUILD extra/libtiff/PKGBUILD extra/libxau/PKGBUILD extra/libxfixes/PKGBUILD extra/licq/PKGBUILD extra/mariadb/PKGBUILD extra/mesa/PKGBUILD extra/perl-guard/PKGBUILD extra/perl-template-toolkit/PKGBUILD extra/pidgin/PKGBUILD extra/pigeonhole/PKGBUILD extra/poppler/PKGBUILD extra/postgresql/PKGBUILD extra/python-geoip/PKGBUILD extra/python/PKGBUILD extra/samba/PKGBUILD extra/sqlite/PKGBUILD extra/vde2/PKGBUILD extra/vim/PKGBUILD extra/vlc/PKGBUILD extra/wireshark/PKGBUILD extra/xfce4-dict/PKGBUILD libre/libquicktime-libre/PKGBUILD libre/xscreensaver-libre/PKGBUILD
Diffstat (limited to 'libre')
-rw-r--r--libre/bbswitch-libre/PKGBUILD2
-rw-r--r--libre/blender-libre/PKGBUILD14
-rw-r--r--libre/calibre-libre/PKGBUILD13
-rw-r--r--libre/cdfs-libre/PKGBUILD4
-rw-r--r--libre/claws-mail-libre/PKGBUILD131
-rw-r--r--libre/cups-filters-libre/PKGBUILD9
-rw-r--r--libre/cups-filters-libre/cups-browsed.service2
-rw-r--r--libre/grub/0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch50
-rw-r--r--libre/grub/PKGBUILD50
-rw-r--r--libre/grub/grub-2.00-fix-docs.patch21
-rw-r--r--libre/grub/grub.cfg4
-rw-r--r--libre/hexchat-libre/PKGBUILD8
-rw-r--r--libre/icedove-l10n/PKGBUILD2
-rw-r--r--libre/icedove-libre/PKGBUILD11
-rw-r--r--libre/iceweasel-l10n/PKGBUILD14
-rw-r--r--libre/iceweasel-libre/PKGBUILD17
-rw-r--r--libre/iceweasel-libre/libre.patch45
-rw-r--r--libre/iceweasel-libre/replace-urls.txt26
-rw-r--r--libre/libquicktime-libre/PKGBUILD16
-rw-r--r--libre/liferea-libre/PKGBUILD6
-rw-r--r--libre/linux-libre-kmod-alx/PKGBUILD4
-rw-r--r--libre/linux-libre-lts-kmod-alx/PKGBUILD4
-rw-r--r--libre/linux-libre-lts/PKGBUILD10
-rw-r--r--libre/linux-libre-lts/linux-libre-lts.install2
-rw-r--r--libre/linux-libre-tools/PKGBUILD4
-rw-r--r--libre/linux-libre/PKGBUILD14
-rw-r--r--libre/linux-libre/config.i68616
-rw-r--r--libre/linux-libre/config.x86_6415
-rw-r--r--libre/linux-libre/linux-libre.install2
-rw-r--r--libre/lirc-libre/PKGBUILD10
-rw-r--r--libre/lirc-libre/lirc.service2
-rw-r--r--libre/lirc-libre/lircm.service2
-rw-r--r--libre/mcomix-libre/PKGBUILD4
-rw-r--r--libre/mcomix-libre/mcomix.install14
-rw-r--r--libre/mplayer-libre/PKGBUILD30
-rw-r--r--libre/mplayer-libre/subreader-fix-srt-parsing.patch60
-rw-r--r--libre/mplayer-vaapi-libre/PKGBUILD8
-rw-r--r--libre/mplayer-vaapi-libre/subreader-fix-srt-parsing.patch58
-rw-r--r--libre/ogre-libre/PKGBUILD4
-rw-r--r--libre/parabola-xdg-menu/PKGBUILD10
-rw-r--r--libre/rp-pppoe-libre/PKGBUILD8
-rw-r--r--libre/rp-pppoe-libre/adsl.service4
-rw-r--r--libre/texlive-bin-libre/PKGBUILD4
-rw-r--r--libre/tp_smapi-libre/PKGBUILD4
-rwxr-xr-xlibre/unar/PKGBUILD6
-rw-r--r--libre/vhba-module-libre/PKGBUILD4
-rw-r--r--libre/virtualbox-libre-modules/PKGBUILD4
-rwxr-xr-xlibre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install2
-rwxr-xr-xlibre/virtualbox-libre-modules/virtualbox-libre-host-modules.install2
-rw-r--r--libre/virtualbox-libre/PKGBUILD2
-rw-r--r--libre/virtualbox-libre/libre.patch48
-rw-r--r--libre/xchat-libre/PKGBUILD16
-rw-r--r--libre/xscreensaver-libre/PKGBUILD26
-rw-r--r--libre/xscreensaver-libre/libre.patch112
54 files changed, 433 insertions, 527 deletions
diff --git a/libre/bbswitch-libre/PKGBUILD b/libre/bbswitch-libre/PKGBUILD
index 31997eb35..fe5469dd0 100644
--- a/libre/bbswitch-libre/PKGBUILD
+++ b/libre/bbswitch-libre/PKGBUILD
@@ -7,7 +7,7 @@ _pkgname=bbswitch
pkgname=bbswitch-libre
pkgver=0.6
_extramodules=extramodules-3.9-LIBRE # Don't forget to update bbswitch.install
-pkgrel=7
+pkgrel=8
pkgdesc="Kernel module allowing to switch dedicated graphics card on Optimus laptops (built for the linux-libre kernel package)"
arch=('i686' 'x86_64' 'mips64el')
url=("http://github.com/Bumblebee-Project/bbswitch")
diff --git a/libre/blender-libre/PKGBUILD b/libre/blender-libre/PKGBUILD
index a82766f1d..f226b76fd 100644
--- a/libre/blender-libre/PKGBUILD
+++ b/libre/blender-libre/PKGBUILD
@@ -10,10 +10,11 @@ else
pkgname=blender-libre
_spndesc=''
fi
-epoch=7
-pkgver=2.67
+epoch=8
+pkgver=2.67a
+_jpgver=1.5
_pyver=3.3
-pkgrel=2
+pkgrel=1
pkgdesc="Fully integrated 3D graphics creation suite, without nonfree povray and cuda support$_spndesc"
arch=(
i686
@@ -58,7 +59,7 @@ conflicts=${_pkgname%-$_pkgflag}
replaces=${_pkgname%-$_pkgflag}
install=$_pkgname.install
source=http://download.${_pkgname%-$_pkgflag}.org/source/${_pkgname%-$_pkgflag}-$pkgver.tar.gz
-sha512sums=678ff15b4c7aa5695ac31189c2532d959867dfd003d101a52fc8e294b2d7bc5a4699844db9fa6cc6f5e825aa5ba2da37cec0dc56bfd2686957eca075bf935f44
+sha512sums=1336ed00ab51c581ab5b8ef6ace04b3684290b287745de3260e4072e3527501bf62472057c4c521533678b2529b7d0c2dca93d0ca3854e29d82443a78d5c4061
prepare() {
mkdir cd $srcdir/${_pkgname%-$_pkgflag}-$pkgver/build
@@ -67,12 +68,13 @@ prepare() {
build() {
cd $srcdir/${_pkgname%-$_pkgflag}-$pkgver/build
- [[ $CARCH != x86_64 ]] && DSUPPORT_SSE2_BUILD='-DSUPPORT_SSE2_BUILD=OFF'
+ [[ $CARCH == i686 ]] && DSUPPORT_SSE2_BUILD='-DSUPPORT_SSE2_BUILD=OFF'
setarch $CARCH cmake ..\
-DCMAKE_BUILD_TYPE=Release\
-DCMAKE_INSTALL_PREFIX=/usr\
-DOPENIMAGEIO_ROOT_DIR=/usr\
+ -DOPENJPEG_INCLUDE_DIR=/usr/include/openjpeg-$_jpgver\
-DPYTHON_INCLUDE_DIRS=/usr/include/python${_pyver}m\
-DPYTHON_LIBPATH=/usr/lib\
-DPYTHON_LIBRARY=python${_pyver}m\
@@ -85,7 +87,7 @@ build() {
-DWITH_CYCLES_OSL=ON\
-DWITH_FFTW3=ON\
-DWITH_GAMEENGINE=ON\
- -DWITH_IMAGE_REDCODE=OFF\
+ -DWITH_IMAGE_REDCODE=ON\
-DWITH_INSTALL_PORTABLE=OFF\
-DWITH_JACK=ON\
-DWITH_MOD_OCEANSIM=ON\
diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD
index 51f0a0c0a..f7dfe3489 100644
--- a/libre/calibre-libre/PKGBUILD
+++ b/libre/calibre-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 91009 2013-05-17 10:26:19Z jelle $
+# $Id: PKGBUILD 91579 2013-05-24 14:55:19Z dwallace $
# 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=0.9.31
+pkgver=0.9.32
pkgrel=1
pkgdesc="Ebook management application, with unar support included and nonfree fonts removed"
arch=('i686' 'x86_64' 'mips64el')
@@ -30,13 +30,13 @@ install=calibre.install
source=("http://calibre-ebook.googlecode.com/files/${_pkgname}-${pkgver}.tar.xz"
'desktop_integration.patch'
'calibre-mount-helper')
-md5sums=('19abde7fd5a065cadfaee4ed12568d96'
+md5sums=('3b1c89a84872df900b9cfb706027df67'
'8353d1878c5a498b3e49eddef473605f'
'675cd87d41342119827ef706055491e7')
-build() {
- cd "${srcdir}/${_pkgname}"
+prepare(){
+ cd "${srcdir}/${_pkgname}"
#rm -rf src/{cherrypy,pyPdf}
rm -rf src/cherrypy
rm -rf resources/${pkgname}-portable.*
@@ -47,7 +47,10 @@ build() {
sed -i -e 's:\(#!/usr/bin/env[ ]\+python$\|#![ ]/usr/bin/env[ ]\+python$\|#!/usr/bin/python$\):\12:g' \
$(find . -regex ".*.py\|.*.recipe")
+}
+build() {
+ cd "${srcdir}/${_pkgname}"
# Remove nonfree fonts
cd resources/fonts; \
rm prs500/tt0003m_.ttf; ln -s ../liberation/LiberationSans-Regular.ttf prs500/tt0003m_.ttf; \
diff --git a/libre/cdfs-libre/PKGBUILD b/libre/cdfs-libre/PKGBUILD
index f2138e86a..8ea0dbba7 100644
--- a/libre/cdfs-libre/PKGBUILD
+++ b/libre/cdfs-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 90185 2013-05-08 10:46:15Z tpowa $
+# $Id: PKGBUILD 91714 2013-05-26 15:39:48Z tpowa $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: J. Santiago Hirschfeld <jsantiagoh@yahoo.com.ar>
# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -7,7 +7,7 @@ _pkgname=cdfs
pkgname=cdfs-libre
pkgver=2.6.27
_extramodules=extramodules-3.9-LIBRE # Don't forget to update cdfs.install
-pkgrel=44
+pkgrel=45
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/"
diff --git a/libre/claws-mail-libre/PKGBUILD b/libre/claws-mail-libre/PKGBUILD
index ee7019130..e37ffe283 100644
--- a/libre/claws-mail-libre/PKGBUILD
+++ b/libre/claws-mail-libre/PKGBUILD
@@ -2,95 +2,76 @@
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
-pkgbase=claws-mail
pkgname=claws-mail-libre
-pkgflag=-libre
-pkgver=3.9.0
-pkgrel=2
+_pkgflag=libre
+_pkgname=${pkgname%-$_pkgflag}
+pkgver=3.9.1
+pkgrel=3
pkgdesc='A GTK+ based e-mail client, without nonfree PalmOS handheld devices support'
-arch=(
- i686
- x86_64
- mips64el
-)
-license=GPL3
-url="http://www.$pkgbase.org"
-depends=(
- db
- dbus-glib
- desktop-file-utils
- enchant
- gnutls
- gpgme
- gtk2
- hicolor-icon-theme
- 'libetpan>=1.1'
- libsm
- startup-notification
-)
-makedepends=(
- bogofilter
- compface
- spamassassin
-)
-[ "$CARCH" != "mips64el" ] && makedepends+=(valgrind)
-optdepends=(
- 'python2: needed for some tools'
- 'perl: needed for some tools'
- 'spamassassin: adds support for spamfiltering'
- 'bogofilter: adds support for spamfiltering'
-)
-provides=(
- claws
- $pkgbase=$pkgver
-)
-conflicts=(
- $pkgbase
-)
-replaces=(
- $pkgbase
- sylpheed-claws
-)
-options=(
- '!libtool'
-)
-install=$pkgbase.install
-source=(
- http://downloads.sourceforge.net/sourceforge/sylpheed-claws/$pkgbase-$pkgver.tar.bz2
-)
-md5sums=(
- 4c5ac7b21f0ed17d0f6404124c2229a4
-)
+arch=('i686' 'x86_64' 'mips64el')
+license=('GPL3')
+url="http://www.$_pkgname.org"
+depends=('gtk2' 'gnutls' 'startup-notification' 'enchant'
+ 'gpgme' 'libetpan>=1.1' 'libsm' 'db' 'dbus-glib' 'hicolor-icon-theme' 'desktop-file-utils')
+makedepends=('compface' 'spamassassin' 'bogofilter' 'valgrind'
+ # dependencies for plugins
+ 'libsoup' 'libgdata' 'webkitgtk2' 'libnotify' 'libcanberra' 'poppler-glib' 'pygtk')
+ #'libchamplain' needed for geolocation plugin, disabled for now - most time it's not compatible with current gnome releases
+optdepends=('python2: needed for some tools and python plugin'
+ 'perl: needed for some tools and perl plugin'
+ 'spamassassin: adds support for spamfiltering'
+ 'bogofilter: adds support for spamfiltering'
+ 'libnotify: for notification plugin'
+ 'libcanberra: for notification plugin'
+ 'dbus: for notification plugin'
+ 'libxml2: for gtkhtml2_viewer and rssyl plugins'
+ 'curl: for gtkhtml2_viewer, vcalendar, rssyl and spamreport plugins'
+ 'libarchive: for archive plugin and various other plugins'
+ 'libytnef: for tnef_parse plugin'
+ 'webkitgtk2: for the fancy webkit html plugin'
+ 'libsoup: for the fancy webkit html plugin'
+ 'libgdata: for gdata plugin'
+ 'poppler-glib: for pdf viewer plugin'
+ 'ghostscript: for pdf viewer plugin')
+replaces=("$_pkgname" "sylpheed-claws" "$_pkgname-extra-plugins")
+conflicts=("$_pkgname" "$_pkgname-extra-plugins")
+provides=("$_pkgname=$pkgver" 'claws')
+options=(!libtool)
+install=$_pkgname.install
+source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/$_pkgname-$pkgver.tar.bz2{,.asc})
+md5sums=('8adc734912ff1b83545cb12850100473'
+ 'SKIP')
build() {
- cd $srcdir/$pkgbase-$pkgver
+ cd $srcdir/$_pkgname-$pkgver
+ # fixes for python2
+ export PYTHON="/usr/bin/python2"
sed -i 's@^#!.*python.*@#!/usr/bin/python2@' tools/*.py
+ sed -i 's:python -c:python2 -c:g' configure
- ./configure --prefix=/usr\
- --disable-dillo-viewer-plugin\
- --disable-static\
- --enable-bogofilter-plugin\
- --enable-crash-dialog\
- --enable-enchant\
- --enable-gnutls\
- --enable-jpilot\
- --enable-ldap\
- --enable-pgpmime-plugin\
- --enable-spamassassin-plugin
-
- make
+ setarch $CARCH ./configure --prefix=/usr --disable-static \
+ --enable-enchant \
+ --enable-gnutls \
+ --enable-ldap \
+ --enable-crash-dialog \
+ --enable-pgpmime-plugin \
+ --enable-spamassassin-plugin \
+ --enable-bogofilter-plugin \
+ --enable-jpilot \
+ #--help
+ setarch $CARCH make
}
package() {
- cd $srcdir/$pkgbase-$pkgver
- make DESTDIR=$pkgdir install
+ cd $srcdir/$_pkgname-$pkgver
+ setarch $CARCH make DESTDIR=$pkgdir install
# build and install extra tools
cd tools
- make
+ setarch $CARCH make
# all executables and .conf files ; only top directory
find -maxdepth 1 -type f -and -perm /111 -or -name '*.conf' | while read i ; do
- install -D -m755 $i $pkgdir/usr/lib/$pkgbase/tools/$i
+ install -D -m755 $i $pkgdir/usr/lib/$_pkgname/tools/$i
done
}
diff --git a/libre/cups-filters-libre/PKGBUILD b/libre/cups-filters-libre/PKGBUILD
index fc3ed3b1f..d29becae5 100644
--- a/libre/cups-filters-libre/PKGBUILD
+++ b/libre/cups-filters-libre/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 183882 2013-04-29 10:46:59Z foutrelis $
+# $Id: PKGBUILD 185774 2013-05-18 15:32:58Z andyrtr $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
pkgname=cups-filters-libre
_pkgname=cups-filters
pkgver=1.0.34
-pkgrel=3
+pkgrel=4
pkgdesc="OpenPrinting CUPS Filters, without foomatic-db-nonfree recommendation"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.linuxfoundation.org/collaborate/workgroups/openprinting"
license=('GPL')
-depends=('lcms2' 'poppler>=0.22.3' 'qpdf>=4.0.0')
+depends=('lcms2' 'poppler>=0.22.4' 'qpdf>=4.0.0')
makedepends=('ghostscript' 'ttf-dejavu') # ttf-dejavu for make check
optdepends=('ghostscript: for non-PostScript printers to print with CUPS to convert PostScript to raster images'
'foomatic-db: drivers use Ghostscript to convert PostScript to a printable form directly'
@@ -20,7 +20,7 @@ options=(!libtool)
source=(http://www.openprinting.org/download/cups-filters/$_pkgname-$pkgver.tar.gz
cups-browsed.service)
md5sums=('fea9cad6bbb14ab0635243ed5d1d5c77'
- '4c9f97eae201798000483c4e7109e690')
+ '9ef68d7c2a84713fd421f4e87dec0a6e')
replaces=("${_pkgname}")
conflicts=("${_pkgname}")
provides=("${_pkgname}=${pkgver}")
@@ -29,6 +29,7 @@ build() {
cd "$srcdir/$_pkgname-$pkgver"
./configure --prefix=/usr \
--sysconfdir=/etc \
+ --sbindir=/usr/bin \
--with-rcdir=no \
--enable-avahi \
--with-browseremoteprotocols=DNSSD,CUPS \
diff --git a/libre/cups-filters-libre/cups-browsed.service b/libre/cups-filters-libre/cups-browsed.service
index 144956c7f..07b342d62 100644
--- a/libre/cups-filters-libre/cups-browsed.service
+++ b/libre/cups-filters-libre/cups-browsed.service
@@ -4,7 +4,7 @@ After=cups.service avahi-daemon.service
Wants=cups.service avahi-daemon.service
[Service]
-ExecStart=/usr/sbin/cups-browsed
+ExecStart=/usr/bin/cups-browsed
[Install]
WantedBy=multi-user.target
diff --git a/libre/grub/0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch b/libre/grub/0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch
new file mode 100644
index 000000000..e043633af
--- /dev/null
+++ b/libre/grub/0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch
@@ -0,0 +1,50 @@
+From d09689a5a2863043d007c1acb9bf0a8d1d3b776d Mon Sep 17 00:00:00 2001
+From: Colin Watson <cjwatson@ubuntu.com>
+Date: Fri, 28 Dec 2012 06:43:35 +0000
+Subject: [PATCH 069/364] Backport gnulib fixes for C11. Fixes Savannah bug
+ #37738.
+
+* grub-core/gnulib/stdio.in.h (gets): Warn on use only if
+HAVE_RAW_DECL_GETS.
+* m4/stdio_h.m4 (gl_STDIO_H): Check for gets.
+---
+ ChangeLog | 8 ++++++++
+ grub-core/gnulib/stdio.in.h | 6 ++++--
+ m4/stdio_h.m4 | 2 +-
+ 3 files changed, 13 insertions(+), 3 deletions(-)
+
+diff --git a/grub-core/gnulib/stdio.in.h b/grub-core/gnulib/stdio.in.h
+index 80b9dbf..a8b00c6 100644
+--- a/grub-core/gnulib/stdio.in.h
++++ b/grub-core/gnulib/stdio.in.h
+@@ -138,10 +138,12 @@ _GL_WARN_ON_USE (fflush, "fflush is not always POSIX compliant - "
+ #endif
+
+ /* It is very rare that the developer ever has full control of stdin,
+- so any use of gets warrants an unconditional warning. Assume it is
+- always declared, since it is required by C89. */
++ so any use of gets warrants an unconditional warning; besides, C11
++ removed it. */
+ #undef gets
++#if HAVE_RAW_DECL_GETS
+ _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
++#endif
+
+ #if @GNULIB_FOPEN@
+ # if @REPLACE_FOPEN@
+diff --git a/m4/stdio_h.m4 b/m4/stdio_h.m4
+index f5650cd..8458bec 100644
+--- a/m4/stdio_h.m4
++++ b/m4/stdio_h.m4
+@@ -37,7 +37,7 @@ AC_DEFUN([gl_STDIO_H],
+ dnl corresponding gnulib module is not in use, and which is not
+ dnl guaranteed by C89.
+ gl_WARN_ON_USE_PREPARE([[#include <stdio.h>
+- ]], [dprintf fpurge fseeko ftello getdelim getline popen renameat
++ ]], [dprintf fpurge fseeko ftello getdelim getline gets popen renameat
+ snprintf tmpfile vdprintf vsnprintf])
+ ])
+
+--
+1.8.1.4
+
diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD
index b94aed44c..3969d713a 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.2
+pkgrel=2
url="https://www.gnu.org/software/grub/"
arch=('i686' 'x86_64')
license=('GPL3')
@@ -24,33 +24,22 @@ source=("http://ftp.gnu.org/gnu/grub/grub-${pkgver}.tar.xz"
'grub.default'
'grub.cfg'
'20_memtest86+'
- 'grub_bzr_export.sh')
+ 'grub_bzr_export.sh'
+ '0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch'
+ 'grub-2.00-fix-docs.patch')
noextract=("grub2_extras_lua_r${_grub_lua_ver}.tar.xz"
"grub2_extras_ntldr-img_r${_grub_ntldr_ver}.tar.xz"
"grub2_extras_915resolution_r${_grub_915_ver}.tar.xz")
-sha1sums=('274d91e96b56a5b9dd0a07accff69dbb6dfb596b'
- '89290031b974780c6df76893836d2477d4add895'
- 'eb4b35b4c36b64f9405cbcbc538cb205171c1c0a'
- 'd5ae2efec25616028a9d89e98b6e454f1c4c415f'
- '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}"
- ## Apply Parabola specific fixes to enable grub-mkconfig detect Libre kernels and initramfs
+ ## Apply Parabola specific fixes to enable grub-mkconfig detect kernels and initramfs
patch -Np1 -i "${srcdir}/parabola_grub_mkconfig_fixes.patch"
echo
@@ -76,7 +65,13 @@ _build_grub-common_and_bios() {
## Requires python2
# sed 's|python |python2 |g' -i "${srcdir}/grub_bios-${pkgver}/autogen.sh"
- ## start the actual build process
+ # fix compiling with gcc48
+ patch -Np1 -i ${srcdir}/0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch
+
+ #fix docs compiling
+ patch -Np1 -i ${srcdir}/grub-2.00-fix-docs.patch
+
+ ## start the actual build process
cd "${srcdir}/grub_bios-${pkgver}"
./autogen.sh
echo
@@ -94,7 +89,7 @@ _build_grub-common_and_bios() {
--enable-grub-mount \
--prefix="/usr" \
--bindir="/usr/bin" \
- --sbindir="/usr/sbin" \
+ --sbindir="/usr/bin" \
--mandir="/usr/share/man" \
--infodir="/usr/share/info" \
--datarootdir="/usr/share" \
@@ -122,6 +117,12 @@ _build_grub-efi-i386() {
bsdtar xf "${srcdir}/grub2_extras_lua_r${_grub_lua_ver}.tar.xz" \
-C "${srcdir}/grub_efi-${pkgver}/grub-extras"
+ # fix compiling with gcc48
+ patch -Np1 -i ${srcdir}/0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch
+
+ #fix docs compiling
+ patch -Np1 -i ${srcdir}/grub-2.00-fix-docs.patch
+
cd "${srcdir}/grub_efi-${pkgver}"
./autogen.sh
echo
@@ -139,7 +140,7 @@ _build_grub-efi-i386() {
--enable-grub-mount \
--prefix="/usr" \
--bindir="/usr/bin" \
- --sbindir="/usr/sbin" \
+ --sbindir="/usr/bin" \
--mandir="/usr/share/man" \
--infodir="/usr/share/info" \
--datarootdir="/usr/share" \
@@ -252,3 +253,14 @@ package_grub-efi-i386() {
rm -f "${pkgdir}/usr/lib/grub/i386-efi"/{kernel.exec,gdb_grub,gmodule.pl} || true
}
+md5sums=('a1043102fbc7bcedbf53e7ee3d17ab91'
+ '704ea9f250b6137f05fa0197fd07053a'
+ '77f7d5f8ce395663cd7fff4d37099957'
+ 'a80e2b1d3bab778c3b6117d5a698992f'
+ 'c776aaf2cc35488a7c531b59e697470d'
+ '52d374e0194e3f2e39ff7c92ecd58a6c'
+ '255eafb440b8c285b20431366c2d2d27'
+ '9b6358d3de5c4bb95a041ab7c44a21ec'
+ 'f343ed2340ebc86c427873641bb72419'
+ 'ab751d1d8cd3fd47e5ee24d71ecc31ed'
+ '342dd18472a24e5fd252458b24f39a29')
diff --git a/libre/grub/grub-2.00-fix-docs.patch b/libre/grub/grub-2.00-fix-docs.patch
new file mode 100644
index 000000000..0aa481154
--- /dev/null
+++ b/libre/grub/grub-2.00-fix-docs.patch
@@ -0,0 +1,21 @@
+From 40d6b00fa48ae9c1cecf143da5c6061f6ffcb719 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode@redhat.com
+Date: Tue, 12 Mar 2013 15:23:02 -0400
+Subject: [PATCH] Fix docs
+
+I think the doc generation tools got stricter, so fix up the .texi file
+to work.
+
+diff --git a/docs/grub-dev.texi b/docs/grub-dev.texi
+--- a/docs/grub-dev.texi
++++ b/docs/grub-dev.texi
+@@ -1394,8 +1394,8 @@ grub_video_blit_glyph (&glyph, color, 0,
+
+ @node Bitmap API
+ @section Bitmap API
+-@itemize
+ @subsection grub_video_bitmap_create
++@itemize
+ @item Prototype:
+ @example
+ grub_err_t grub_video_bitmap_create (struct grub_video_bitmap **bitmap, unsigned int width, unsigned int height, enum grub_video_blit_format blit_format)
diff --git a/libre/grub/grub.cfg b/libre/grub/grub.cfg
index 7f583e102..0d91ff6bc 100644
--- a/libre/grub/grub.cfg
+++ b/libre/grub/grub.cfg
@@ -78,7 +78,7 @@ set timeout=5
### END /etc/grub.d/00_header ###
### BEGIN /etc/grub.d/10_linux ###
-menuentry 'Parabola GNU/Linux-libre, with Linux-libre core repo kernel' --class parabola --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-core repo kernel-true-ad4103fa-d940-47ca-8506-301d8071d467' {
+menuentry 'Parabola GNU/Linux-libre, with Linux libre kernel' --class parabola --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-core repo kernel-true-ad4103fa-d940-47ca-8506-301d8071d467' {
load_video
set gfxpayload=keep
insmod gzio
@@ -95,7 +95,7 @@ menuentry 'Parabola GNU/Linux-libre, with Linux-libre core repo kernel' --class
echo 'Loading initial ramdisk ...'
initrd /boot/initramfs-linux-libre.img
}
-menuentry 'Parabola GNU/Linux-libre, with Linux libre repo kernel (Fallback initramfs)' --class parabola --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-core repo kernel-fallback-ad4103fa-d940-47ca-8506-301d8071d467' {
+menuentry 'Parabola GNU/Linux-libre, with Linux libre kernel (Fallback initramfs)' --class parabola --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-core repo kernel-fallback-ad4103fa-d940-47ca-8506-301d8071d467' {
load_video
set gfxpayload=keep
insmod gzio
diff --git a/libre/hexchat-libre/PKGBUILD b/libre/hexchat-libre/PKGBUILD
index bab6e70c5..a377c189c 100644
--- a/libre/hexchat-libre/PKGBUILD
+++ b/libre/hexchat-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: PKGBUILD 91125 2013-05-19 21:58:09Z alucryd $
# Maintainer: Maxime Gauduin <alucryd@gmail.com>
# Contributor: TingPing <tingping@tingping.se>
# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -6,8 +6,8 @@
_pkgname=hexchat
pkgname=hexchat-libre
pkgver=2.9.5
-pkgrel=4
-pkgdesc="A popular and easy to use graphical IRC (chat) client, without non-free browser reference (Parabola rebranded)"
+pkgrel=5
+pkgdesc="A popular and easy to use graphical IRC (chat) client, without nonfree browser reference (Parabola rebranded)"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.hexchat.org/"
license=('GPL')
@@ -34,7 +34,7 @@ build() {
# Rebrand to Parabola
sed -i -e 's#ArchLinux#Parabola GNU/Linux-libre#' plugins/sysinfo/parse.c
-# Remove non-free browser references
+# Remove nonfree browser references
patch -p1 -i "${srcdir}/remove-non-free-suggestion.patch"
patch -p1 -i "${srcdir}/no-firefox.patch"
diff --git a/libre/icedove-l10n/PKGBUILD b/libre/icedove-l10n/PKGBUILD
index 7d5c1e691..d9c2c7481 100644
--- a/libre/icedove-l10n/PKGBUILD
+++ b/libre/icedove-l10n/PKGBUILD
@@ -14,7 +14,7 @@ pkgname=($(for lang in ${_langpacks[@]}
pkgrel=1
pkgdesc="Language packs for Debian Icedove."
arch=('any')
-url="http://packages.debian.org/experimental/icedove"
+url="http://packages.debian.org/sid/icedove"
license=('MPL' 'GPL')
depends=("icedove-libre>=$pkgver")
makedepends=('unzip' 'zip')
diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD
index d76893934..8473cadd8 100644
--- a/libre/icedove-libre/PKGBUILD
+++ b/libre/icedove-libre/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer : Márcio Silva <coadde@lavabit.com>
# Maintainer : André Silva <emulatorman@lavabit.com>
-# We're getting this from Debian Experimental
+# We're getting this from Debian Sid
_debname=icedove
_debver=17.0.5
_debrel=2
@@ -15,9 +15,9 @@ 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}"
+url="http://packages.debian.org/sid/${_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-libre' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'quilt')
+makedepends=('unzip-libre' 'zip' 'pkg-config' 'python2' 'python2-virtualenv' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'quilt')
optdepends=('libcanberra: for sound support')
replaces=('thunderbird')
conflicts=('thunderbird')
@@ -88,6 +88,9 @@ prepare() {
# configure script misdetects the preprocessor without an optimization level
# https://bugs.archlinux.org/task/34644
sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure
+
+ # Fix virtualenv path
+ sed -i 's|/usr/share/pyshared/virtualenv.py|/usr/lib/python2.7/site-packages/virtualenv.py|' mozilla/configure
}
build() {
@@ -120,5 +123,5 @@ package() {
ln -sf /usr/lib/mozilla/searchplugins "${pkgdir}/usr/lib/${_pkgname}/searchplugins"
# We don't want the development stuff
- rm -r "${pkgdir}"/usr/{include,lib/$_pkgname-devel,share/idl}
+ rm -r "${pkgdir}"/usr/{include,lib/${_pkgname}-devel,share/idl}
}
diff --git a/libre/iceweasel-l10n/PKGBUILD b/libre/iceweasel-l10n/PKGBUILD
index 3eb6b36b4..3c3d957a4 100644
--- a/libre/iceweasel-l10n/PKGBUILD
+++ b/libre/iceweasel-l10n/PKGBUILD
@@ -37,7 +37,7 @@ do
source+=("${_debrepo}/`debfile ${_debname}`-l10n-$(echo $lang | tr A-Z a-z)_${_debver}-${_debrel}_all.deb")
done
-_path="/usr/lib/iceweasel/extensions"
+_path="/usr/lib/iceweasel/browser/extensions/"
build() {
cd "${srcdir}"
@@ -162,14 +162,4 @@ md5sums=('e88728730ecf9f0f145de5f70e362b15'
'98c7ed17e8fbe4478032a31ad2c2aa07'
'a7c33685d88af8a90a14c874538fa53a'
'9b43e2e557c82a20509f34a54cc42e0f'
- '84e12ebfd749a04adc5b3ace348a06f1'
- '7f11378288e629d63cb04649a234cf1c'
- '1af944e12101d8a279bda6ebf665a767'
- 'd3a7e1dd8186bfcefe973d77214ec9c0'
- '7a12ccf5eee1144bfb61984f811faf66'
- '67407c724be7d200a06912c83a3404d8'
- 'f3c7e564aa585251d8c908e666ce9f64'
- 'ace03ba25a56488ddbf38a656daf6c93'
- '4612b54bc7712d99823515799abf41d9'
- '3eb4be0b553933b0babc582444ecaa6c'
- 'ad78e4e0757bc0d8d956b06b3bae8c17')
+ '84e12ebfd749a04adc5b3ace348a06f1')
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 253572553..eebf10e57 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -22,7 +22,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
_pkgname=iceweasel
pkgname=iceweasel-libre
pkgver=$_debver.$_debrel
-pkgrel=2
+pkgrel=3
pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox."
arch=(i686 x86_64 mips64el)
@@ -50,16 +50,18 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2"
iceweasel-install-dir.patch
vendor.js
shared-libs.patch
+ replace-urls.txt
Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch)
md5sums=('0a7c51bb494463c327af918bae6c4ee4'
'c17121a4ffd40f463e16d7828445d96e'
'e1e903ca91997f18b428c54ef604f27d'
'383e8e2a97a8b13fe56d153adb6878b6'
- '98a433139ffcbf6b3018f18dcaacdb4c'
+ '2930f3bffe0d7a6b9845f8c006821bc2'
'7b9e5996dd9fe0b186a43a297db1c6b5'
'abf5ecb74caa857abb42bcfbb3442d9c'
'0c26941504d3f2abed759221e9bb5de1'
'52e52f840a49eb1d14be1c0065b03a93'
+ 'a8fc4658d45b6bf9350023e5c3f34e56'
'85e67561e0e491cd538ce018dfc2d948')
prepare() {
@@ -84,6 +86,17 @@ prepare() {
patch -Np1 -i "$srcdir/iceweasel-install-dir.patch" # install to /usr/lib/$_pkgname
patch -Np1 -i "$srcdir/shared-libs.patch"
+ # Replace common URLs
+ sed '/^#/d' ../replace-urls.txt | while read -r moz_url gnu_url; do
+ if [[ -n $moz_url ]]; then
+ printf 'liberating: %s -> %s\n' "$moz_url" "$gnu_url"
+ grep -Erl "${moz_url}" \
+ --exclude='*.'{patch,orig,rej} \
+ --exclude-dir={.pc,test,tests,testing} \
+ | xargs -d '\n' --no-run-if-empty sed -ri "s<${moz_url}<${gnu_url}<g"
+ fi
+ done
+
# Patch anything that's left
patch -Np1 -i "$srcdir/libre.patch"
diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch
index 0588fa632..3bb39d215 100644
--- a/libre/iceweasel-libre/libre.patch
+++ b/libre/iceweasel-libre/libre.patch
@@ -1,41 +1,6 @@
diff -ruN mozilla-release.orig/browser/app/profile/firefox.js mozilla-release/browser/app/profile/firefox.js
--- mozilla-release.orig/browser/app/profile/firefox.js 2013-05-11 16:19:20.000000000 -0300
+++ mozilla-release/browser/app/profile/firefox.js 2013-05-18 13:47:28.091097903 -0300
-@@ -37,11 +37,11 @@
- // Preferences for AMO integration
- pref("extensions.getAddons.cache.enabled", true);
- pref("extensions.getAddons.maxResults", 15);
--pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/guid:%IDS%?src=firefox&appOS=%OS%&appVersion=%VERSION%");
--pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/guid:%IDS%?src=firefox&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%");
--pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/search?q=%TERMS%&platform=%OS%&appver=%VERSION%");
--pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=firefox");
--pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/firefox/discovery/pane/%VERSION%/%OS%/%COMPATIBILITY_MODE%");
-+pref("extensions.getAddons.get.url", "https://trisquel.info/browser-plain");
-+pref("extensions.getAddons.getWithPerformance.url", "https://trisquel.info/browser-plain");
-+pref("extensions.getAddons.search.browseURL", "https://trisquel.info/browser-plain");
-+pref("extensions.getAddons.search.url", "https://trisquel.info/browser-plain");
-+pref("extensions.webservice.discoverURL", "https://trisquel.info/browser-plain");
-
- // Blocklist preferences
- pref("extensions.blocklist.enabled", true);
-@@ -64,7 +64,7 @@
- pref("extensions.autoDisableScopes", 3);
-
- // Dictionary download preference
--pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/");
-+pref("browser.dictionaries.download.url", "https://trisquel.info/browser-plain");
-
- // The minimum delay in seconds for the timer to fire.
- // default=2 minutes
-@@ -601,7 +601,7 @@
- pref("accessibility.typeaheadfind.flashBar", 1);
-
- // plugin finder service url
--pref("pfs.datasource.url", "https://pfs.mozilla.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%&appRelease=%APP_RELEASE%");
-+pref("pfs.datasource.url", "http://trisquel.info/sites/pfs.php?mime=%PLUGIN_MIMETYPE%");
-
- // by default we show an infobar message when pages require plugins the user has not installed, or are outdated
- pref("plugins.hide_infobar_for_missing_plugin", false);
@@ -1203,12 +1203,6 @@
// (This is intentionally on the high side; see bug 746055.)
pref("image.mem.max_decoded_image_kb", 256000);
@@ -51,13 +16,13 @@ diff -ruN mozilla-release.orig/browser/app/profile/firefox.js mozilla-release/br
pref("social.toast-notifications.enabled", true);
diff -ruN mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozilla-release/browser/base/content/abouthome/aboutHome.js
--- mozilla-release.orig/browser/base/content/abouthome/aboutHome.js 2013-05-11 16:19:20.000000000 -0300
-+++ mozilla-release/browser/base/content/abouthome/aboutHome.js 2013-05-16 23:09:05.295723370 -0300
++++ mozilla-release/browser/base/content/abouthome/aboutHome.js 2013-05-20 17:49:18.467307120 -0300
@@ -3,69 +3,41 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
const SEARCH_ENGINES = {
- "Google": {
-+ "DuckDuckGo": {
++ "DuckDuckGo HTML": {
image: "data:image/png;base64," +
- "iVBORw0KGgoAAAANSUhEUgAAAEYAAAAcCAYAAADcO8kVAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJ" +
- "bWFnZVJlYWR5ccllPAAADHdJREFUeNrsWQl0VNUZvve9NzNJJpnsIkuEJMoqAVJAodCKoFUsAUFQ" +
@@ -156,17 +121,15 @@ diff -ruN mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozil
}
};
-@@ -75,8 +47,8 @@
+@@ -75,7 +47,7 @@
// * add an entry here in the proper ordering (based on spans)
// The <a/> part of the snippet will be linked to the corresponding url.
const DEFAULT_SNIPPETS_URLS = [
- "http://www.mozilla.com/firefox/features/?WT.mc_ID=default1"
--, "https://addons.mozilla.org/firefox/?src=snippet&WT.mc_ID=default2"
+ "http://packages.debian.org/experimental/iceweasel"
-+, "https://trisquel.info/browser-plain"
+ , "https://www.gnu.org/software/gnuzilla/addons.html"
];
- const SNIPPETS_UPDATE_INTERVAL_MS = 86400000; // 1 Day.
@@ -139,10 +111,6 @@
if (searchEngineInfo.image) {
let logoElt = document.getElementById("searchEngineLogo");
diff --git a/libre/iceweasel-libre/replace-urls.txt b/libre/iceweasel-libre/replace-urls.txt
index 5f8c88e9e..fc13e32fb 100644
--- a/libre/iceweasel-libre/replace-urls.txt
+++ b/libre/iceweasel-libre/replace-urls.txt
@@ -2,24 +2,24 @@
# These are whitespace-separated EREs, comments are lines starting with '#'
https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/dictionaries/?(\?[^"']*)? https://parabolagnulinux.org/packages/\?repo=Extra\&q=hunspell-
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/plugins/?(\?[^"']*)? https://trisquel.info/browser-plain
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/personas/?(\?[^"']*)? https://trisquel.info/browser-plain
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/recommended/?(\?[^"']*)? https://trisquel.info/browser-plain
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/search-engines/?(\?[^"']*)? https://trisquel.info/browser-plain
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/search/?(\?[^"']*)? https://trisquel.info/browser-plain
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/themes/?(\?[^"']*)? https://trisquel.info/browser-plain
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[^"']*)?" https://trisquel.info/browser-plain
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[^"']*)?$ https://trisquel.info/browser-plain
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/plugins/?(\?[^"']*)? https://gnuzilla.gnu.org/plugins/
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/personas/?(\?[^"']*)? https://www.gnu.org/software/gnuzilla/addons.html
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/recommended/?(\?[^"']*)? https://www.gnu.org/software/gnuzilla/addons.html
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/search-engines/?(\?[^"']*)? https://www.gnu.org/software/gnuzilla/addons.html#search%20engines
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/search/?(\?[^"']*)? https://www.gnu.org/software/gnuzilla/addons.html
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/themes/?(\?[^"']*)? https://www.gnu.org/software/gnuzilla/addons.html#themes
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[^"']*)?" https://www.gnu.org/software/gnuzilla/addons.html"
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[^"']*)?$ https://www.gnu.org/software/gnuzilla/addons.html
-https://addons.mozilla.org/firefox/collections/mozilla/webdeveloper/ https://trisquel.info/browser-plain
+https://addons.mozilla.org/firefox/collections/mozilla/webdeveloper/ https://www.gnu.org/software/gnuzilla/addons.html
-https?://services\.addons\.mozilla\.org/(%LOCALE%|@AB_CD@|en-US|ru)/([a-zA-Z%-]+)/?(\?[^"']*)? https://trisquel.info/browser-plain
+https?://services\.addons\.mozilla\.org/(%LOCALE%|@AB_CD@|en-US|ru)/([a-zA-Z%-]+)/ https://www.gnu.org/software/gnuzilla/addons.html#bogus-services.\2/
-https?://pfs\.mozilla\.org/plugins/PluginFinderService\.php http://trisquel.info/sites/pfs.php?mime=%PLUGIN_MIMETYPE%
+https?://pfs\.mozilla\.org/plugins/PluginFinderService\.php https://gnuzilla.gnu.org/plugins/PluginFinderService.php
#https?://versioncheck\.addons\.mozilla\.org/update/VersionCheck\.php
#https?://versioncheck-bg\.addons\.mozilla\.org/update/VersionCheck\.php
-"https?://addons\.mozilla\.org/" "https://trisquel.info/browser-plain"
+"https?://addons\.mozilla\.org/" "https://www.gnu.org/software/gnuzilla/addons.html"
# hack: these aren't URLs, per se
-(addonsBrowseAll\.description\s*=.*)addons\.mozilla\.org \1trisquel.info/browser-plain
+(addonsBrowseAll\.description\s*=.*)addons\.mozilla\.org \1gnu.org/software/gnuzilla/addons.html
diff --git a/libre/libquicktime-libre/PKGBUILD b/libre/libquicktime-libre/PKGBUILD
index 0538d1c76..8f08669c1 100644
--- a/libre/libquicktime-libre/PKGBUILD
+++ b/libre/libquicktime-libre/PKGBUILD
@@ -1,18 +1,19 @@
-# $Id$
-# Maintainer: Mateusz Herych <heniekk@gmail.com>
+# $Id: PKGBUILD 91608 2013-05-25 11:33:59Z bpiotrowski $
+# Maintainer: Federico Cinelli <cinelli@aur.archlinux.org>
+# Maintainer: Mateusz Herych <heniekk@gmail.com>
# Contributor (Parabola): Jorge Lopez <jorginho@lavabit.com>
pkgname=libquicktime-libre
_pkgname=libquicktime
pkgver=1.2.4
-pkgrel=2
-pkgdesc="A library for reading and writing quicktime files (no unfree faac support)."
+pkgrel=6
+pkgdesc="A library for reading and writing quicktime files, without nonfree faac support"
arch=('i686' 'x86_64' 'mips64el')
license=('GPL')
url="http://libquicktime.sourceforge.net/"
-depends=('gtk2' 'ffmpeg' 'libxv' 'libgl' 'libxaw' 'x264' 'faad2')
+depends=('gtk2' 'ffmpeg' 'libxv' 'libxaw' 'faad2')
options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/$_pkgname/$_pkgname-$pkgver.tar.gz)
+source=("http://downloads.sourceforge.net/sourceforge/$_pkgname/$_pkgname-$pkgver.tar.gz")
sha256sums=('1c53359c33b31347b4d7b00d3611463fe5e942cae3ec0fefe0d2fd413fd47368')
provides=("$_pkgname=$pkgver")
conflicts=($_pkgname)
@@ -29,7 +30,6 @@ build() {
}
package() {
- cd $srcdir/$_pkgname-$pkgver
+ cd "$srcdir/$_pkgname-$pkgver"
make DESTDIR="$pkgdir" install
}
-
diff --git a/libre/liferea-libre/PKGBUILD b/libre/liferea-libre/PKGBUILD
index 4dc37e942..461c0a3b2 100644
--- a/libre/liferea-libre/PKGBUILD
+++ b/libre/liferea-libre/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 185190 2013-05-11 23:53:58Z eric $
+# $Id: PKGBUILD 186254 2013-05-23 00:44:27Z eric $
# Maintainer: Eric Bélanger <eric@archlinux.org>
# Contributor (Parabola): bitlord
# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
_pkgname=liferea
pkgname=liferea-libre
-pkgver=1.8.13
+pkgver=1.8.14
pkgrel=1
pkgdesc="A desktop news aggregator for online news feeds and weblogs, without nonfree suggestions"
arch=('i686' 'x86_64' 'mips64el')
@@ -21,7 +21,7 @@ options=('!libtool' '!emptydirs')
install=liferea.install
source=(http://downloads.sourceforge.net/sourceforge/liferea/liferea-${pkgver}.tar.bz2
remove-non-free-suggestions.patch)
-sha1sums=('3fd2a441815fa7a18c95d4b863aa4222a95b9f61'
+sha1sums=('980939a9f6483f4e9ca2353ffdba131cb9a88a6e'
'0d68c567c3d37932a49709c58c37c3f138fd19cb')
build() {
diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD
index 4c1daea62..ec385c23a 100644
--- a/libre/linux-libre-kmod-alx/PKGBUILD
+++ b/libre/linux-libre-kmod-alx/PKGBUILD
@@ -1,12 +1,12 @@
# Maintainer: André Silva <emulatorman@lavabit.com>
-_kernver=3.9.2
+_kernver=3.9.4
_kernrel=1
pkgname=('linux-libre-kmod-alx')
_version=v3.9-rc4
_pkgver=3.9-rc4-2-su
pkgver=3.9rc4.2
-pkgrel=3
+pkgrel=5
pkgdesc='Atheros alx ethernet device driver for linux-libre kernel'
arch=('i686' 'x86_64')
url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx'
diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD
index 6e2796cff..7c3e3ad47 100644
--- a/libre/linux-libre-lts-kmod-alx/PKGBUILD
+++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD
@@ -1,12 +1,12 @@
# Maintainer: André Silva <emulatorman@lavabit.com>
-_kernver=3.0.78
+_kernver=3.0.80
_kernrel=1
pkgname=('linux-libre-lts-kmod-alx')
_version=v3.9-rc4
_pkgver=3.9-rc4-2-su
pkgver=3.9rc4.2
-pkgrel=2
+pkgrel=4
pkgdesc='Atheros alx ethernet device driver for linux-libre-lts kernel'
arch=('i686' 'x86_64')
url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx'
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index efd3cd3c8..baab66b5c 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 185334 2013-05-13 12:44:58Z tpowa $
+# $Id: PKGBUILD 186439 2013-05-26 15:23:17Z tpowa $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Maintainer: Thomas Baechler <thomas@archlinux.org>
# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -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=78
+_sublevel=80
pkgver=${_basekernel}.${_sublevel}
pkgrel=1
-_lxopkgver=${_basekernel}.78 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.80 # 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}-gnu1_0loongsonlibre_mipsel.tar.bz2")
md5sums=('f30a562307b6f71204370fcd33756466'
- 'd4c068f9b6fb431f606220ec8e707fa1'
+ '6dfc33fc2587b36e2bf61ff1b26584c2'
'fe0e9b4415b82f306fc1b63eb9a742a4'
'69a689019ea0b6ed46b387907f14bc8a'
'c072b17032e80debc6a8626299245d46'
@@ -44,7 +44,7 @@ md5sums=('f30a562307b6f71204370fcd33756466'
'f36222e7ce20c8e4dc27376f9be60f6c'
'670931649c60fcb3ef2e0119ed532bd4'
'8a71abc4224f575008f974a099b5cf6f'
- '85cd68841ef098249949638c1e8dd443')
+ '7a0757288e0f61cbd91f7fc6b2bafb7b')
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 b4c66216e..3c8ebbdae 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.78-1-LIBRE-LTS
+KERNEL_VERSION=3.0.80-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 444bacc4d..4e64f9872 100644
--- a/libre/linux-libre-tools/PKGBUILD
+++ b/libre/linux-libre-tools/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 90492 2013-05-12 22:55:40Z seblu $
+# $Id: PKGBUILD 91131 2013-05-19 23:48:35Z seblu $
# Maintainer: Sébastien Luttringer <seblu@archlinux.org>
# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -12,7 +12,7 @@ _basekernel=3.9
#_sublevel=6
_pkgver=$_basekernel.$_sublevel
pkgver=$_basekernel
-pkgrel=2
+pkgrel=3
license=('GPL2')
arch=('i686' 'x86_64' 'mips64el')
url='http://linux-libre.fsfla.org/'
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 465e17b00..8ba93e018 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 185176 2013-05-11 19:40:40Z thomas $
+# $Id: PKGBUILD 186437 2013-05-26 15:22:24Z tpowa $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Maintainer: Thomas Baechler <thomas@archlinux.org>
# Maintainer (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar>
@@ -10,10 +10,10 @@
pkgbase=linux-libre # Build stock -LIBRE kernel
#pkgbase=linux-libre-custom # Build kernel with a different name
_basekernel=3.9
-_sublevel=2
+_sublevel=4
pkgver=${_basekernel}.${_sublevel}
pkgrel=1
-_lxopkgver=${_basekernel}.2 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.4 # nearly always the same as pkgver
arch=('i686' 'x86_64' 'mips64el')
url="http://linux-libre.fsfla.org/"
license=('GPL2')
@@ -31,15 +31,15 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
'change-default-console-loglevel.patch'
"http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
md5sums=('120df29f88622dabf7015a22c7cc8e25'
- '1a5e653d2c281cccef9b44340a94a866'
- '9684934c48eb2c7bb7179b7e5b2c245f'
- 'd9ff747f6c2bd3a6e4a94a2abc4af9ca'
+ 'ae8a4997bfa4a6b9acfd0cefbb6e9aa0'
+ 'b0bc969b9e8c1767b16cdc0504a7bad7'
+ '42dfd3a3702433b68c079d6b3fd13c3c'
'e49ac236dfeef709f91a3d993ea7b62c'
'2967cecc3af9f954ccc822fd63dca6ff'
'8267264d9a8966e57fdacd1fa1fc65c4'
'04b21c79df0a952c22d681dd4f4562df'
'f3def2cefdcbb954c21d8505d23cc83c'
- '2cc468726d0b215d45cbd28be6dee198')
+ '846eb5948403dd0f2f02c50d3acb69c3')
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/config.i686 b/libre/linux-libre/config.i686
index ed48ff54b..107968129 100644
--- a/libre/linux-libre/config.i686
+++ b/libre/linux-libre/config.i686
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.9.0 Kernel Configuration
+# Linux/x86 3.9.3-1 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -87,7 +87,6 @@ CONFIG_IRQ_DOMAIN=y
CONFIG_IRQ_FORCED_THREADING=y
CONFIG_SPARSE_IRQ=y
CONFIG_CLOCKSOURCE_WATCHDOG=y
-CONFIG_ALWAYS_USE_PERSISTENT_CLOCK=y
CONFIG_KTIME_SCALAR=y
CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -1874,7 +1873,7 @@ CONFIG_ATA=m
# CONFIG_ATA_NONSTANDARD is not set
CONFIG_ATA_VERBOSE_ERROR=y
CONFIG_ATA_ACPI=y
-CONFIG_SATA_ZPODD=y
+CONFIG_SATA_ZPODD=y
CONFIG_SATA_PMP=y
#
@@ -5048,6 +5047,9 @@ CONFIG_EDAC_I5100=m
CONFIG_EDAC_I7300=m
CONFIG_RTC_LIB=y
CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_SYSTOHC=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
# CONFIG_RTC_DEBUG is not set
#
@@ -5164,7 +5166,10 @@ CONFIG_UIO_AEC=m
CONFIG_UIO_SERCOS3=m
CONFIG_UIO_PCI_GENERIC=m
CONFIG_UIO_NETX=m
-# CONFIG_VFIO is not set
+CONFIG_VFIO_IOMMU_TYPE1=m
+CONFIG_VFIO=m
+CONFIG_VFIO_PCI=m
+CONFIG_VFIO_PCI_VGA=y
CONFIG_VIRTIO=y
#
@@ -5432,7 +5437,6 @@ CONFIG_CED1401=m
CONFIG_DGRP=m
CONFIG_FIREWIRE_SERIAL=m
CONFIG_ZCACHE=y
-CONFIG_RAMSTER=y
CONFIG_X86_PLATFORM_DEVICES=y
CONFIG_ACER_WMI=m
CONFIG_ACERHDF=m
@@ -5725,6 +5729,7 @@ CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="linux-libre.fsfla.org"
CONFIG_NFS_FSCACHE=y
# CONFIG_NFS_USE_LEGACY_DNS is not set
CONFIG_NFS_USE_KERNEL_DNS=y
+CONFIG_NFS_DEBUG=y
CONFIG_NFSD=m
CONFIG_NFSD_V2_ACL=y
CONFIG_NFSD_V3=y
@@ -5738,6 +5743,7 @@ CONFIG_NFS_COMMON=y
CONFIG_SUNRPC=m
CONFIG_SUNRPC_GSS=m
CONFIG_SUNRPC_BACKCHANNEL=y
+CONFIG_SUNRPC_SWAP=y
CONFIG_RPCSEC_GSS_KRB5=m
CONFIG_SUNRPC_DEBUG=y
CONFIG_CEPH_FS=m
diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64
index faee36762..24d6be2bd 100644
--- a/libre/linux-libre/config.x86_64
+++ b/libre/linux-libre/config.x86_64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.9.0-2 Kernel Configuration
+# Linux/x86 3.9.4-1 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
@@ -89,7 +89,6 @@ CONFIG_IRQ_FORCED_THREADING=y
CONFIG_SPARSE_IRQ=y
CONFIG_CLOCKSOURCE_WATCHDOG=y
CONFIG_ARCH_CLOCKSOURCE_DATA=y
-CONFIG_ALWAYS_USE_PERSISTENT_CLOCK=y
CONFIG_GENERIC_TIME_VSYSCALL=y
CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -4862,6 +4861,9 @@ CONFIG_EDAC_I7300=m
CONFIG_EDAC_SBRIDGE=m
CONFIG_RTC_LIB=y
CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_SYSTOHC=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
# CONFIG_RTC_DEBUG is not set
#
@@ -4976,7 +4978,10 @@ CONFIG_UIO_AEC=m
CONFIG_UIO_SERCOS3=m
CONFIG_UIO_PCI_GENERIC=m
CONFIG_UIO_NETX=m
-# CONFIG_VFIO is not set
+CONFIG_VFIO_IOMMU_TYPE1=m
+CONFIG_VFIO=m
+CONFIG_VFIO_PCI=m
+CONFIG_VFIO_PCI_VGA=y
CONFIG_VIRTIO=m
#
@@ -5514,6 +5519,7 @@ CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="linux-libre.fsfla.org"
CONFIG_NFS_FSCACHE=y
# CONFIG_NFS_USE_LEGACY_DNS is not set
CONFIG_NFS_USE_KERNEL_DNS=y
+CONFIG_NFS_DEBUG=y
CONFIG_NFSD=m
CONFIG_NFSD_V2_ACL=y
CONFIG_NFSD_V3=y
@@ -5527,8 +5533,9 @@ CONFIG_NFS_COMMON=y
CONFIG_SUNRPC=m
CONFIG_SUNRPC_GSS=m
CONFIG_SUNRPC_BACKCHANNEL=y
+CONFIG_SUNRPC_SWAP=y
CONFIG_RPCSEC_GSS_KRB5=m
-CONFIG_SUNRPC_DEBUG=y
+CONFIG_SUNRPC_DEBUG=y
CONFIG_CEPH_FS=m
CONFIG_CIFS=m
CONFIG_CIFS_STATS=y
diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install
index f849635c1..619ad6090 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.9.2-1-LIBRE
+KERNEL_VERSION=3.9.4-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 cd55468eb..509275d5d 100644
--- a/libre/lirc-libre/PKGBUILD
+++ b/libre/lirc-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 184774 2013-05-08 10:43:50Z tpowa $
+# $Id: PKGBUILD 186447 2013-05-26 15:45:25Z tpowa $
# Maintainer: Paul Mattal <paul@archlinux.org>
# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -6,7 +6,7 @@ _pkgbase=lirc
pkgbase=lirc-libre
pkgname=('lirc-libre' 'lirc-utils-libre')
pkgver=0.9.0
-pkgrel=45
+pkgrel=46
epoch=1
_extramodules=extramodules-3.9-LIBRE
arch=('i686' 'x86_64' 'mips64el')
@@ -47,7 +47,7 @@ build() {
PYTHON=python2 ./configure --enable-sandboxed --prefix=/usr \
--with-driver=all --with-kerneldir=/usr/src/linux-${_kernver}/ \
--with-moduledir=/usr/lib/modules/${_kernver}/kernel/drivers/misc \
- --with-transmitter
+ --sbindir=/usr/bin --with-transmitter
# Remove drivers already in kernel
sed -e "s:lirc_dev::" -e "s:lirc_bt829::" -e "s:lirc_igorplugusb::" \
@@ -108,7 +108,7 @@ md5sums=('b232aef26f23fe33ea8305d276637086'
'087a7d102e1c96bf1179f38db2b0b237'
'9ee196bd03ea44af5a752fb0cc6ca96a'
'3deb02604b37811d41816e9b4385fcc3'
- 'dab8a73bcc5fd5479d8750493d8d97dc'
- 'c2e20fe68b034df752dba2773db16ebe'
+ '1c7ceace42da44f41e5a42b4dd3b3d76'
+ '121283a6de274e52ed86522aecd0f6e5'
'07131d117fcfe9dcd50c453c3a5e9531'
'febf25c154a7d36f01159e84f26c2d9a')
diff --git a/libre/lirc-libre/lirc.service b/libre/lirc-libre/lirc.service
index 953601fd3..2123348fd 100644
--- a/libre/lirc-libre/lirc.service
+++ b/libre/lirc-libre/lirc.service
@@ -3,7 +3,7 @@ Description=Linux Infrared Remote Control
[Service]
ExecStartPre=/usr/bin/ln -sf /run/lirc/lircd /dev/lircd
-ExecStart=/usr/sbin/lircd --pidfile=/run/lirc/lircd.pid
+ExecStart=/usr/bin/lircd --pidfile=/run/lirc/lircd.pid
Type=forking
PIDFile=/run/lirc/lircd.pid
diff --git a/libre/lirc-libre/lircm.service b/libre/lirc-libre/lircm.service
index 6b258e312..eedcf5d8f 100644
--- a/libre/lirc-libre/lircm.service
+++ b/libre/lirc-libre/lircm.service
@@ -4,7 +4,7 @@ After=lirc.service
Wants=lirc.service
[Service]
-ExecStart=/usr/sbin/lircmd -u
+ExecStart=/usr/bin/lircmd -u
Type=forking
[Install]
diff --git a/libre/mcomix-libre/PKGBUILD b/libre/mcomix-libre/PKGBUILD
index 9b727361a..aba53582b 100644
--- a/libre/mcomix-libre/PKGBUILD
+++ b/libre/mcomix-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: PKGBUILD 91436 2013-05-22 14:15:00Z schuay $
# Maintainer: schuay <jakob.gruber@gmail.com>
# Contributor: Ray Powell <ray_al@xphoniexx.net>
# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -6,7 +6,7 @@
_pkgname=mcomix
pkgname=mcomix-libre
pkgver=1.00
-pkgrel=1
+pkgrel=3
pkgdesc="A user-friendly, customizable image viewer specifically designed to handle comic books, with unar recommendation"
arch=('any')
url="http://sourceforge.net/projects/mcomix/"
diff --git a/libre/mcomix-libre/mcomix.install b/libre/mcomix-libre/mcomix.install
index 2d3c6c3e3..c33c1d5a1 100644
--- a/libre/mcomix-libre/mcomix.install
+++ b/libre/mcomix-libre/mcomix.install
@@ -1,13 +1,12 @@
pkgname=mcomix
post_install() {
- if [ -f usr/bin/xdg-icon-resource ]; then
- xdg-icon-resource forceupdate
- fi
if [ -f usr/sbin/gconfpkg ]; then
- usr/sbin/gconfpkg --install ${pkgname}
+ usr/sbin/gconfpkg --install ${pkgname} &> /dev/null
fi
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
update-desktop-database -q
+ update-mime-database usr/share/mime &> /dev/null
}
pre_upgrade() {
@@ -20,13 +19,12 @@ post_upgrade() {
pre_remove() {
if [ -f usr/sbin/gconfpkg ]; then
- usr/sbin/gconfpkg --uninstall ${pkgname}
+ usr/sbin/gconfpkg --uninstall ${pkgname} &> /dev/null
fi
}
post_remove() {
- if [ -f usr/bin/xdg-icon-resource ]; then
- xdg-icon-resource forceupdate
- fi
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
update-desktop-database -q
+ update-mime-database usr/share/mime &> /dev/null
}
diff --git a/libre/mplayer-libre/PKGBUILD b/libre/mplayer-libre/PKGBUILD
index 73f1135e0..a49b889bd 100644
--- a/libre/mplayer-libre/PKGBUILD
+++ b/libre/mplayer-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 185551 2013-05-14 23:48:31Z foutrelis $
+# $Id: PKGBUILD 186432 2013-05-26 10:14:39Z foutrelis $
# Maintainer : Ionut Biru <ibiru@archlinux.org>
# Contributor: Hugo Doria <hugo@archlinux.org>
# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -7,32 +7,30 @@
_pkgbase=mplayer
pkgbase=mplayer-libre
pkgname=('mplayer-libre' 'mencoder-libre')
-pkgver=35920
-pkgrel=3
+pkgver=36285
+pkgrel=1
arch=('i686' 'x86_64')
makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient'
'aalib' 'jack' 'libcaca' 'x264' 'faad2' 'lirc-utils' 'libxvmc' 'enca' 'libvdpau' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx'
'libpulse' 'fribidi' 'unzip' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray' 'libcdio-paranoia' 'subversion')
license=('GPL')
url="http://www.mplayerhq.hu/"
-options=(!buildflags !emptydirs)
-source=(ftp://ftp.archlinux.org/other/packages/$_pkgbase/$_pkgbase-$pkgver.tar.xz mplayer.desktop cdio-includes.patch subreader-fix-srt-parsing.patch)
-md5sums=('5f96e829d711e7d1ea65e324710dca50'
+options=('!buildflags' '!emptydirs')
+source=(ftp://ftp.archlinux.org/other/packages/$_pkgbase/$_pkgbase-$pkgver.tar.xz
+ mplayer.desktop
+ cdio-includes.patch)
+md5sums=('5e4f0d4d039b0219514cf52ae6da831d'
'c0d6ef795cf6de48e3b87ff7c23f0319'
- '7b5be7191aafbea64218dc4916343bbc'
- '7cb6019018a95dcc3d1231e1aaa8bbdb')
+ '7b5be7191aafbea64218dc4916343bbc')
prepare() {
- cd "$srcdir/$_pkgbase"
+ cd "$srcdir/$_pkgbase-$pkgver"
patch -Np0 -i ../cdio-includes.patch
-
- # http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2139
- patch -Np1 -i ../subreader-fix-srt-parsing.patch
}
build() {
- cd "$srcdir/$_pkgbase"
+ cd "$srcdir/$_pkgbase-$pkgver"
./configure --prefix=/usr \
--enable-runtime-cpudetection \
@@ -68,7 +66,7 @@ package_mplayer-libre() {
replaces=('mplayer')
conflicts=('mplayer')
- cd "$srcdir/$_pkgbase"
+ cd "$srcdir/$_pkgbase-$pkgver"
make DESTDIR="$pkgdir" install-mplayer install-mplayer-man
install -Dm644 etc/{codecs.conf,input.conf,example.conf} "$pkgdir/etc/mplayer/"
@@ -88,7 +86,7 @@ package_mencoder-libre() {
replaces=('mencoder')
conflicts=('mencoder')
- cd "$srcdir/$_pkgbase"
+ cd "$srcdir/$_pkgbase-$pkgver"
make DESTDIR="$pkgdir" install-mencoder install-mencoder-man
- find "$pkgdir/usr/share/man" -name 'mplayer.1' -exec bash -c 'mv "$1" "${1/mplayer/mencoder}"' _ {} \;
+ find "$pkgdir/usr/share/man" -name mplayer.1 -exec rename mplayer.1 mencoder.1 {} +
}
diff --git a/libre/mplayer-libre/subreader-fix-srt-parsing.patch b/libre/mplayer-libre/subreader-fix-srt-parsing.patch
deleted file mode 100644
index 84f2de4d9..000000000
--- a/libre/mplayer-libre/subreader-fix-srt-parsing.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From d98e61ea438db66323734ad1b6bea66411a3c97b Mon Sep 17 00:00:00 2001
-From: wm4 <wm4@nowhere>
-Date: Tue, 30 Apr 2013 00:09:31 +0200
-Subject: [PATCH] subreader: fix out of bound write access when parsing .srt
-
-This broke .srt subtitles on gcc-4.8. The breakage was relatively
-subtle: it set all hour components to 0, while everything else was
-parsed successfully.
-
-But the problem is really that sscanf wrote 1 byte past the sep
-variable (or more, for invalid/specially prepared input). The %[..]
-format specifier is unbounded. Fix that by letting sscanf drop the
-parsed contents with "*", and also make it skip only one input
-character by adding "1" (=> "%*1[...").
-
-The out of bound write could easily lead to security issues.
-
-Also, this change makes .srt subtitle parsing slightly more strict.
-Strictly speaking this is an unrelated change, but do it anyway. It's
-more correct.
----
- sub/subreader.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
- (foutrelis: adjusted variable names in first hunk to apply to mplayer)
-
-diff --git a/sub/subreader.c b/sub/subreader.c
-index 23da4c7..0f1b6c9 100644
---- a/sub/subreader.c
-+++ b/sub/subreader.c
-@@ -386,14 +386,14 @@ static subtitle *sub_ass_read_line_subviewer(stream_t *st, subtitle *current,
- int h1, m1, s1, ms1, h2, m2, s2, ms2, j = 0;
-
- while (!current->text[0]) {
-- char line[LINE_LEN + 1], full_line[LINE_LEN + 1], sep;
-+ char line[LINE_LEN + 1], full_line[LINE_LEN + 1];
- int i;
-
- /* Parse SubRip header */
- if (!stream_read_line(st, line, LINE_LEN, utf16))
- return NULL;
-- if (sscanf(line, "%d:%d:%d%[,.:]%d --> %d:%d:%d%[,.:]%d",
-- &h1, &m1, &s1, &sep, &ms1, &h2, &m2, &s2, &sep, &ms2) < 10)
-+ if (sscanf(line, "%d:%d:%d%*1[,.:]%d --> %d:%d:%d%*1[,.:]%d",
-+ &h1, &m1, &s1, &ms1, &h2, &m2, &s2, &ms2) < 8)
- continue;
-
- current->start = a1 * 360000 + a2 * 6000 + a3 * 100 + a4 / 10;
-@@ -450,7 +450,7 @@ static subtitle *sub_read_line_subviewer(stream_t *st,subtitle *current,
- return sub_ass_read_line_subviewer(st, current, args);
- while (!current->text[0]) {
- if (!stream_read_line (st, line, LINE_LEN, utf16)) return NULL;
-- if ((len=sscanf (line, "%d:%d:%d%[,.:]%d --> %d:%d:%d%[,.:]%d",&a1,&a2,&a3,(char *)&i,&a4,&b1,&b2,&b3,(char *)&i,&b4)) < 10)
-+ if ((len=sscanf (line, "%d:%d:%d%*1[,.:]%d --> %d:%d:%d%*1[,.:]%d",&a1,&a2,&a3,&a4,&b1,&b2,&b3,&b4)) < 8)
- continue;
- current->start = a1*360000+a2*6000+a3*100+a4/10;
- current->end = b1*360000+b2*6000+b3*100+b4/10;
---
-1.8.1.6
-
diff --git a/libre/mplayer-vaapi-libre/PKGBUILD b/libre/mplayer-vaapi-libre/PKGBUILD
index 023b703b4..311c469ca 100644
--- a/libre/mplayer-vaapi-libre/PKGBUILD
+++ b/libre/mplayer-vaapi-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 90856 2013-05-14 23:55:05Z foutrelis $
+# $Id: PKGBUILD 91641 2013-05-26 08:06:21Z foutrelis $
# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
# Contributor: Ionut Biru <ibiru@archlinux.org>
# Contributor: Hugo Doria <hugo@archlinux.org>
@@ -8,7 +8,7 @@
pkgname=mplayer-vaapi-libre
pkgver=35107
-pkgrel=7
+pkgrel=8
pkgdesc="A movie player, compiled with vaapi, without nonfree faac support"
arch=('i686' 'x86_64')
url="http://gitorious.org/vaapi/mplayer"
@@ -33,7 +33,7 @@ install=mplayer-vaapi.install
sha256sums=('a6c645625cc2cd6ca48764db302c926049f831e757857ece351b37b674e05e56'
'72e6c654f9733953ad2466d0ea1a52f23e753791d8232d90f13293eb1b358720'
'5a09fb462729a4e573568f9e8c1f57dbe7f69c0b68cfa4f6d70b3e52c450d93b'
- '69127a5576e4f1f62f688215bd2ec0e052ddcb36292c7a1766c146ff122cb092')
+ '8b6cd325d89ff8bce3662c6aaa9b61b8e6163c6574e09b575426a1eed02b8ad3')
prepare() {
@@ -43,7 +43,7 @@ prepare() {
patch -d etc -Np0 -i "$srcdir/tweak-desktop-file.patch"
# http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2139
- patch -Np1 -i "$srcdir/subreader-fix-srt-parsing.patch"
+ patch -Np0 -i "$srcdir/subreader-fix-srt-parsing.patch"
}
build() {
diff --git a/libre/mplayer-vaapi-libre/subreader-fix-srt-parsing.patch b/libre/mplayer-vaapi-libre/subreader-fix-srt-parsing.patch
index 84f2de4d9..f1c087377 100644
--- a/libre/mplayer-vaapi-libre/subreader-fix-srt-parsing.patch
+++ b/libre/mplayer-vaapi-libre/subreader-fix-srt-parsing.patch
@@ -1,34 +1,8 @@
-From d98e61ea438db66323734ad1b6bea66411a3c97b Mon Sep 17 00:00:00 2001
-From: wm4 <wm4@nowhere>
-Date: Tue, 30 Apr 2013 00:09:31 +0200
-Subject: [PATCH] subreader: fix out of bound write access when parsing .srt
-
-This broke .srt subtitles on gcc-4.8. The breakage was relatively
-subtle: it set all hour components to 0, while everything else was
-parsed successfully.
-
-But the problem is really that sscanf wrote 1 byte past the sep
-variable (or more, for invalid/specially prepared input). The %[..]
-format specifier is unbounded. Fix that by letting sscanf drop the
-parsed contents with "*", and also make it skip only one input
-character by adding "1" (=> "%*1[...").
-
-The out of bound write could easily lead to security issues.
-
-Also, this change makes .srt subtitle parsing slightly more strict.
-Strictly speaking this is an unrelated change, but do it anyway. It's
-more correct.
----
- sub/subreader.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
- (foutrelis: adjusted variable names in first hunk to apply to mplayer)
-
-diff --git a/sub/subreader.c b/sub/subreader.c
-index 23da4c7..0f1b6c9 100644
---- a/sub/subreader.c
-+++ b/sub/subreader.c
-@@ -386,14 +386,14 @@ static subtitle *sub_ass_read_line_subviewer(stream_t *st, subtitle *current,
+Index: sub/subreader.c
+===================================================================
+--- sub/subreader.c (revision 36284)
++++ sub/subreader.c (revision 36285)
+@@ -378,14 +378,14 @@
int h1, m1, s1, ms1, h2, m2, s2, ms2, j = 0;
while (!current->text[0]) {
@@ -41,20 +15,26 @@ index 23da4c7..0f1b6c9 100644
return NULL;
- if (sscanf(line, "%d:%d:%d%[,.:]%d --> %d:%d:%d%[,.:]%d",
- &h1, &m1, &s1, &sep, &ms1, &h2, &m2, &s2, &sep, &ms2) < 10)
-+ if (sscanf(line, "%d:%d:%d%*1[,.:]%d --> %d:%d:%d%*1[,.:]%d",
++ if (sscanf(line, "%d:%d:%d%*[,.:]%d --> %d:%d:%d%*[,.:]%d",
+ &h1, &m1, &s1, &ms1, &h2, &m2, &s2, &ms2) < 8)
continue;
- current->start = a1 * 360000 + a2 * 6000 + a3 * 100 + a4 / 10;
-@@ -450,7 +450,7 @@ static subtitle *sub_read_line_subviewer(stream_t *st,subtitle *current,
- return sub_ass_read_line_subviewer(st, current, args);
+ current->start = h1 * 360000 + m1 * 6000 + s1 * 100 + ms1 / 10;
+@@ -442,7 +442,7 @@
+ #endif
while (!current->text[0]) {
if (!stream_read_line (st, line, LINE_LEN, utf16)) return NULL;
- if ((len=sscanf (line, "%d:%d:%d%[,.:]%d --> %d:%d:%d%[,.:]%d",&a1,&a2,&a3,(char *)&i,&a4,&b1,&b2,&b3,(char *)&i,&b4)) < 10)
-+ if ((len=sscanf (line, "%d:%d:%d%*1[,.:]%d --> %d:%d:%d%*1[,.:]%d",&a1,&a2,&a3,&a4,&b1,&b2,&b3,&b4)) < 8)
++ if ((len=sscanf (line, "%d:%d:%d%*[,.:]%d --> %d:%d:%d%*[,.:]%d",&a1,&a2,&a3,&a4,&b1,&b2,&b3,&b4)) < 8)
continue;
current->start = a1*360000+a2*6000+a3*100+a4/10;
current->end = b1*360000+b2*6000+b3*100+b4/10;
---
-1.8.1.6
-
+@@ -1123,7 +1123,7 @@
+ {*uses_time=1;return SUB_MPL2;}
+ if (sscanf (line, "%d:%d:%d.%d,%d:%d:%d.%d", &i, &i, &i, &i, &i, &i, &i, &i)==8)
+ {*uses_time=1;return SUB_SUBRIP;}
+- if (sscanf (line, "%d:%d:%d%[,.:]%d --> %d:%d:%d%[,.:]%d", &i, &i, &i, (char *)&i, &i, &i, &i, &i, (char *)&i, &i)==10)
++ if (sscanf (line, "%d:%d:%d%*[,.:]%d --> %d:%d:%d%*[,.:]%d", &i, &i, &i, &i, &i, &i, &i, &i)==8)
+ {*uses_time=1;return SUB_SUBVIEWER;}
+ if (sscanf (line, "{T %d:%d:%d:%d",&i, &i, &i, &i)==4)
+ {*uses_time=1;return SUB_SUBVIEWER2;}
diff --git a/libre/ogre-libre/PKGBUILD b/libre/ogre-libre/PKGBUILD
index cef33ae90..05e7d8cbb 100644
--- a/libre/ogre-libre/PKGBUILD
+++ b/libre/ogre-libre/PKGBUILD
@@ -12,8 +12,8 @@ pkgflag=(
-docs
)
pkgver=1.8.1
-pkgrel=3
-pkgdesc='A scene-oriented, flexible 3D engine written in C++, without nonfree nvidia-cg-toolkit support, nonfree fonts and arts'
+pkgrel=4
+pkgdesc='Scene-oriented, flexible 3D engine written in C++, without nonfree nvidia-cg-toolkit support, nonfree fonts and arts'
arch=(
i686
x86_64
diff --git a/libre/parabola-xdg-menu/PKGBUILD b/libre/parabola-xdg-menu/PKGBUILD
index 68615937c..e601bcb41 100644
--- a/libre/parabola-xdg-menu/PKGBUILD
+++ b/libre/parabola-xdg-menu/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id$
+# $Id: PKGBUILD 91138 2013-05-20 09:52:33Z spupykin $
# Maintainer: Sergej Pupykin <sergej@aur.archlinux.org>
# Contributor: Sergej Pupykin <sergej@aur.archlinux.org>
# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
pkgname=parabola-xdg-menu
-pkgver=0.7.5.5
+pkgver=0.7.6.1
pkgrel=1
pkgdesc="automatic generate WM menu from xdg files (Parabola rebranded)"
arch=('any')
@@ -18,9 +18,9 @@ source=("http://archlinux-stuff.googlecode.com/files/arch-xdg-menu-$pkgver.tar.g
replaces=('archlinux-xdg-menu')
conflicts=('archlinux-xdg-menu')
provides=("archlinux-xdg-menu=$pkgver")
-md5sums=('dd139571e537bbe0190eca53eabb8fd2')
+md5sums=('faa2077140c3d5bacc1de974a9eb3384')
-build() {
+package() {
cd $srcdir
# Rebranding Archlinux to Parabola
@@ -42,7 +42,7 @@ build() {
install -D -m 0755 xdg_menu $pkgdir/usr/bin/xdg_menu
install -D -m 0755 xdg_menu_su $pkgdir/usr/bin/xdg_menu_su
- install -D -m 0755 update-menus $pkgdir/usr/sbin/update-menus
+ install -D -m 0755 update-menus $pkgdir/usr/bin/update-menus
install -D -m 0644 update-menus.conf $pkgdir/etc/update-menus.conf
mkdir -p $pkgdir/usr/share/desktop-directories/
cp parabola-desktop-directories/* $pkgdir/usr/share/desktop-directories/
diff --git a/libre/rp-pppoe-libre/PKGBUILD b/libre/rp-pppoe-libre/PKGBUILD
index e8a981a3d..1cb968c35 100644
--- a/libre/rp-pppoe-libre/PKGBUILD
+++ b/libre/rp-pppoe-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 182649 2013-04-12 07:08:42Z tpowa $
+# $Id: PKGBUILD 186154 2013-05-21 10:00:49Z tpowa $
# Maintainer: Daniel Isenmann <daniel@archlinux.org>
# Contributor: orelien <aurelien.foret@wanadoo.fr>
# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -6,7 +6,7 @@
_pkgname=rp-pppoe
pkgname=rp-pppoe-libre
pkgver=3.11
-pkgrel=3
+pkgrel=4
pkgdesc="Roaring Penguin's Point-to-Point Protocol over Ethernet client, without nonfree ServPoET recommendation"
arch=('i686' 'x86_64')
url="http://www.roaringpenguin.com/pppoe/"
@@ -36,7 +36,7 @@ prepare() {
build() {
cd "$srcdir/$_pkgname-$pkgver/src"
- ./configure --prefix=/usr --enable-plugin
+ ./configure --prefix=/usr --sbindir=/usr/bin --enable-plugin
make PLUGIN_DIR="/usr/lib/rp-pppoe" all rp-pppoe.so
}
@@ -49,6 +49,6 @@ package() {
}
md5sums=('13b5900c56bd602df6cc526e5e520722'
'SKIP'
- 'af234125f956f3a356ab0d0fcaa9e8a2'
+ '45dc8fc3d0341a3930182a480859ad76'
'd38a903a247d689ff0323d7b6caa1c6b'
'3c53d550ac408608abb0b6cd6b76b6c2')
diff --git a/libre/rp-pppoe-libre/adsl.service b/libre/rp-pppoe-libre/adsl.service
index 324164943..f9a2fdcc6 100644
--- a/libre/rp-pppoe-libre/adsl.service
+++ b/libre/rp-pppoe-libre/adsl.service
@@ -3,8 +3,8 @@ Description=ADSL Deamon
[Service]
Type=forking
-ExecStart=/usr/sbin/pppoe-start
-ExecStop=/usr/sbin/pppoe-stop
+ExecStart=/usr/bin/pppoe-start
+ExecStop=/usr/bin/pppoe-stop
[Install]
WantedBy=multi-user.target
diff --git a/libre/texlive-bin-libre/PKGBUILD b/libre/texlive-bin-libre/PKGBUILD
index e6c202136..442dc9d15 100644
--- a/libre/texlive-bin-libre/PKGBUILD
+++ b/libre/texlive-bin-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 183993 2013-04-30 14:22:00Z foutrelis $
+# $Id: PKGBUILD 185904 2013-05-19 18:27:14Z remy $
# Maintainer: Rémy Oudompheng <remy@archlinux.org>
# Contributor: francois <francois.archlinux.org>
# Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
@@ -6,7 +6,7 @@
pkgname=texlive-bin-libre
pkgver=2012.0
-pkgrel=11
+pkgrel=12
pkgdesc="TeX Live binaries, without biber binaries (Parabola rebranded)"
license=('GPL')
arch=('i686' 'x86_64' 'mips64el')
diff --git a/libre/tp_smapi-libre/PKGBUILD b/libre/tp_smapi-libre/PKGBUILD
index a3d48d0f3..4dd77dda3 100644
--- a/libre/tp_smapi-libre/PKGBUILD
+++ b/libre/tp_smapi-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 90191 2013-05-08 10:50:10Z tpowa $
+# $Id: PKGBUILD 91724 2013-05-26 15:41:39Z tpowa $
# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
# Contributor: xduugu
# Contributor: nh2
@@ -12,7 +12,7 @@
_pkgname=tp_smapi
pkgname=tp_smapi-libre
pkgver=0.41
-pkgrel=21
+pkgrel=22
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/unar/PKGBUILD b/libre/unar/PKGBUILD
index 6aa9ae4fb..8fe6b165c 100755
--- a/libre/unar/PKGBUILD
+++ b/libre/unar/PKGBUILD
@@ -4,15 +4,15 @@
pkgname=unar
pkgver=1.6
-pkgrel=1
+pkgrel=2
pkgdesc="An Objective-C application for uncompressing archive files"
arch=('x86_64' 'i686' 'mips64el')
url="http://unarchiver.c3.cx/"
license=('LGPL2.1')
-depends=('gnustep-base' 'openssl' 'bzip2' 'icu=51.1' 'gcc-libs' 'zlib')
+depends=('gnustep-base' 'openssl' 'bzip2' 'icu' 'gcc-libs' 'zlib')
makedepends=('gcc-objc')
replaces=("unarchiver")
-conflicts=("unarchiver")
+conflicts=("unarchiver" 'icu<51')
provides=("unarchiver")
source=("http://theunarchiver.googlecode.com/files/${pkgname}${pkgver}_src.zip"
"native_obj_exceptions.patch")
diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD
index 95f94c9b4..b1f8c6ffb 100644
--- a/libre/vhba-module-libre/PKGBUILD
+++ b/libre/vhba-module-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 90193 2013-05-08 10:51:01Z tpowa $
+# $Id: PKGBUILD 91726 2013-05-26 15:41:55Z tpowa $
# Maintainer: Ray Rashif <schiv@archlinux.org>
# Contributor: Mateusz Herych <heniekk@gmail.com>
# Contributor: Charles Lindsay <charles@chaoslizard.org>
@@ -8,7 +8,7 @@ _pkgname=vhba-module
pkgname=vhba-module-libre
pkgver=20120422
_extramodules=extramodules-3.9-LIBRE
-pkgrel=24
+pkgrel=25
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 9077a0ac4..a6c22c177 100644
--- a/libre/virtualbox-libre-modules/PKGBUILD
+++ b/libre/virtualbox-libre-modules/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 90212 2013-05-09 00:26:24Z seblu $
+# $Id: PKGBUILD 91728 2013-05-26 15:42:12Z tpowa $
# Maintainer: Ionut Biru <ibiru@archlinux.org>
# Maintainer: Sébastien Luttringer <seblu@archlinux.org>
# Maintainer (Parabola): Jorge López <jorginho@lavabit.com>
@@ -7,7 +7,7 @@
pkgbase=virtualbox-libre-modules
pkgname=('virtualbox-libre-host-modules' 'virtualbox-libre-guest-modules')
pkgver=4.2.12
-pkgrel=5
+pkgrel=6
arch=('i686' 'x86_64')
url='http://virtualbox.org'
license=('GPL')
diff --git a/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install b/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install
index 82bda9855..9a98c5752 100755
--- a/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install
+++ b/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install
@@ -1,4 +1,4 @@
-VERSION=''
+VERSION='3.9.4-1-LIBRE'
post_install() {
cat << EOF
diff --git a/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install b/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install
index 6c1a57d3a..f0ca024ed 100755
--- a/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install
+++ b/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install
@@ -1,4 +1,4 @@
-VERSION=''
+VERSION='3.9.4-1-LIBRE'
post_install() {
cat << EOF
diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD
index cf2a4e4d4..b7b1988f9 100644
--- a/libre/virtualbox-libre/PKGBUILD
+++ b/libre/virtualbox-libre/PKGBUILD
@@ -108,7 +108,7 @@ md5sums=('654e45054ae6589452508d37403dc800'
'c7951fe6888d939f3a7d0dafe477e82b'
'4da8eeb2ece7e475fc7a0d1003da26c6'
'5e4187af59726d71c5be48d0cd816c34'
- 'a757fa81ccf64788952c69dc5e6e43ff'
+ '17fca4ba3a751c8a1db19b92b1820462'
'50387fba578646a9d29de3f917a199d2')
prepare() {
diff --git a/libre/virtualbox-libre/libre.patch b/libre/virtualbox-libre/libre.patch
index ec40c0692..75a5ed22f 100644
--- a/libre/virtualbox-libre/libre.patch
+++ b/libre/virtualbox-libre/libre.patch
@@ -1,5 +1,5 @@
--- VirtualBox-4.2.12.orig/Config.kmk 2013-04-12 07:33:55.000000000 -0300
-+++ VirtualBox-4.2.12/Config.kmk 2013-05-10 15:03:20.817944799 -0300
++++ VirtualBox-4.2.12/Config.kmk 2013-05-23 18:48:57.560690206 -0300
@@ -56,9 +56,6 @@
PROPS_SYSMODS_ACCUMULATE_L += INTERMEDIATES
PROPS_MISCBINS_ACCUMULATE_L += INTERMEDIATES
@@ -1001,8 +1001,9 @@
else # !VBOX_ONLY_ADDITIONS && !VBOX_ONLY_TESTSUITE && !VBOX_ONLY_DOCS
#
+diff -Nur VirtualBox-4.2.12.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp VirtualBox-4.2.12/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp
--- VirtualBox-4.2.12.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp 2013-04-12 07:38:01.000000000 -0300
-+++ VirtualBox-4.2.12/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp 2013-05-10 17:03:11.087825690 -0300
++++ VirtualBox-4.2.12/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp 2013-05-23 18:59:56.434051894 -0300
@@ -650,27 +650,6 @@
}
};
@@ -1039,3 +1040,46 @@
#ifdef VBOX_WITH_DEBUGGER_GUI
/* 'Debug' actions: */
+diff -Nur VirtualBox-4.2.12.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.h VirtualBox-4.2.12/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.h
+--- VirtualBox-4.2.12.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.h 2013-04-12 07:38:01.000000000 -0300
++++ VirtualBox-4.2.12/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.h 2013-05-24 11:26:13.789861574 -0300
+@@ -62,7 +62,6 @@
+ UIActionIndexRuntime_Menu_SharedFolders,
+ UIActionIndexRuntime_Simple_SharedFoldersDialog,
+ UIActionIndexRuntime_Toggle_VRDEServer,
+- UIActionIndexRuntime_Simple_InstallGuestTools,
+
+ #ifdef VBOX_WITH_DEBUGGER_GUI
+ /* 'Debugger' menu actions: */
+diff -Nur VirtualBox-4.2.12.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp VirtualBox-4.2.12/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp
+--- VirtualBox-4.2.12.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp 2013-04-12 07:38:01.000000000 -0300
++++ VirtualBox-4.2.12/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp 2013-05-24 11:27:14.723176263 -0300
+@@ -651,7 +651,6 @@
+ m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Menu_SharedFolders));
+ m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Simple_SharedFoldersDialog));
+ m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Toggle_VRDEServer));
+- m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Simple_InstallGuestTools));
+ }
+
+ void UIMachineLogic::prepareActionConnections()
+@@ -705,8 +704,6 @@
+ this, SLOT(sltOpenSharedFoldersDialog()));
+ connect(gActionPool->action(UIActionIndexRuntime_Toggle_VRDEServer), SIGNAL(toggled(bool)),
+ this, SLOT(sltSwitchVrde(bool)));
+- connect(gActionPool->action(UIActionIndexRuntime_Simple_InstallGuestTools), SIGNAL(triggered()),
+- this, SLOT(sltInstallGuestAdditions()));
+
+ #ifdef VBOX_WITH_DEBUGGER_GUI
+ /* "Debug" actions connections: */
+diff -Nur VirtualBox-4.2.12.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.cpp VirtualBox-4.2.12/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.cpp
+--- VirtualBox-4.2.12.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.cpp 2013-04-12 07:38:01.000000000 -0300
++++ VirtualBox-4.2.12/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.cpp 2013-05-24 11:28:03.193841501 -0300
+@@ -244,8 +244,6 @@
+ pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Simple_NetworkAdaptersDialog));
+ pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Simple_SharedFoldersDialog));
+ pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Toggle_VRDEServer));
+- pMenu->addSeparator();
+- pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Simple_InstallGuestTools));
+ }
+
+ #ifdef VBOX_WITH_DEBUGGER_GUI
diff --git a/libre/xchat-libre/PKGBUILD b/libre/xchat-libre/PKGBUILD
index e7805a9b4..cc50fb44c 100644
--- a/libre/xchat-libre/PKGBUILD
+++ b/libre/xchat-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 176357 2013-01-30 21:29:22Z eric $
+# $Id: PKGBUILD 186065 2013-05-20 20:17:32Z eric $
# Maintainer: Eric Bélanger <eric@archlinux.org>
# Maintainer (ConnochaetOS): Henry Jensen <hjensen@connochaetos.org>
# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -6,8 +6,8 @@
_pkgname=xchat
pkgname=xchat-libre
pkgver=2.8.8
-pkgrel=12
-pkgdesc="A GTK+ based IRC client without non-free browser reference"
+pkgrel=13
+pkgdesc="A GTK+ based IRC client, without nonfree browser reference"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.xchat.org/"
provides=("xchat=$pkgver")
@@ -35,14 +35,18 @@ sha1sums=('e12305da42d1aacc26c2ca25e239f393d4dd3532'
'e6a3b69ba333fc7ba0f70792d78d44fba7c4a911'
'20aef0ae608af6b30e1b4249f9c53830f8f514f6')
-build() {
- cd "${srcdir}/${_pkgname}-${pkgver}"
+prepare() {
+ cd ${_pkgname}-${pkgver}
sed -i 's/GDK_HAND1/GDK_HAND2/' src/fe-gtk/xtext.c
patch -p1 -i "${srcdir}/xchat-2.8.8-libnotify07.patch"
patch -p1 -i "${srcdir}/xchat-2.8.8-link-against-libnotify.patch"
patch -p1 -i "${srcdir}/xchat-2.8.8-glib-2.31.patch"
patch -p1 -i "${srcdir}/remove-non-free-suggestion.patch"
patch -p1 -i "${srcdir}/no-firefox.patch"
+}
+
+build() {
+ cd ${_pkgname}-${pkgver}
autoconf
autoheader
@@ -52,7 +56,7 @@ build() {
}
package() {
- cd "${srcdir}/${_pkgname}-${pkgver}"
+ cd ${_pkgname}-${pkgver}
make DESTDIR="${pkgdir}" install
for i in 24 32 48 64 128 256 ; do
diff --git a/libre/xscreensaver-libre/PKGBUILD b/libre/xscreensaver-libre/PKGBUILD
index 487adf4bc..96c0f3537 100644
--- a/libre/xscreensaver-libre/PKGBUILD
+++ b/libre/xscreensaver-libre/PKGBUILD
@@ -1,35 +1,37 @@
-# $Id$
+# $Id: PKGBUILD 177534 2013-02-07 02:39:51Z eric $
# Maintainer: Eric Bélanger <eric@archlinux.org>
-# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
_pkgname=xscreensaver
pkgname=xscreensaver-libre
-pkgver=5.15
-pkgrel=3.1
-pkgdesc="Screen saver and locker for the X Window System (without non-free asm files)"
+pkgver=5.21
+pkgrel=1
+pkgdesc="Screen saver and locker for the X Window System, without nonfree asm files"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.jwz.org/xscreensaver/"
license=('BSD')
-depends=('libxxf86vm' 'libglade' 'mesa' 'pam' 'xorg-appres' 'libxmu' \
+depends=('libxxf86vm' 'libglade' 'glu' 'xorg-appres' 'libxmu' \
'perl-libwww' 'perl-http-message')
-makedepends=('bc' 'libxpm' 'gdm')
+makedepends=('bc' 'libxpm' 'gdm' 'mesa')
optdepends=('gdm: for login manager support')
replaces=("${_pkgname}")
conflicts=("${_pkgname}")
provides=("${_pkgname}=${pkgver}")
backup=('etc/pam.d/xscreensaver')
source=(http://www.jwz.org/xscreensaver/${_pkgname}-${pkgver}.tar.gz \
- add-electricsheep.diff xscreensaver.pam LICENSE libre.patch)
-sha1sums=('b5ce7caa19f4d57c3bac83377a36dddbe7095052'
+ add-electricsheep.diff xscreensaver.pam LICENSE)
+sha1sums=('cc44ddc538ad5b59ff851f70e8a48633763ff077'
'677496218b81a42d90bee400026e94dd87fb8ffb'
'106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
- '4209ea586b204fd1d81c382a0522c654f9fd9134'
- '327b839eb5d069827c1f25ef19fc8d4e83de7ab2')
+ '4209ea586b204fd1d81c382a0522c654f9fd9134')
build() {
cd "${srcdir}/${_pkgname}-${pkgver}"
patch -p0 -i "${srcdir}/add-electricsheep.diff"
- patch -Np1 -i "${srcdir}/libre.patch" # deleting dmsc.asm file due that doesn't has source code supplied
+
+ # Deleting dmsc.asm file due that don't have source code supplied
+ rm -v hacks/images/m6502/dmsc.asm
+
./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
--libexecdir=/usr/lib --with-x-app-defaults=/usr/share/X11/app-defaults \
--with-pam --with-login-manager --with-gtk --with-gl \
diff --git a/libre/xscreensaver-libre/libre.patch b/libre/xscreensaver-libre/libre.patch
deleted file mode 100644
index 569f8435c..000000000
--- a/libre/xscreensaver-libre/libre.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-diff -Naur xscreensaver-5.15/hacks/images/m6502/dmsc.asm /dev/null
---- xscreensaver-5.15/hacks/images/m6502/dmsc.asm 2008-03-02 03:34:37.000000000 -0200
-+++ /dev/null 2012-06-14 14:00:43.782877377 -0300
-@@ -1,108 +0,0 @@
--; By DMSC - daniel.serpell@gmail.com
--;
--; This demo was programmed in ACME:
--; http://www.esw-heim.tu-clausthal.de/~marco/smorbrod/acme/
--;
--; If you want the source code, send me an email :-)
--;
--
-- dcb 76, 94, 11,133, 32,162, 8,160, 8,145, 16,136,208,251,165, 16
-- dcb 24,105, 32,133, 16,165, 17,105, 0,133, 17,165, 32,202,208,231
-- dcb 96,230, 48,165, 48, 41, 63,133, 48,170,189,106, 6,170,189, 8
-- dcb 3,105, 1, 41, 3,157, 8, 3,138, 73,231,170,189, 0, 2,105
-- dcb 1, 41, 3,157, 0, 2,165, 48, 73, 63,170,189,106, 6, 73,224
-- dcb 170,189, 8, 2,105, 1, 41, 3,157, 8, 2,138, 73,231,170,189
-- dcb 0, 3,105, 1, 41, 3,157, 0, 3, 96,224,192,160,128, 96,225
-- dcb 64,193,161,226,129, 32,194, 97,162,227,195,130,228, 65,163,196
-- dcb 98,229,131,164,197,230,231,132,165,198, 99, 66, 33, 0,199,166
-- dcb 133,100,167, 67,134,101,135, 34, 68,102,103, 69, 35, 70, 71, 36
-- dcb 1, 37, 38, 39, 2, 3, 4, 5, 6, 7,166, 48,189,198, 6,170
-- dcb 254, 24, 3, 73, 7,170,254, 16, 3, 73,231,170,254, 24, 2, 73
-- dcb 7,170,254, 16, 2, 96, 0, 32, 1, 33, 64, 2, 65, 34, 96, 66
-- dcb 3, 97, 35, 98, 67,128, 4,129, 36, 99,130, 68,160, 5,161,131
-- dcb 100, 37,162, 69,132,192,163,101, 6,193, 38,194, 70,164,133,195
-- dcb 102,224, 7,225, 39,165,226,196,134, 71,227,103,197,166,228,135
-- dcb 198,229,167,230,199,231,166, 49,189, 21, 7,170,189, 0,160,157
-- dcb 0, 5,230, 49, 96,195,227,194,162,228, 97,226,128,129,130,225
-- dcb 64,161,163,224, 96,160,193,196, 32, 98,192, 65, 0,131,229,164
-- dcb 33, 99,197, 66,132, 1,230, 34,165, 67,100,198, 2, 3, 68, 6
-- dcb 35,133,166, 5,101, 4,199, 7, 36,231, 69,134,167, 37, 38,102
-- dcb 135, 70,232, 71, 39,103,136,200,168, 8, 11, 10,169,233,104, 9
-- dcb 12,137,201, 13, 40, 44, 72, 43,170, 42, 45, 41,105, 73,202, 14
-- dcb 138,234, 74, 75,106,203, 76,171, 46, 77,235,107,139, 15,108,172
-- dcb 174,140,173,141,142,204,109,206,207,205, 78,175, 47,236,239,143
-- dcb 237,238,110,240,241,111,208, 16, 79,176,209,242, 48,144,243, 80
-- dcb 177,244,112,210, 17, 49,178,179, 52, 53,147, 18, 81,211,145, 19
-- dcb 146, 51, 85,180, 20, 54,113,148, 22, 50, 84,212, 21, 55,115,245
-- dcb 83,114,116, 23, 82, 86, 88, 89, 87,118,117,119,149,213, 56, 57
-- dcb 181,214, 90,121,122,150,151,182,183,215,246, 58,120,247, 24,153
-- dcb 184,152,216, 25, 26, 59, 91,248,123,185, 27, 60,217,154, 28, 92
-- dcb 249, 29,155,186, 61,218, 93,124,250,187, 30,251, 62,156, 94,125
-- dcb 219,188, 31,252,254,220,253, 63,126,255,157,221, 95,159,191,222
-- dcb 127,189,223,158,190,165, 66, 41,224,208, 72,165, 66, 24,105, 1
-- dcb 41, 31,133, 66,165, 67,240, 7,198, 67,169, 0, 76, 97, 8,198
-- dcb 69,240,247, 16, 37,166, 64,230, 64,189,177, 9, 16, 15, 41,127
-- dcb 133, 67, 73,127,208,228,169, 1,133, 70, 76, 42, 8,170,189,117
-- dcb 8,133, 69,234,234,189,181, 8,133, 65,166, 65,230, 65,189,245
-- dcb 8,133, 68,165, 66, 24,105,224,133, 66,166, 66,169, 1,102, 68
-- dcb 42,157, 0,160, 96, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2
-- dcb 3, 2, 3, 3, 3, 3, 3, 1, 2, 3, 1, 5, 3, 3, 3, 3
-- dcb 3, 2, 2, 3, 3, 5, 4, 3, 3, 5, 4, 4, 4, 3, 3, 4
-- dcb 4, 1, 3, 4, 3, 5, 5, 5, 4, 5, 4, 4, 3, 4, 4, 7
-- dcb 4, 4, 4, 2, 1, 0, 3, 6, 9, 12, 15, 18, 21, 24, 27, 30
-- dcb 32, 35, 35, 38, 40, 43, 46, 49, 50, 52, 4, 55, 55, 60, 63, 65
-- dcb 68, 71, 73, 75, 78, 78, 33, 83, 86, 89, 94, 98,102,106,109,112
-- dcb 116, 94,120,123,127,130,134,139,144,148,153,157,161,164,167,171
-- dcb 178,171,182,186, 5, 56, 68, 56, 36,124, 4, 76, 84, 36, 68, 84
-- dcb 40, 24, 40,124,100, 84, 88, 56, 84, 72, 76, 80, 96, 40, 84, 40
-- dcb 36, 84, 56, 44, 28,124, 36, 24, 24, 36,124, 24, 52, 16, 60, 80
-- dcb 24, 37, 30,124, 32, 28,188, 1,190,124, 24, 36, 60, 32, 28, 32
-- dcb 28, 24, 36, 24, 63, 36, 24, 36, 63, 60, 16, 32, 52, 44,120, 36
-- dcb 56, 4, 60, 56, 4, 56, 4, 56, 57, 6, 56, 44, 52, 36, 12, 48
-- dcb 208, 48, 12,252,164,164, 88,120,132,132, 72,252,132,132,120,252
-- dcb 164,132,252,160,128,120,132,164, 56,252, 32, 32,252, 8, 4,248
-- dcb 252, 48, 80,140,252, 4, 4,252, 64, 60, 64,252, 64, 48, 8,252
-- dcb 120,132,132,132,120,252,144,144, 96,120,132,134,133,120,252,144
-- dcb 144,108, 68,164,164,152,128,252,128,248, 4, 4,248, 4, 8,240
-- dcb 224, 28, 16,224, 28, 16,224,204, 48, 48,204,140,148,164,196, 0
-- dcb 0,133, 41, 10, 28, 29, 63, 63, 63,136, 15, 10, 28, 29, 14, 27
-- dcb 63, 63, 63,132, 55, 17, 18, 28, 62, 18, 28, 62, 10,136, 27, 14
-- dcb 10, 21, 21, 34,143, 15, 10, 28, 29,142, 39, 40, 48, 50,149,145
-- dcb 10, 23, 13, 62, 23, 24, 32,136, 28, 24, 22, 14,136, 11, 14, 10
-- dcb 30, 29, 18, 15, 30, 21,128, 14, 15, 15, 14, 12, 29, 28, 63, 63
-- dcb 63,144,159,255, 55, 17, 18, 28, 62, 18, 28, 62, 10, 21, 21,129
-- dcb 15, 24, 27, 62, 23, 24, 32,136, 11, 34, 14, 63, 63, 63,141, 63
-- dcb 63, 63, 11, 34, 14,150,159,143, 11, 34, 62, 39, 48, 54, 38, 2
-- dcb 0, 0, 7, 63, 5, 63, 2, 9, 11, 34, 62, 39, 48, 54, 38, 2
-- dcb 0, 0, 7, 63, 5, 63, 2, 9, 11, 34, 62, 39, 48, 54, 38, 2
-- dcb 0, 0, 7, 63, 5, 63, 2, 9,143,159,255,169, 0,133, 42,169
-- dcb 1,133, 44,133, 45,169, 0,133, 32,169,160,133, 33,165, 42,133
-- dcb 43,162, 15,160, 15,145, 32, 24,101, 44,230, 44,136, 16,246,165
-- dcb 32, 24,105, 32,133, 32,165, 33,105, 0,133, 33,169, 1,133, 44
-- dcb 165, 43, 24,101, 45,133, 43,230, 45,202, 16,215,169, 0,133, 32
-- dcb 169,160,133, 33,169,224,133, 34,169, 3,133, 35,169, 0,133, 36
-- dcb 169, 4,133, 37,169,240,133, 38,169, 3,133, 39,169, 16,133, 40
-- dcb 169, 4,133, 41,169, 15,133, 46,160, 15,177, 32, 74, 74, 74, 74
-- dcb 170,189, 62, 11,209, 34,240, 18,145, 34,145, 36,170,152, 73, 15
-- dcb 168,138,145, 38,145, 40,152, 73, 15,168,136, 16,221,165, 32, 24
-- dcb 105, 32,133, 32,165, 33,105, 0,133, 33,165, 34, 24,105,224,133
-- dcb 34,165, 35,105,255,133, 35,165, 36, 24,105, 32,133, 36,165, 37
-- dcb 105, 0,133, 37,165, 38, 24,105,224,133, 38,165, 39,105,255,133
-- dcb 39,165, 40, 24,105, 32,133, 40,165, 41,105, 0,133, 41,198, 46
-- dcb 16,150,230, 42,165, 42, 41, 63,240, 3, 76, 95, 10, 96, 0, 11
-- dcb 12, 15, 1, 15, 12, 11, 0, 11, 12, 15, 1, 15, 12, 11, 0, 11
-- dcb 12, 15, 1, 15, 12, 11, 0, 11, 12, 15, 1, 15, 12, 11,169, 1
-- dcb 162,255,134, 16,162, 1,134, 17, 32, 3, 6,169, 2,162, 7,134
-- dcb 16,162, 2,134, 17, 32, 3, 6,169, 3,162, 7,134, 16,162, 3
-- dcb 134, 17, 32, 3, 6,169, 31,133, 66,169, 0,133, 70,133, 67,133
-- dcb 64,169, 1,141,109, 8,169, 0,141,114, 8,169,160,141,115, 8
-- dcb 169, 63,133, 48,169,128,133, 49,169, 3,141,109, 8,169, 0,170
-- dcb 157, 0,160,232,208,250, 32, 33, 6, 32,170, 6, 32, 6, 7, 32
-- dcb 21, 8,165, 66, 73, 31,208, 13,173,109, 8, 24,105, 2, 41, 3
-- dcb 105, 3,141,109, 8,165, 49,208,221,173, 17, 7, 73, 1,141, 17
-- dcb 7,165, 70,240,209, 32, 29, 12, 32, 91, 10,169, 31,133, 66,169
-- dcb 0,133, 70,133, 67,141,109, 8,169, 0,141,114, 8,169, 3,141
-- dcb 115, 8, 32, 29, 12, 32, 21, 8,165, 66, 73, 31,208,247,173,115
-- dcb 8, 73, 7,141,115, 8,165, 70,240,235, 76, 94, 11,169, 0,170
-- dcb 157, 0, 2,157, 0, 3,157, 0, 4,157, 0, 5,232,208,241, 96
--