Merge branch 'master' of ssh://lukeshu.com:1863/srv/git/mirror/parabola/abslibre

37 files changed, 143 insertions, 80 deletions

diff --git a/libre-multilib/lib32-mesa-demos-libre/PKGBUILD b/libre-multilib/lib32-mesa-demos/PKGBUILD
index badab3a2e..07230a3d7 100644
--- a/libre-multilib/lib32-mesa-demos-libre/PKGBUILD
+++ b/libre-multilib/lib32-mesa-demos/PKGBUILD
@@ -1,20 +1,19 @@
-# $Id: PKGBUILD 115314 2014-07-08 15:30:12Z bluewind $
+# $Id: PKGBUILD 117596 2014-08-19 02:28:18Z fyan $
 # Maintainer (Arch): Jan de Groot <jgc@archlinux.org>
 # Maintainer (Arch): Andreas Radke <andyrtr@archlinux.org>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
-_pkgbasename=mesa-demos-libre
+_pkgbasename=mesa-demos
 pkgname=lib32-$_pkgbasename
 pkgver=8.2.0
-pkgrel=2
+pkgrel=2.parabola1
 arch=(x86_64)
 pkgdesc="Mesa demos and tools (32-bit), without nonfree demos"
 url="http://mesa3d.sourceforge.net"
 license=('custom')
-provides=("lib32-mesa-demos=$pkgver")
-replaces=('lib32-mesa-demos')
-conflicts=('lib32-mesa-demos')
-depends=('lib32-libgl' 'lib32-glew' 'mesa-demos-libre')
+replaces=('lib32-mesa-demos-libre')
+conflicts=('lib32-mesa-demos-libre')
+depends=('lib32-libgl' 'lib32-glew' 'mesa-demos')
 makedepends=(gcc-multilib 'lib32-mesa' 'lib32-glew')
 source=(https://repo.parabolagnulinux.org/other/mesa-demos-libre/mesa-demos-libre-${pkgver}.tar.bz2
         libre.patch)
@@ -39,7 +38,7 @@ build() {
 }
 
 package() {
-  depends=('lib32-glew' mesa-demos-libre)
+  depends=('lib32-glew' mesa-demos)
 
   cd "${srcdir}/mesa-demos-${pkgver}"
   make DESTDIR="${pkgdir}" install
@@ -51,5 +50,5 @@ package() {
   rm -r "$pkgdir/usr/share/mesa-demos"
 
   mkdir -p "$pkgdir/usr/share/licenses"
-  ln -s mesa-demos "$pkgdir/usr/share/licenses/lib32-mesa-demos"
+  ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
 }
diff --git a/libre-multilib/lib32-mesa-demos-libre/libre.patch b/libre-multilib/lib32-mesa-demos/libre.patch
index 43e2d1e37..43e2d1e37 100644
--- a/libre-multilib/lib32-mesa-demos-libre/libre.patch
+++ b/libre-multilib/lib32-mesa-demos/libre.patch
diff --git a/libre-multilib/lib32-sdl-libre/PKGBUILD b/libre-multilib/lib32-sdl/PKGBUILD
index 1b294adf0..4bb815cfe 100644
--- a/libre-multilib/lib32-sdl-libre/PKGBUILD
+++ b/libre-multilib/lib32-sdl/PKGBUILD
@@ -1,35 +1,48 @@
-# $Id: PKGBUILD 78820 2012-10-25 06:47:28Z foutrelis $
+# $Id: PKGBUILD 114755 2014-07-03 20:47:41Z heftig $
 # Maintainer (Arch): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor (Arch): Allan McRae <allan@archlinux.org>
 # Contributor (Arch): dorphell <dorphell@archlinux.org>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
-_pkgbasename=sdl-libre
+_pkgbasename=sdl
 pkgname=lib32-$_pkgbasename
 pkgver=1.2.15
-pkgrel=3
+pkgrel=6.parabola1
 pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard (32-bit), without nonfree riva_mmio.h file"
 arch=('x86_64')
 url="http://www.libsdl.org"
 license=('LGPL')
-provides=("lib32-sdl=${pkgver}")
-conflicts=('lib32-sdl')
-replaces=('lib32-sdl')
+conflicts=('lib32-sdl-libre')
+replaces=('lib32-sdl-libre')
 depends=('lib32-libxext' 'lib32-libxrender' 'lib32-libx11' $_pkgbasename)
-makedepends=('lib32-alsa-lib' 'lib32-mesa' 'lib32-libpulse' gcc-multilib)
+makedepends=('lib32-alsa-lib' 'lib32-mesa' 'lib32-libpulse' 'lib32-glu' gcc-multilib)
 optdepends=('lib32-alsa-lib: ALSA audio driver'
             'lib32-libpulse: PulseAudio audio driver')
-options=('!libtool')
-source=(https://repo.parabolagnulinux.org/other/$pkgname/SDL-libre-${pkgver}.tar.gz
+options=('staticlibs')
+source=(https://repo.parabolagnulinux.org/other/sdl-libre/SDL-libre-${pkgver}.tar.gz
         sdl-1.2.14-fix-mouse-clicking.patch
         sdl-1.2.14-disable-mmx.patch
         fix_joystick_misc_axes.diff
-        libsdl-1.2.15-resizing.patch)
+        libsdl-1.2.15-resizing.patch
+        sdl_x11sym.patch
+        X11_KeyToUnicode.patch)
 md5sums=('c6e53ef16fa347ed066c3d68fe93c378'
          '04d8c179f125e04bcd4c9d60e013c2d7'
          'e5c16b7611f62c7cb25f0534eff68852'
          '687586a108b597a2a6b73070c1d37e51'
-         '3dd50347d8856160a9cbd7f80383a1f8')
+         '3dd50347d8856160a9cbd7f80383a1f8'
+         '148b285bccee9d21bb96db807363b962'
+         'edea272dff4698470877c016d818918d')
+
+prepare() {
+  cd SDL-$pkgver
+  patch -Np1 -i ../sdl-1.2.14-fix-mouse-clicking.patch
+  patch -Np1 -i ../sdl-1.2.14-disable-mmx.patch
+  patch -Np1 -i ../fix_joystick_misc_axes.diff
+  patch -Np1 -i ../libsdl-1.2.15-resizing.patch
+  patch -Np0 -i ../sdl_x11sym.patch
+  patch -Np1 -i ../X11_KeyToUnicode.patch
+}
 
 build() {
   export CC="gcc -m32"
@@ -37,10 +50,6 @@ build() {
   export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
 
   cd SDL-$pkgver
-  patch -Np1 -i ../sdl-1.2.14-fix-mouse-clicking.patch
-  patch -Np1 -i ../sdl-1.2.14-disable-mmx.patch
-  patch -Np1 -i ../fix_joystick_misc_axes.diff
-  patch -Np1 -i ../libsdl-1.2.15-resizing.patch
   ./configure --prefix=/usr --disable-nasm --enable-alsa \
               --with-x --disable-rpath --disable-static --libdir=/usr/lib32
   make
diff --git a/libre/sdl-libre/X11_KeyToUnicode.patch b/libre-multilib/lib32-sdl/X11_KeyToUnicode.patch
index 5f0f325b1..5f0f325b1 100644
--- a/libre/sdl-libre/X11_KeyToUnicode.patch
+++ b/libre-multilib/lib32-sdl/X11_KeyToUnicode.patch
diff --git a/libre-multilib/lib32-sdl-libre/fix_joystick_misc_axes.diff b/libre-multilib/lib32-sdl/fix_joystick_misc_axes.diff
index 75e3755c9..75e3755c9 100644
--- a/libre-multilib/lib32-sdl-libre/fix_joystick_misc_axes.diff
+++ b/libre-multilib/lib32-sdl/fix_joystick_misc_axes.diff
diff --git a/libre-multilib/lib32-sdl-libre/libre.patch b/libre-multilib/lib32-sdl/libre.patch
index 72f7da56a..72f7da56a 100644
--- a/libre-multilib/lib32-sdl-libre/libre.patch
+++ b/libre-multilib/lib32-sdl/libre.patch
diff --git a/libre-multilib/lib32-sdl-libre/libsdl-1.2.15-resizing.patch b/libre-multilib/lib32-sdl/libsdl-1.2.15-resizing.patch
index 0655a13e1..0655a13e1 100644
--- a/libre-multilib/lib32-sdl-libre/libsdl-1.2.15-resizing.patch
+++ b/libre-multilib/lib32-sdl/libsdl-1.2.15-resizing.patch
diff --git a/libre-multilib/lib32-sdl-libre/sdl-1.2.14-disable-mmx.patch b/libre-multilib/lib32-sdl/sdl-1.2.14-disable-mmx.patch
index 1bb6e0e47..1bb6e0e47 100644
--- a/libre-multilib/lib32-sdl-libre/sdl-1.2.14-disable-mmx.patch
+++ b/libre-multilib/lib32-sdl/sdl-1.2.14-disable-mmx.patch
diff --git a/libre-multilib/lib32-sdl-libre/sdl-1.2.14-fix-mouse-clicking.patch b/libre-multilib/lib32-sdl/sdl-1.2.14-fix-mouse-clicking.patch
index 7d3e5acfc..7d3e5acfc 100644
--- a/libre-multilib/lib32-sdl-libre/sdl-1.2.14-fix-mouse-clicking.patch
+++ b/libre-multilib/lib32-sdl/sdl-1.2.14-fix-mouse-clicking.patch
diff --git a/libre/sdl-libre/sdl_x11sym.patch b/libre-multilib/lib32-sdl/sdl_x11sym.patch
index 9aaa2353b..9aaa2353b 100644
--- a/libre/sdl-libre/sdl_x11sym.patch
+++ b/libre-multilib/lib32-sdl/sdl_x11sym.patch
diff --git a/libre-multilib/pcsx2-libre/PKGBUILD b/libre-multilib/pcsx2/PKGBUILD
index 3fb9571a9..462310975 100644
--- a/libre-multilib/pcsx2-libre/PKGBUILD
+++ b/libre-multilib/pcsx2/PKGBUILD
@@ -1,12 +1,11 @@
-# $Id: PKGBUILD 105941 2014-02-19 17:17:38Z alucryd $
+# $Id: PKGBUILD 117536 2014-08-18 21:27:02Z alucryd $
 # Maintainer (Arch): Maxime Gauduin <alucryd@gmail.com>
 # Contributor (Arch): josephgbr <rafael.f.f1@gmail.com>
 # Contributor (Arch): vEX <vex@niechift.com>
 
-_pkgname=pcsx2
-pkgname=$_pkgname-libre
+pkgname=pcsx2
 pkgver=1.2.2
-pkgrel=3
+pkgrel=3.parabola1
 pkgdesc='A Sony PlayStation 2 emulator, without nonfree nvidia-cg-toolkit support'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.pcsx2.net'
@@ -15,23 +14,22 @@ makedepends=('cmake' 'sparsehash')
 if [[ $CARCH == "i686" ]]; then
   depends=('glew' 'libaio' 'libcanberra' 'libjpeg-turbo' 'portaudio' 'soundtouch' 'wxgtk2.8')
 elif [[ $CARCH == "x86_64" ]]; then
-  makedepends+=('gcc-multilib' 'lib32-glew' 'lib32-libaio' 'lib32-libcanberra' 'lib32-libjpeg-turbo' 'lib32-mesa-libgl' 'lib32-portaudio' 'lib32-soundtouch' 'lib32-wxgtk2.8')
+  makedepends+=('gcc-multilib' 'lib32-glew' 'lib32-libaio' 'lib32-libcanberra' 'lib32-libjpeg-turbo' 'lib32-libgl' 'lib32-portaudio' 'lib32-soundtouch' 'lib32-wxgtk2.8')
 fi
-provides=("$_pkgname=$pkgver")
-conflicts=("$_pkgname")
-replaces=("$_pkgname")
+conflicts=("${pkgname}-libre")
+replaces=("${pkgname}-libre")
 options=('!emptydirs')
 source=("https://github.com/PCSX2/pcsx2/archive/v${pkgver}.tar.gz")
 sha256sums=('4fccef58098d099ffe955fadd5ceee78ed063ab585b8772f4242fd6dc5fd2d23')
 
 prepare() {
-  cd ${_pkgname}-${pkgver}
+  cd ${pkgname}-${pkgver}
   # remove Cg shader on ZZogl plugin
   sed -i '\|zzogl-pg-cg| s|^|#|' plugins/CMakeLists.txt
 }
 
 build() {
-  cd ${_pkgname}-${pkgver}
+  cd ${pkgname}-${pkgver}
 
   if [[ -d build ]]; then
     rm -rf build
@@ -51,7 +49,7 @@ build() {
 }
 
 package() {
-  cd ${_pkgname}-${pkgver}/build
+  cd ${pkgname}-${pkgver}/build
 
   if [[ $CARCH == "x86_64" ]]; then
     depends=('lib32-glew' 'lib32-libaio' 'lib32-libcanberra' 'lib32-libjpeg-turbo' 'lib32-portaudio' 'lib32-soundtouch' 'lib32-wxgtk2.8')
diff --git a/libre/abiword-libre/PKGBUILD b/libre/abiword/PKGBUILD
index 4d48bf983..70eccc2ca 100644
--- a/libre/abiword-libre/PKGBUILD
+++ b/libre/abiword/PKGBUILD
@@ -3,11 +3,10 @@
 # Contributor (Arch): Maël Lavault <moimael@neuf.fr>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
-_pkgbase=abiword
-pkgbase=abiword-libre
-pkgname=('abiword-libre' 'abiword-libre-plugins')
+pkgbase=abiword
+pkgname=('abiword' 'abiword-plugins')
 pkgver=3.0.0
-pkgrel=3
+pkgrel=3.parabola1
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url='http://www.abisource.com'
@@ -16,7 +15,7 @@ makedepends=('pkgconfig' 'asio' 'boost' 'fribidi' 'goffice' 'libwmf' 'wv'
              'libots' 'libwpg' 'librsvg' 'loudmouth' 'libsoup' 'psiconv'
              'redland' 'libical')
 options=('!makeflags')
-source=(http://abisource.com/downloads/$_pkgbase/$pkgver/source/$_pkgbase-$pkgver.tar.gz
+source=(http://abisource.com/downloads/$pkgbase/$pkgver/source/$pkgbase-$pkgver.tar.gz
         fix_crash_saving_pdf.patch
         abiword-3.0.0-librevenge.patch
         liberation-fonts.patch)
@@ -26,7 +25,7 @@ md5sums=('8d9c41cff3a8fbef8d0c835c65600e65'
          'e7ef4d436469ae4b24b0f784b09ab023')
 
 prepare() {
-  cd $_pkgbase-$pkgver
+  cd $pkgbase-$pkgver
 
   # fix FS#39652 - http://bugzilla.abisource.com/show_bug.cgi?id=13586#c2
   patch -Np2 -i ${srcdir}/fix_crash_saving_pdf.patch
@@ -47,7 +46,7 @@ prepare() {
 
 
 build() {
-  cd $_pkgbase-$pkgver
+  cd $pkgbase-$pkgver
 
 # Collab plugin is somehow broken:
 # part service
@@ -78,17 +77,16 @@ build() {
   make
 }
 
-package_abiword-libre() {
+package_abiword() {
   pkgdesc='Fully-featured word processor, without nonfree fonts support'
   depends=('fribidi' 'wv' 'goffice' 'librsvg' 'enchant' 'desktop-file-utils'
            'redland' 'libical' 'gtk-update-icon-cache')
-  install=$_pkgbase.install
-  optdepends=('abiword-libre-plugins')
-  conflicts=("abiword-libre-plugins<${pkgver}-${pkgrel}" 'abiword')
-  replaces=('abiword')
-  provides=("abiword=$pkgver")
+  install=$pkgbase.install
+  optdepends=('abiword-plugins')
+  conflicts=("abiword-plugins<${pkgver}-${pkgrel}" 'abiword-libre')
+  replaces=('abiword-libre')
 
-  cd $_pkgbase-$pkgver
+  cd $pkgbase-$pkgver
   make DESTDIR="$pkgdir" install
 
   # split out plugins, there's no Makefile target for a clean way
@@ -96,13 +94,12 @@ package_abiword-libre() {
   mv "$pkgdir"/usr/lib/abiword-${pkgver%.*}/plugins ${srcdir}/_pluginsdir
 }
 
-package_abiword-libre-plugins() {
+package_abiword-plugins() {
   pkgdesc='Additional plugins for Abiword, without nonfree fonts support'
-  depends=("abiword-libre=${pkgver}-${pkgrel}" 'loudmouth' 'libwpg' 'libwmf' 'link-grammar' 
+  depends=("abiword=${pkgver}-${pkgrel}" 'loudmouth' 'libwpg' 'libwmf' 'link-grammar' 
            'gtkmathview' 'aiksaurus' 'libxslt' 'libsoup' 'libots' 'libgsf' 'psiconv')
-  conflicts=('abiword-plugins')
-  replaces=('abiword-plugins')
-  provides=("abiword-plugins=$pkgver")
+  conflicts=('abiword-libre-plugins')
+  replaces=('abiword-libre-plugins')
 
   install -dm755 ${pkgdir}/usr/lib/abiword-${pkgver%.*}
   mv ${srcdir}/_pluginsdir/plugins ${pkgdir}/usr/lib/abiword-${pkgver%.*}/
diff --git a/libre/abiword-libre/abiword-2.8.6-glib-2.31.patch b/libre/abiword/abiword-2.8.6-glib-2.31.patch
index 8b938cc25..8b938cc25 100644
--- a/libre/abiword-libre/abiword-2.8.6-glib-2.31.patch
+++ b/libre/abiword/abiword-2.8.6-glib-2.31.patch
diff --git a/libre/abiword-libre/abiword-2.8.6-libpng15.patch b/libre/abiword/abiword-2.8.6-libpng15.patch
index 7eded4c83..7eded4c83 100644
--- a/libre/abiword-libre/abiword-2.8.6-libpng15.patch
+++ b/libre/abiword/abiword-2.8.6-libpng15.patch
diff --git a/libre/abiword-libre/abiword-2.8.6-no-undefined.patch b/libre/abiword/abiword-2.8.6-no-undefined.patch
index c07000edb..c07000edb 100644
--- a/libre/abiword-libre/abiword-2.8.6-no-undefined.patch
+++ b/libre/abiword/abiword-2.8.6-no-undefined.patch
diff --git a/libre/abiword-libre/abiword-3.0.0-librevenge.patch b/libre/abiword/abiword-3.0.0-librevenge.patch
index 9ff7aea24..9ff7aea24 100644
--- a/libre/abiword-libre/abiword-3.0.0-librevenge.patch
+++ b/libre/abiword/abiword-3.0.0-librevenge.patch
diff --git a/libre/abiword-libre/abiword.install b/libre/abiword/abiword.install
index cc4abc0b6..cc4abc0b6 100644
--- a/libre/abiword-libre/abiword.install
+++ b/libre/abiword/abiword.install
diff --git a/libre/abiword-libre/compat_libwpg_0_9.patch b/libre/abiword/compat_libwpg_0_9.patch
index cf36e188e..cf36e188e 100644
--- a/libre/abiword-libre/compat_libwpg_0_9.patch
+++ b/libre/abiword/compat_libwpg_0_9.patch
diff --git a/libre/abiword-libre/fix_crash_saving_pdf.patch b/libre/abiword/fix_crash_saving_pdf.patch
index 6dd78c7f9..6dd78c7f9 100644
--- a/libre/abiword-libre/fix_crash_saving_pdf.patch
+++ b/libre/abiword/fix_crash_saving_pdf.patch
diff --git a/libre/abiword-libre/liberation-fonts.patch b/libre/abiword/liberation-fonts.patch
index 1660c3ead..1660c3ead 100644
--- a/libre/abiword-libre/liberation-fonts.patch
+++ b/libre/abiword/liberation-fonts.patch
diff --git a/libre/mesa-demos-libre/LICENSE b/libre/mesa-demos/LICENSE
index ae33d2709..ae33d2709 100644
--- a/libre/mesa-demos-libre/LICENSE
+++ b/libre/mesa-demos/LICENSE
diff --git a/libre/mesa-demos-libre/PKGBUILD b/libre/mesa-demos/PKGBUILD
index 728432ce3..24521b827 100644
--- a/libre/mesa-demos-libre/PKGBUILD
+++ b/libre/mesa-demos/PKGBUILD
@@ -3,16 +3,15 @@
 # Maintainer (Arch): Andreas Radke <andyrtr@archlinux.org>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
-pkgname='mesa-demos-libre'
+pkgname='mesa-demos'
 pkgver=8.2.0
-pkgrel=3
+pkgrel=3.parabola1
 arch=('i686' 'x86_64' 'mips64el')
 pkgdesc="Mesa demos and tools, without nonfree demos"
 url="http://mesa3d.sourceforge.net"
 license=('custom')
-provides=("mesa-demos=$pkgver")
-replaces=('mesa-demos')
-conflicts=('mesa-demos')
+replaces=('mesa-demos-libre')
+conflicts=('mesa-demos-libre')
 depends=('libgl' 'glew' 'freeglut')
 mksource=("ftp://ftp.freedesktop.org/pub/mesa/demos/${pkgver}/mesa-demos-${pkgver}.tar.bz2")
 source=("https://repo.parabolagnulinux.org/other/mesa-demos-libre/mesa-demos-libre-${pkgver}.tar.bz2"
diff --git a/libre/mesa-demos-libre/libre.patch b/libre/mesa-demos/libre.patch
index 43e2d1e37..43e2d1e37 100644
--- a/libre/mesa-demos-libre/libre.patch
+++ b/libre/mesa-demos/libre.patch
diff --git a/libre/sdl-libre/PKGBUILD b/libre/sdl/PKGBUILD
index ab057d514..957598225 100644
--- a/libre/sdl-libre/PKGBUILD
+++ b/libre/sdl/PKGBUILD
@@ -6,16 +6,15 @@
 # Maintainer: Márcio Silva <coadde@parabola.nu>
 # Maintainer (Connochaetos): Henry Jensen <hjensen@connochaetos.org>
 
-pkgname=sdl-libre
+pkgname=sdl
 pkgver=1.2.15
-pkgrel=6
+pkgrel=6.parabola1
 pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard, without nonfree riva_mmio.h file"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.libsdl.org"
 license=('LGPL')
-provides=("sdl=${pkgver}")
-conflicts=('sdl')
-replaces=('sdl')
+conflicts=('sdl-libre')
+replaces=('sdl-libre')
 depends=('glibc' 'libxext' 'libxrender' 'libx11')
 makedepends=('alsa-lib' 'mesa' 'libpulse' 'glu')
 optdepends=('alsa-lib: ALSA audio driver'
@@ -23,7 +22,7 @@ optdepends=('alsa-lib: ALSA audio driver'
 options=('staticlibs')
 mksource=(http://www.libsdl.org/release/SDL-${pkgver}.tar.gz
           libre.patch)
-source=(https://repo.parabolagnulinux.org/other/$pkgname/SDL-libre-${pkgver}.tar.gz
+source=(https://repo.parabolagnulinux.org/other/${pkgname}-libre/SDL-libre-${pkgver}.tar.gz
         sdl-1.2.14-fix-mouse-clicking.patch
         sdl-1.2.14-disable-mmx.patch
         fix_joystick_misc_axes.diff
diff --git a/libre/sdl/X11_KeyToUnicode.patch b/libre/sdl/X11_KeyToUnicode.patch
new file mode 100644
index 000000000..5f0f325b1
--- /dev/null
+++ b/libre/sdl/X11_KeyToUnicode.patch
@@ -0,0 +1,52 @@
+
+# HG changeset patch
+# User Sam Lantinga <slouken@libsdl.org>
+# Date 1327258041 18000
+# Node ID 900a0fae90ca65cff55a70a17b9ec39d2ddccbcf
+# Parent  5273dfd19a5e8c5736a0d417bd441f704c5355f8
+Fixed bug 1390 - X11_KeyToUnicode
+
+manuel.montezelo 2012-01-22 08:56:18 PST
+
+We had the following bug report at Debian:
+http://bugs.debian.org/376560
+
+Same one in Ubuntu:
+https://bugs.launchpad.net/ubuntu/+source/libsdl1.2/+bug/66217
+
+We've been including a patch since then (attached) to actually export the
+symbol, since 2006.  In the last release the function seems to be there, alive
+and kicking.
+
+It's affecting other people too:
+http://www.garagegames.com/community/forums/viewthread/52287
+
+diff -r 5273dfd19a5e -r 900a0fae90ca src/video/x11/SDL_x11events.c
+--- a/src/video/x11/SDL_x11events.c	Sat Jan 21 12:06:51 2012 -0500
++++ b/src/video/x11/SDL_x11events.c	Sun Jan 22 13:47:21 2012 -0500
+@@ -1246,8 +1246,11 @@
+  * sequences (dead accents, compose key sequences) will not work since the
+  * state has been irrevocably lost.
+  */
++extern DECLSPEC Uint16 SDLCALL X11_KeyToUnicode(SDLKey, SDLMod);
++
+ Uint16 X11_KeyToUnicode(SDLKey keysym, SDLMod modifiers)
+ {
++	static int warning = 0;
+ 	struct SDL_VideoDevice *this = current_video;
+ 	char keybuf[32];
+ 	int i;
+@@ -1255,6 +1258,12 @@
+ 	XKeyEvent xkey;
+ 	Uint16 unicode;
+ 
++	if ( warning ) {
++		warning = 0;
++		fprintf(stderr, "WARNING: Application is using X11_KeyToUnicode().\n");
++		fprintf(stderr, "This is not an official SDL function, please report this as a bug.\n");
++	}
++
+ 	if ( !this || !SDL_Display ) {
+ 		return 0;
+ 	}
+
diff --git a/libre/sdl-libre/fix_joystick_misc_axes.diff b/libre/sdl/fix_joystick_misc_axes.diff
index 75e3755c9..75e3755c9 100644
--- a/libre/sdl-libre/fix_joystick_misc_axes.diff
+++ b/libre/sdl/fix_joystick_misc_axes.diff
diff --git a/libre/sdl-libre/libre.patch b/libre/sdl/libre.patch
index 72f7da56a..72f7da56a 100644
--- a/libre/sdl-libre/libre.patch
+++ b/libre/sdl/libre.patch
diff --git a/libre/sdl-libre/libsdl-1.2.15-resizing.patch b/libre/sdl/libsdl-1.2.15-resizing.patch
index 0655a13e1..0655a13e1 100644
--- a/libre/sdl-libre/libsdl-1.2.15-resizing.patch
+++ b/libre/sdl/libsdl-1.2.15-resizing.patch
diff --git a/libre/sdl-libre/sdl-1.2.14-disable-mmx.patch b/libre/sdl/sdl-1.2.14-disable-mmx.patch
index 1bb6e0e47..1bb6e0e47 100644
--- a/libre/sdl-libre/sdl-1.2.14-disable-mmx.patch
+++ b/libre/sdl/sdl-1.2.14-disable-mmx.patch
diff --git a/libre/sdl-libre/sdl-1.2.14-fix-mouse-clicking.patch b/libre/sdl/sdl-1.2.14-fix-mouse-clicking.patch
index 7d3e5acfc..7d3e5acfc 100644
--- a/libre/sdl-libre/sdl-1.2.14-fix-mouse-clicking.patch
+++ b/libre/sdl/sdl-1.2.14-fix-mouse-clicking.patch
diff --git a/libre/sdl/sdl_x11sym.patch b/libre/sdl/sdl_x11sym.patch
new file mode 100644
index 000000000..9aaa2353b
--- /dev/null
+++ b/libre/sdl/sdl_x11sym.patch
@@ -0,0 +1,12 @@
+--- src/video/x11/SDL_x11sym.h-orig	2013-07-16 23:56:46.718523385 -0600
++++ src/video/x11/SDL_x11sym.h	2013-07-16 23:58:27.025186485 -0600
+@@ -165,7 +165,8 @@
+  */
+ #ifdef LONG64
+ SDL_X11_MODULE(IO_32BIT)
+-SDL_X11_SYM(int,_XData32,(Display *dpy,register long *data,unsigned len),(dpy,data,len),return)
++
++SDL_X11_SYM(int,_XData32,(Display *dpy,register _Xconst long *data,unsigned len),(dpy,data,len),return)
+ SDL_X11_SYM(void,_XRead32,(Display *dpy,register long *data,long len),(dpy,data,len),)
+ #endif
+ 
diff --git a/libre/your-freedom/PKGBUILD b/libre/your-freedom/PKGBUILD
index 44e5e314b..2edc47996 100644
--- a/libre/your-freedom/PKGBUILD
+++ b/libre/your-freedom/PKGBUILD
@@ -5,8 +5,8 @@ pkgdesc="This package conflicts with every nonfree package known to date to ensu
 license=('GPL3')
 #url="https://projects.parabolagnulinux.org/blacklist.git"
 url="https://lukeshu.com/git/mirror/parabola/blacklist.git"
-pkgver=20140827.1
-_gitver=5575cf1f075adc00652d6c9aad01369e1410d8fb
+pkgver=20140902
+_gitver=bfd30ccf75e7637ed277491339646faf85db304a
 pkgrel=1
 
 arch=('any')
@@ -16,7 +16,7 @@ install=${pkgname}.install
 makedepends=(librelib)
 #source=(blacklist-${_gitver}.txt::https://projects.parabolagnulinux.org/blacklist.git/plain/blacklist.txt?id=${_gitver})
 source=(blacklist-${_gitver}.txt::https://lukeshu.com/git/mirror/parabola/blacklist.git/plain/blacklist.txt?id=${_gitver})
-md5sums=('4ab2276e3fe204e2876e26714f22baf3')
+md5sums=('86a541c856434deecf0b067b9d70993a')
 
 package() {
 	cd "$srcdir"
diff --git a/pcr/debootstrap-libre/PKGBUILD b/pcr/debootstrap/PKGBUILD
index 6b8d08730..13d5db98d 100644
--- a/pcr/debootstrap-libre/PKGBUILD
+++ b/pcr/debootstrap/PKGBUILD
@@ -1,23 +1,21 @@
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
-_pkgname=debootstrap
-pkgname=debootstrap-libre
-pkgver=1.0.59
-pkgrel=1
+pkgname=debootstrap
+pkgver=1.0.60
+pkgrel=1.parabola1
 pkgdesc="A tool used to create a gNewSense or Trisquel base system from scratch, without requiring the availability of dpkg or apt (Debian support removed)"
 arch=('any')
 license=('MIT')
 url="http://packages.debian.org/sid/debootstrap"
 depends=('wget')
-replaces=($_pkgname)
-conflicts=($_pkgname)
-provides=($_pkgname=$pkgver)
-source=("http://ftp.debian.org/debian/pool/main/d/${_pkgname}/${_pkgname}_${pkgver}_all.deb"
-        "${_pkgname}.8.gz"
+replaces=(${pkgname}-libre)
+conflicts=(${pkgname}-libre)
+source=("http://ftp.debian.org/debian/pool/main/d/${pkgname}/${pkgname}_${pkgver}_all.deb"
+        "${pkgname}.8.gz"
         'gnewsense'
         'trisquel')
 install="debootstrap.install"
-md5sums=('16d5acf9a2676692a57b662975b70170'
+md5sums=('c5d76a54d58e9567bda7958a7140bc30'
          'b565d089342b8a7ee35166b5d90825c7'
          '13978bdd1d877a0dd2c3c874ecd54f03'
          'b020aa8426e70a6024c8e76312c17d78')
@@ -39,11 +37,11 @@ package(){
   sed 's/gpgv/gpg1v/g;' -i "${pkgdir}/usr/bin/debootstrap" "${pkgdir}/usr/share/debootstrap/functions"
 
   # add rebranded man
-  install -m644 ${_pkgname}.8.gz  "${pkgdir}/usr/share/man/man8"
+  install -m644 ${pkgname}.8.gz  "${pkgdir}/usr/share/man/man8"
 
   # move license to licenses folder
   install -Dm644 "${pkgdir}/usr/share/doc/debootstrap/copyright" \
-  "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
+  "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
   rm -rv "${pkgdir}/usr/share/doc"
 
   # add gNewSense script
diff --git a/pcr/debootstrap-libre/debootstrap.8.gz b/pcr/debootstrap/debootstrap.8.gz
index 07ec4808c..07ec4808c 100644
--- a/pcr/debootstrap-libre/debootstrap.8.gz
+++ b/pcr/debootstrap/debootstrap.8.gz
diff --git a/pcr/debootstrap-libre/debootstrap.install b/pcr/debootstrap/debootstrap.install
index 3da2f1d22..3da2f1d22 100644
--- a/pcr/debootstrap-libre/debootstrap.install
+++ b/pcr/debootstrap/debootstrap.install
diff --git a/pcr/debootstrap-libre/gnewsense b/pcr/debootstrap/gnewsense
index 884ac88a0..884ac88a0 100644
--- a/pcr/debootstrap-libre/gnewsense
+++ b/pcr/debootstrap/gnewsense
diff --git a/pcr/debootstrap-libre/trisquel b/pcr/debootstrap/trisquel
index 7efa062f9..7efa062f9 100644
--- a/pcr/debootstrap-libre/trisquel
+++ b/pcr/debootstrap/trisquel