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

29 files changed, 276 insertions, 123 deletions

diff --git a/libre/atril/PKGBUILD b/libre/atril/PKGBUILD
index a165d06f8..305421085 100644
--- a/libre/atril/PKGBUILD
+++ b/libre/atril/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 106531 2014-03-05 20:16:04Z flexiondotorg $
+# $Id: PKGBUILD 119840 2014-09-29 20:06:57Z flexiondotorg $
 # Maintainer (Arch): Martin Wimpress <code@flexion.org>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
 pkgname=atril
-pkgver=1.8.0
-pkgrel=1.parabola2
+pkgver=1.8.1
+pkgrel=1.parabola1
 pkgdesc="Simply a document viewer, with libarchive support"
 url="http://mate-desktop.org"
 arch=('i686' 'x86_64' 'mips64el')
@@ -27,14 +27,14 @@ options=('!emptydirs')
 groups=('mate-extra')
 source=("http://pub.mate-desktop.org/releases/1.8/${pkgname}-${pkgver}.tar.xz"
         'libarchive.patch')
-sha1sums=('8327437ba12df61326b83342cea746d1764727d0'
+sha1sums=('2051be961a84d118ad0a278ec22bf48ca5d3fc35'
           'e88168d61b18ce8e340ef3db9c6df6bb66c65d14')
 install=${pkgname}.install
 
 prepare() {
     cd "${srcdir}/${pkgname}-${pkgver}"
-    NOCONFIGURE=1 ./autogen.sh
     patch -Np1 -i ../libarchive.patch
+    NOCONFIGURE=1 ./autogen.sh
 }
 
 build() {
diff --git a/libre/calibre/PKGBUILD b/libre/calibre/PKGBUILD
index 152a0822c..83366a96c 100644
--- a/libre/calibre/PKGBUILD
+++ b/libre/calibre/PKGBUILD
@@ -10,7 +10,7 @@
 pkgname=calibre
 _pkgname=$pkgname-libre
 pkgver=2.4.0
-pkgrel=1.parabola1
+pkgrel=1.parabola2
 pkgdesc="Ebook management application, without nonfree decompression engine for RAR archives"
 arch=('i686' 'x86_64' 'mips64el') 
 url="http://$pkgname-ebook.com/"
diff --git a/libre/cups-filters/PKGBUILD b/libre/cups-filters/PKGBUILD
index da6722205..a2fe9d04e 100644
--- a/libre/cups-filters/PKGBUILD
+++ b/libre/cups-filters/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=cups-filters
 pkgver=1.0.59
-pkgrel=1.parabola1
+pkgrel=1.parabola2
 pkgdesc="OpenPrinting CUPS Filters, without foomatic-db-nonfree recommendation"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.linuxfoundation.org/collaborate/workgroups/openprinting"
diff --git a/libre/doublecmd/PKGBUILD b/libre/doublecmd/PKGBUILD
index 918679715..8359f06f0 100644
--- a/libre/doublecmd/PKGBUILD
+++ b/libre/doublecmd/PKGBUILD
@@ -8,7 +8,7 @@ _pkgbase=$pkgbase-libre
 pkgname=("$pkgbase-gtk2" "$pkgbase-qt")
 pkgver=0.5.11
 _helpver=0.5.5
-pkgrel=1.parabola1
+pkgrel=1.parabola2
 url="http://$pkgbase.sourceforge.net/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
diff --git a/libre/engrampa/PKGBUILD b/libre/engrampa/PKGBUILD
index 6952dc040..1155a1584 100644
--- a/libre/engrampa/PKGBUILD
+++ b/libre/engrampa/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 107641 2014-03-18 11:10:40Z flexiondotorg $
+# $Id: PKGBUILD 119836 2014-09-29 19:57:54Z flexiondotorg $
 # Maintainer (Arch): Martin Wimpress <code@flexion.org>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
 pkgname=engrampa
-pkgver=1.8.0
+pkgver=1.8.1
 pkgrel=1.parabola1
 pkgdesc="Archive manipulator for MATE, with unar recommendation included and nonfree unace recommendation removed"
 url="http://mate-desktop.org"
@@ -21,7 +21,7 @@ conflicts=('mate-file-archiver' "${pkgname}-libre" "${pkgname}-parabola")
 groups=('mate-extra')
 source=("http://pub.mate-desktop.org/releases/1.8/${pkgname}-${pkgver}.tar.xz"
         fr-rpm-bsdtar.patch)
-sha1sums=('511019cee95568a4951e9da12d8a7282c3f6af65'
+sha1sums=('2f3e655c2e4ac5a972c06591085557906748ac6f'
           '219b05a979bf6f249aaae27964f02345fd81168d')
 install=${pkgname}.install
 
diff --git a/libre/ghostscript/PKGBUILD b/libre/ghostscript/PKGBUILD
index e12f428a6..ec459e8bc 100644
--- a/libre/ghostscript/PKGBUILD
+++ b/libre/ghostscript/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 208881 2014-03-27 20:54:33Z andyrtr $
+# $Id: PKGBUILD 222874 2014-09-23 17:46:02Z andyrtr $
 # Maintainer (Arch): AndyRTR <andyrtr@archlinux.org>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
 ### !!! rebuild groff from core that picks up hardcoding the GS versioned font path !!! ###
 
 pkgname=ghostscript
-pkgver=9.14
-pkgrel=1.parabola1
+pkgver=9.15
+pkgrel=1.parabola2
 pkgdesc="An interpreter for the PostScript language, without nonfree JPEG XR support"
 arch=('i686' 'x86_64' 'mips64el')
 license=('AGPL' 'custom')
@@ -23,8 +23,9 @@ source=(https://repo.parabolagnulinux.org/other/ghostscript-libre/ghostscript-li
         ghostscript-sys-zlib.patch
         libre.patch)
 #options=('!makeflags')
-mksha1sums=('eab1c9e9850d8aedf02d16f3f7f8198ad9384068')
-sha1sums=('18c792ac09576482fa2f6ea5bce6e73b37188356'
+# http://downloads.ghostscript.com/public/SHA1SUMS
+mksha1sums=('19f01538d33b9623bc6653d96ea4ec891f14a9d3')
+sha1sums=('d8aea50cf05d97a0412310b90ac7434d983320e9'
           'e054caf753df4d67221b29a2eac66130653f7556'
           '51f821faec00749ed8b61d772879269f9809f694')
 mksource() {
diff --git a/libre/icecat-noscript/PKGBUILD b/libre/icecat-noscript/PKGBUILD
index b63a9a746..ed0a82b30 100644
--- a/libre/icecat-noscript/PKGBUILD
+++ b/libre/icecat-noscript/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 119103 2014-09-17 17:47:51Z spupykin $
+# $Id: PKGBUILD 119752 2014-09-29 10:10:57Z spupykin $
 # Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
 _pkgname=firefox-noscript
 pkgname=icecat-noscript
-pkgver=2.6.8.41
+pkgver=2.6.8.43
 pkgrel=1
 pkgdesc="Extension for icecat which disables script"
 arch=('any')
@@ -14,7 +14,7 @@ depends=()
 provides=($_pkgname=$pkgver)
 makedepends=('unzip')
 source=(https://secure.informaction.com/download/releases/noscript-$pkgver.xpi)
-md5sums=('a79905de91ad9e9cf03fa1320647e92a')
+md5sums=('98c213de6900e63696064b2d419ef4e0')
 
 package() {
   depends=("icecat")
diff --git a/libre/iceweasel-noscript/PKGBUILD b/libre/iceweasel-noscript/PKGBUILD
index 04aa59622..d8584c8f6 100644
--- a/libre/iceweasel-noscript/PKGBUILD
+++ b/libre/iceweasel-noscript/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 119103 2014-09-17 17:47:51Z spupykin $
+# $Id: PKGBUILD 119752 2014-09-29 10:10:57Z spupykin $
 # Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
 _pkgname=firefox-noscript
 pkgname=iceweasel-noscript
-pkgver=2.6.8.41
+pkgver=2.6.8.43
 pkgrel=1
 pkgdesc="Extension for iceweasel which disables script"
 arch=('any')
@@ -14,7 +14,7 @@ depends=()
 provides=($_pkgname=$pkgver)
 makedepends=('unzip')
 source=(https://secure.informaction.com/download/releases/noscript-$pkgver.xpi)
-md5sums=('a79905de91ad9e9cf03fa1320647e92a')
+md5sums=('98c213de6900e63696064b2d419ef4e0')
 
 package() {
   depends=("iceweasel")
diff --git a/libre/kdebase-konqueror/PKGBUILD b/libre/kdebase-konqueror/PKGBUILD
index d16cb12c9..3317ea8fb 100644
--- a/libre/kdebase-konqueror/PKGBUILD
+++ b/libre/kdebase-konqueror/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname='kdebase-konqueror'
 pkgver=4.14.1
-pkgrel=1.parabola1
+pkgrel=1.parabola2
 arch=('i686' 'x86_64' 'mips64el')
 url="http://kde.org/applications/internet/konqueror/"
 license=('GPL' 'LGPL' 'FDL')
diff --git a/libre/kdebase-runtime/PKGBUILD b/libre/kdebase-runtime/PKGBUILD
index f5c4f63bf..6c02394a0 100644
--- a/libre/kdebase-runtime/PKGBUILD
+++ b/libre/kdebase-runtime/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=kdebase-runtime
 pkgver=4.14.1
-pkgrel=2.parabola1
+pkgrel=2.parabola2
 pkgdesc="Plugins and applications necessary for the running of KDE applications, without non-privacy search providers"
 arch=('i686' 'x86_64' 'mips64el')
 url='https://projects.kde.org/projects/kde/kde-runtime'
diff --git a/libre/kdelibs/PKGBUILD b/libre/kdelibs/PKGBUILD
index 9deb665a9..5b28e2e17 100644
--- a/libre/kdelibs/PKGBUILD
+++ b/libre/kdelibs/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=kdelibs
 pkgver=4.14.1
-pkgrel=2.parabola1
+pkgrel=2.parabola2
 pkgdesc="KDE Core Libraries, without nonfree plugins recommendation support"
 arch=('i686' 'x86_64' 'mips64el')
 url='https://projects.kde.org/projects/kde/kdelibs'
diff --git a/libre/kdenetwork-kopete/PKGBUILD b/libre/kdenetwork-kopete/PKGBUILD
index ed585e347..ff437936a 100644
--- a/libre/kdenetwork-kopete/PKGBUILD
+++ b/libre/kdenetwork-kopete/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=kdenetwork-kopete
 pkgver=4.14.1
-pkgrel=1.parabola1
+pkgrel=1.parabola2
 pkgdesc='Instant Messenger, without nonfree Skype support'
 url='http://kde.org/applications/internet/kopete/'
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/libre/kdeutils-ark/PKGBUILD b/libre/kdeutils-ark/PKGBUILD
index 32e4f424e..f55a85c65 100644
--- a/libre/kdeutils-ark/PKGBUILD
+++ b/libre/kdeutils-ark/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=kdeutils-ark
 pkgver=4.14.1
-pkgrel=1.parabola1
+pkgrel=1.parabola2
 pkgdesc='Archiving Tool, with unar support'
 url='http://kde.org/applications/utilities/ark/'
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/libre/linux-libre-grsec/PKGBUILD b/libre/linux-libre-grsec/PKGBUILD
index 6caf9cad6..4faa35670 100644
--- a/libre/linux-libre-grsec/PKGBUILD
+++ b/libre/linux-libre-grsec/PKGBUILD
@@ -14,7 +14,7 @@ pkgbase=linux-libre-grsec   # Build kernel with -grsec localname
 _pkgbasever=3.16-gnu
 _pkgver=3.16.3-gnu
 _grsecver=3.0
-_timestamp=201409180901
+_timestamp=201409282025
 
 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname
 _replacesoldkernels=('kernel26%' 'kernel26-libre%') # '%' gets replaced with _kernelname
@@ -45,7 +45,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li
         '3.16-7981337ad0-loongson-community.patch')
 sha256sums=('9c2a524c901febe0f0138f702bfdeb52d6f79f22c1fdbabaa37580bc70f16218'
             'b9af84b880ad0762b768ecc39a3f9b9e91288d37a609a1bf6a8873497dedad05'
-            'ff7f82e0beaf86adb4c4f632376035cd8c70767dcc910a73e54b3147a10995bd'
+            '42ccb9171b698eb89a74be777710ecb0aaaad3173ab77461380acf3e42797f93'
             'SKIP'
             '12e2eb2c9ff307f0b1015925dd690ff82d5e092a41a8fd2284379d328de5e3bb'
             '08cf6f851f77b1af3c859049e439eadc940a4d7326f5c8a35eb86ce8b284df42'
diff --git a/libre/qupzilla/PKGBUILD b/libre/qupzilla/PKGBUILD
index 8cc90e191..2bc885ab9 100644
--- a/libre/qupzilla/PKGBUILD
+++ b/libre/qupzilla/PKGBUILD
@@ -5,7 +5,7 @@
 pkgbase=qupzilla
 pkgname=(qupzilla qupzilla-qt4)
 pkgver=1.8.0
-pkgrel=1.parabola1
+pkgrel=1.parabola2
 arch=(i686 x86_64 mips64el)
 url="http://www.qupzilla.com/"
 license=('GPL3')
diff --git a/libre/sdl/PKGBUILD b/libre/sdl/PKGBUILD
index 957598225..85ba31d66 100644
--- a/libre/sdl/PKGBUILD
+++ b/libre/sdl/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 212210 2014-05-10 21:41:06Z heftig $
+# $Id: PKGBUILD 223594 2014-09-27 21:07:22Z heftig $
 # Maintainer (Arch): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor (Arch): Allan McRae <allan@archlinux.org>
 # Contributor (Arch): dorphell <dorphell@archlinux.org>
@@ -8,7 +8,7 @@
 
 pkgname=sdl
 pkgver=1.2.15
-pkgrel=6.parabola1
+pkgrel=7.parabola2
 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"
@@ -23,20 +23,28 @@ options=('staticlibs')
 mksource=(http://www.libsdl.org/release/SDL-${pkgver}.tar.gz
           libre.patch)
 source=(https://repo.parabolagnulinux.org/other/${pkgname}-libre/SDL-libre-${pkgver}.tar.gz
+        SDL-1.2.10-GrabNotViewable.patch
+        SDL-1.2.15-SDL_EnableUNICODE_drops_keyboard_events.patch
+        SDL-1.2.15-const_XData32.patch
+        SDL-1.2.15-ignore_insane_joystick_axis.patch
+        SDL-1.2.15-no-default-backing-store.patch
+        SDL-1.2.15-x11-Bypass-SetGammaRamp-when-changing-gamma.patch
         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
-        sdl_x11sym.patch
         X11_KeyToUnicode.patch)
 mkmd5sums=('9d96df8417572a2afb781a7c4c811a85'
            '5c665f72b8a2adc97a91f6db6f2da79a')
 md5sums=('c6e53ef16fa347ed066c3d68fe93c378'
+         '37ad001a4d2ff924a5fab356b49f8a78'
+         '8d5a61a0adf1a302695a30141f402712'
+         'd6a1bfa054507f281338626e5f12d74b'
+         'e382e5b7449e95969c5ba4084b0aab39'
+         '1b0578c76453813eb4eaf0125ce242db'
+         '321377e38e2db7f1baf43c392e165dd5'
          '04d8c179f125e04bcd4c9d60e013c2d7'
          'e5c16b7611f62c7cb25f0534eff68852'
-         '687586a108b597a2a6b73070c1d37e51'
          '3dd50347d8856160a9cbd7f80383a1f8'
-         '148b285bccee9d21bb96db807363b962'
          'edea272dff4698470877c016d818918d')
 
 mksource() {
@@ -46,11 +54,18 @@ mksource() {
 
 prepare() {
   cd SDL-$pkgver
+  patch -Np1 -i ../SDL-1.2.10-GrabNotViewable.patch
+  patch -Np1 -i ../SDL-1.2.15-SDL_EnableUNICODE_drops_keyboard_events.patch
+  patch -Np1 -i ../SDL-1.2.15-const_XData32.patch
+  patch -Np1 -i ../SDL-1.2.15-ignore_insane_joystick_axis.patch
+  patch -Np1 -i ../SDL-1.2.15-no-default-backing-store.patch
+
+  # https://bugs.freedesktop.org/show_bug.cgi?id=27222
+  patch -Np1 -i ../SDL-1.2.15-x11-Bypass-SetGammaRamp-when-changing-gamma.patch
+
   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
 }
 
diff --git a/libre/sdl/SDL-1.2.10-GrabNotViewable.patch b/libre/sdl/SDL-1.2.10-GrabNotViewable.patch
new file mode 100644
index 000000000..128cf3510
--- /dev/null
+++ b/libre/sdl/SDL-1.2.10-GrabNotViewable.patch
@@ -0,0 +1,22 @@
+Makes SDL-1.2 SDL_WM_GrabInput() non-blocking in case of SDL window is not
+viewable. Patch provided by <pbonzini@redhat.com>.
+See <http://bugzilla.libsdl.org/show_bug.cgi?id=1155>.
+
+--- ./src/video/x11/SDL_x11wm.c	2007-12-31 04:48:13.000000000 +0000
++++ ./src/video/x11/SDL_x11wm.c	2009-01-15 10:27:14.000000000 +0000
+@@ -351,13 +351,14 @@ SDL_GrabMode X11_GrabInputNoLock(_THIS, 
+ 			result = XGrabPointer(SDL_Display, SDL_Window, True, 0,
+ 						GrabModeAsync, GrabModeAsync,
+ 						SDL_Window, None, CurrentTime);
+-			if ( result == GrabSuccess ) {
++			if ( result == GrabSuccess || result == GrabNotViewable ) {
+ 				break;
+ 			}
+ 			SDL_Delay(100);
+ 		}
+ 		if ( result != GrabSuccess ) {
+ 			/* Uh, oh, what do we do here? */ ;
++			return(SDL_GRAB_OFF);
+ 		}
+ 		/* Now grab the keyboard */
+ 		XGrabKeyboard(SDL_Display, WMwindow, True,
diff --git a/libre/sdl/SDL-1.2.15-SDL_EnableUNICODE_drops_keyboard_events.patch b/libre/sdl/SDL-1.2.15-SDL_EnableUNICODE_drops_keyboard_events.patch
new file mode 100644
index 000000000..fdf910e03
--- /dev/null
+++ b/libre/sdl/SDL-1.2.15-SDL_EnableUNICODE_drops_keyboard_events.patch
@@ -0,0 +1,73 @@
+# HG changeset patch
+# User Sam Lantinga <slouken@libsdl.org>
+# Date 1397799374 25200
+#      Thu Apr 17 22:36:14 2014 -0700
+# Branch SDL-1.2
+# Node ID 0aade9c0203f717fe4b823a176c3c040f1a709f8
+# Parent  22a7f096bb9d4d596f35a93e33608825693462b0
+Fixed bug 2325 - SDL_EnableUNICODE sometimes drops keyboard events completely
+
+Rafał Mużyło
+
+The most annoying part of this bug is that though I've found it in two separate apps, I don't have a trivial testcase for it.
+
+The problem seems to be a condition race, as it's triggered quite randomly (therefore it will be hard to tell whether it really gets fixed, if a probable fix is found).
+
+While it's specific to SDL 1.2, it seems quite similar to the problem described and fixed in http://forums.libsdl.org/viewtopic.php?p=40503.
+
+Now, I should start describing the problem.
+
+A game uses Escape to open menu (the exact key might not be important). Upon opening, it calls SDL_EnableUNICODE(1). Upon closing it calls SDL_EnableUNICODE(0).
+
+I have an IME running.
+
+Game uses SDL_PollEvent to get the events.
+
+If Escape is pressed repeatedly, menu is opened and closed, till it eventually freezes in open state.
+"freezes" in this context means "app itself still runs, but no keyboard events are getting delivered (though - for example - mouse events still are)". "getting delivered" should mean "SDL_PollEvent is not receiving any".
+If it matters, the last delivered keyboard event is a keypress, the release never arrives.
+
+It seems (no guarantees, due to random nature of the freeze) that unsetting XMODIFIERS (which - AFAIU - will disable IME as far as SDL is concerned) prevents the freeze, therefore the reference to that SDL2 thread.
+
+diff -r 22a7f096bb9d -r 0aade9c0203f src/video/x11/SDL_x11events.c
+--- a/src/video/x11/SDL_x11events.c	Sun Dec 01 00:00:17 2013 -0500
++++ b/src/video/x11/SDL_x11events.c	Thu Apr 17 22:36:14 2014 -0700
+@@ -395,6 +395,8 @@
+ {
+ 	int posted;
+ 	XEvent xevent;
++	int orig_event_type;
++	KeyCode orig_keycode;
+ 
+ 	SDL_memset(&xevent, '\0', sizeof (XEvent));  /* valgrind fix. --ryan. */
+ 	XNextEvent(SDL_Display, &xevent);
+@@ -410,9 +412,29 @@
+ #ifdef X_HAVE_UTF8_STRING
+ 	/* If we are translating with IM, we need to pass all events
+ 	   to XFilterEvent, and discard those filtered events immediately.  */
++	orig_event_type = xevent.type;
++	if (orig_event_type == KeyPress || orig_event_type == KeyRelease) {
++	     orig_keycode = xevent.xkey.keycode;
++	} else {
++	     orig_keycode = 0;
++	}
+ 	if ( SDL_TranslateUNICODE
+ 	     && SDL_IM != NULL
+ 	     && XFilterEvent(&xevent, None) ) {
++	        if (orig_keycode) {
++	            SDL_keysym keysym;
++	            static XComposeStatus state;
++	            char keybuf[32];
++
++	            keysym.scancode = xevent.xkey.keycode;
++	            keysym.sym = X11_TranslateKeycode(SDL_Display, xevent.xkey.keycode);
++	            keysym.mod = KMOD_NONE;
++	            keysym.unicode = 0;
++	            if (orig_event_type == KeyPress && XLookupString(&xevent.xkey, keybuf, sizeof(keybuf), NULL, &state))
++	                keysym.unicode = (Uint8)keybuf[0];
++
++	            SDL_PrivateKeyboard(orig_event_type == KeyPress ? SDL_PRESSED : SDL_RELEASED, &keysym);
++	        }
+ 		return 0;
+ 	}
+ #endif
diff --git a/libre/sdl/sdl_x11sym.patch b/libre/sdl/SDL-1.2.15-const_XData32.patch
index 9aaa2353b..0f1c07cfb 100644
--- a/libre/sdl/sdl_x11sym.patch
+++ b/libre/sdl/SDL-1.2.15-const_XData32.patch
@@ -1,11 +1,15 @@
---- 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 @@
+libX11-1.5.99.901 has changed prototype of _XData32
+
+<http://bugzilla.libsdl.org/show_bug.cgi?id=1769>
+
+diff -r b6b2829cd7ef src/video/x11/SDL_x11sym.h
+--- a/src/video/x11/SDL_x11sym.h	Wed Feb 27 15:20:31 2013 -0800
++++ b/src/video/x11/SDL_x11sym.h	Wed Mar 27 16:07:23 2013 +0100
+@@ -165,7 +165,7 @@
   */
  #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/sdl/SDL-1.2.15-ignore_insane_joystick_axis.patch b/libre/sdl/SDL-1.2.15-ignore_insane_joystick_axis.patch
new file mode 100644
index 000000000..33340fd1b
--- /dev/null
+++ b/libre/sdl/SDL-1.2.15-ignore_insane_joystick_axis.patch
@@ -0,0 +1,20 @@
+changeset:   6324:95abff7adcc2
+branch:      SDL-1.2
+parent:      6306:2b923729fd01
+user:        Ryan C. Gordon <icculus@icculus.org>
+date:        Sun Jun 03 04:49:25 2012 -0400
+summary:     Linux evdev: ignore joystick axis events if they aren't in a sane range.
+
+diff -r 2b923729fd01 -r 95abff7adcc2 src/joystick/linux/SDL_sysjoystick.c
+--- a/src/joystick/linux/SDL_sysjoystick.c	Sat May 12 23:32:51 2012 -0700
++++ b/src/joystick/linux/SDL_sysjoystick.c	Sun Jun 03 04:49:25 2012 -0400
+@@ -1106,6 +1106,9 @@
+ 				}
+ 				break;
+ 			    case EV_ABS:
++				if (code > ABS_MISC) {
++					break;
++				}
+ 				switch (code) {
+ 				    case ABS_HAT0X:
+ 				    case ABS_HAT0Y:
diff --git a/libre/sdl/SDL-1.2.15-no-default-backing-store.patch b/libre/sdl/SDL-1.2.15-no-default-backing-store.patch
new file mode 100644
index 000000000..4d5209d1e
--- /dev/null
+++ b/libre/sdl/SDL-1.2.15-no-default-backing-store.patch
@@ -0,0 +1,24 @@
+Do not harness backing store by default
+
+xorg-server 1.15 enables backing store if composite extension is enabled
+(default settings). Harnessing backing store through compositor leads to
+tearing effect.
+
+This patch reverts default harnessing backing store to conditional use if
+SDL_VIDEO_X11_BACKINGSTORE environment variable exists.
+
+<https://bugzilla.libsdl.org/show_bug.cgi?id=2383>
+<https://bugzilla.redhat.com/show_bug.cgi?id=1073057>
+
+diff -up SDL-1.2.15/src/video/x11/SDL_x11video.c.jx SDL-1.2.15/src/video/x11/SDL_x11video.c
+--- SDL-1.2.15/src/video/x11/SDL_x11video.c.jx	2012-01-19 01:30:06.000000000 -0500
++++ SDL-1.2.15/src/video/x11/SDL_x11video.c	2014-03-04 14:39:34.691545549 -0500
+@@ -1088,7 +1088,7 @@ static int X11_CreateWindow(_THIS, SDL_S
+ 		}
+ 	}
+ 
+-#if 0 /* This is an experiment - are the graphics faster now? - nope. */
++#if 1 /* This is an experiment - are the graphics faster now? - nope. */
+ 	if ( SDL_getenv("SDL_VIDEO_X11_BACKINGSTORE") )
+ #endif
+ 	/* Cache the window in the server, when possible */
diff --git a/libre/sdl/SDL-1.2.15-x11-Bypass-SetGammaRamp-when-changing-gamma.patch b/libre/sdl/SDL-1.2.15-x11-Bypass-SetGammaRamp-when-changing-gamma.patch
new file mode 100644
index 000000000..087a13476
--- /dev/null
+++ b/libre/sdl/SDL-1.2.15-x11-Bypass-SetGammaRamp-when-changing-gamma.patch
@@ -0,0 +1,44 @@
+From 4b56fa058a45b7c804d1a5fcaf7a70db0bd0581c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <petr.pisar@atlas.cz>
+Date: Tue, 1 Jan 2013 21:25:15 +0100
+Subject: [PATCH] x11: Bypass SetGammaRamp when changing gamma
+
+Recent Xorg has broken dynamic colors setting, so calling SDL_SetGamme()
+does not have any effect here. Recent means xorg-server >= 1.7, since 2010.
+See <https://bugs.freedesktop.org/show_bug.cgi?id=27222>.
+---
+ src/video/SDL_gamma.c |   15 ++-------------
+ 1 files changed, 2 insertions(+), 13 deletions(-)
+
+diff --git a/src/video/SDL_gamma.c b/src/video/SDL_gamma.c
+index 4fd0370..464ab88 100644
+--- a/src/video/SDL_gamma.c
++++ b/src/video/SDL_gamma.c
+@@ -92,22 +92,11 @@ static void CalculateGammaFromRamp(float *gamma, Uint16 *ramp)
+ 
+ int SDL_SetGamma(float red, float green, float blue)
+ {
+-	int succeeded;
++	int succeeded = -1;
+ 	SDL_VideoDevice *video = current_video;
+ 	SDL_VideoDevice *this  = current_video;	
+ 
+-	succeeded = -1;
+-	/* Prefer using SetGammaRamp(), as it's more flexible */
+-	{
+-		Uint16 ramp[3][256];
+-
+-		CalculateGammaRamp(red, ramp[0]);
+-		CalculateGammaRamp(green, ramp[1]);
+-		CalculateGammaRamp(blue, ramp[2]);
+-		succeeded = SDL_SetGammaRamp(ramp[0], ramp[1], ramp[2]);
+-	}
+-	if ( (succeeded < 0) && video->SetGamma ) {
+-		SDL_ClearError();
++	if ( video->SetGamma ) {
+ 		succeeded = video->SetGamma(this, red, green, blue);
+ 	}
+ 	return succeeded;
+-- 
+1.7.8.6
+
diff --git a/libre/sdl/fix_joystick_misc_axes.diff b/libre/sdl/fix_joystick_misc_axes.diff
deleted file mode 100644
index 75e3755c9..000000000
--- a/libre/sdl/fix_joystick_misc_axes.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/joystick/linux/SDL_sysjoystick.c b/src/joystick/linux/SDL_sysjoystick.c
-index ee43974..80e46e4 100644
---- a/src/joystick/linux/SDL_sysjoystick.c
-+++ b/src/joystick/linux/SDL_sysjoystick.c
-@@ -702,7 +702,7 @@ static SDL_bool EV_ConfigJoystick(SDL_Joystick *joystick, int fd)
- 				++joystick->nbuttons;
- 			}
- 		}
--		for ( i=0; i<ABS_MISC; ++i ) {
-+		for ( i=0; i<ABS_MAX; ++i ) {
- 			/* Skip hats */
- 			if ( i == ABS_HAT0X ) {
- 				i = ABS_HAT3Y;
diff --git a/libre/xarchiver/PKGBUILD b/libre/xarchiver/PKGBUILD
index 35728b96a..c50f53572 100644
--- a/libre/xarchiver/PKGBUILD
+++ b/libre/xarchiver/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 111012 2014-05-12 01:13:40Z bgyorgy $
+# $Id: PKGBUILD 119883 2014-09-30 14:21:21Z bgyorgy $
 # Maintainer (Arch): Balló György <ballogyor+arch at gmail dot com>
 # Contributor (Arch): Alexander Fehr <pizzapunk gmail com>
 # Contributor (Arch): Andrew Simmons <andrew.simmons@gmail.com>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
 pkgname=xarchiver
-pkgver=0.5.3
-pkgrel=4.parabola1
+pkgver=0.5.4
+pkgrel=1.parabola1
 pkgdesc="GTK+ frontend to various command line archivers, without nonfree unrar support"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://xarchiver.sourceforge.net/"
@@ -23,35 +23,30 @@ optdepends=('zip: ZIP support'
             'cpio: RPM support')
 install=xarchiver.install
 source=(http://downloads.sourceforge.net/xarchiver/xarchiver-$pkgver.tar.bz2
-        xarchiver-0.5.3-fix-rpm-support.patch
-        xarchiver-0.5.3-fix-double-escaping.patch
-        xarchiver-0.5.3-fix-password-protected.patch
-        xarchiver-0.5.3-add-mime-types.patch
-        xarchiver-0.5.3-remove-nonfree-unrar-support.patch)
-md5sums=('fd390bbd2df76a5f8a007bdeae82d4aa'
+        fix-rpm-support.patch
+        fix-password-protected.patch
+        add-mime-types.patch
+        remove-nonfree-unrar-support.patch)
+md5sums=('1b4cd37a6af03afc957a8e307417e8d0'
          '812b93339f5e3332621f3c5abebfe277'
-         '6178d7ab679b761469c880a8db991907'
          '35ab96d98521a0a36f3e9e9ec0969107'
          '0cee887b3c989ba2cdce9154813843fb'
-         'cf1788c180145adc3bc5d3572f8a883b')
+         '064ec8984be6e0e7bbf20c435a9f4ef0')
 
 prepare() {
   cd $pkgname-$pkgver
 
   # Fix RPM support
-  patch -Np1 -i ../xarchiver-0.5.3-fix-rpm-support.patch
-
-  # Fix error when trying to create archives with spaces
-  patch -Np1 -i ../xarchiver-0.5.3-fix-double-escaping.patch
+  patch -Np1 -i ../fix-rpm-support.patch
 
   # Fix segfault when handling password protected files
-  patch -Np1 -i ../xarchiver-0.5.3-fix-password-protected.patch
+  patch -Np1 -i ../fix-password-protected.patch
 
   # Add more MIME types in the desktop file
-  patch -Np1 -i ../xarchiver-0.5.3-add-mime-types.patch
+  patch -Np1 -i ../add-mime-types.patch
 
   # Remove nonfree unRAR support
-  patch -Np1 -i ../xarchiver-0.5.3-remove-nonfree-unrar-support.patch
+  patch -Np1 -i ../remove-nonfree-unrar-support.patch
   rm -v src/rar.{c,h}
 
   # Fix po files
diff --git a/libre/xarchiver/xarchiver-0.5.3-add-mime-types.patch b/libre/xarchiver/add-mime-types.patch
index ec427b99a..ec427b99a 100644
--- a/libre/xarchiver/xarchiver-0.5.3-add-mime-types.patch
+++ b/libre/xarchiver/add-mime-types.patch
diff --git a/libre/xarchiver/xarchiver-0.5.3-fix-password-protected.patch b/libre/xarchiver/fix-password-protected.patch
index 00969349d..00969349d 100644
--- a/libre/xarchiver/xarchiver-0.5.3-fix-password-protected.patch
+++ b/libre/xarchiver/fix-password-protected.patch
diff --git a/libre/xarchiver/xarchiver-0.5.3-fix-rpm-support.patch b/libre/xarchiver/fix-rpm-support.patch
index cf17ff738..cf17ff738 100644
--- a/libre/xarchiver/xarchiver-0.5.3-fix-rpm-support.patch
+++ b/libre/xarchiver/fix-rpm-support.patch
diff --git a/libre/xarchiver/xarchiver-0.5.3-remove-nonfree-unrar-support.patch b/libre/xarchiver/remove-nonfree-unrar-support.patch
index e8ba41d59..5473cf3b3 100644
--- a/libre/xarchiver/xarchiver-0.5.3-remove-nonfree-unrar-support.patch
+++ b/libre/xarchiver/remove-nonfree-unrar-support.patch
@@ -214,9 +214,9 @@ diff -Nur xarchiver-0.5.3.orig/src/interface.c xarchiver-0.5.3/src/interface.c
  			{
  				gtk_widget_set_sensitive (delete_menu,FALSE);
  				gtk_widget_set_sensitive (rename_menu,FALSE);
-diff -Nur xarchiver-0.5.3.orig/src/main.c xarchiver-0.5.3/src/main.c
---- xarchiver-0.5.3.orig/src/main.c	2014-02-09 13:30:28.000000000 -0200
-+++ xarchiver-0.5.3/src/main.c	2014-05-05 16:23:04.132223201 -0300
+diff -Nur xarchiver-0.5.4.orig/src/main.c xarchiver-0.5.4/src/main.c
+--- xarchiver-0.5.4.orig/src/main.c	2014-09-28 17:12:13.000000000 -0300
++++ xarchiver-0.5.4/src/main.c	2014-09-30 16:34:33.820381950 -0300
 @@ -33,13 +33,11 @@
  gchar *add_files;
  gboolean error_output, file_to_open, ask_and_extract, ask_and_add, multi_extract;
@@ -231,7 +231,7 @@ diff -Nur xarchiver-0.5.3.orig/src/main.c xarchiver-0.5.3/src/main.c
  
  extern Progress_bar_data *pb;
  Prefs_dialog_data   *prefs_window   = NULL;
-@@ -315,7 +313,6 @@
+@@ -320,7 +318,6 @@
  	open_archive[XARCHIVETYPE_GZIP]  = &xa_open_gzip;
  	open_archive[XARCHIVETYPE_LZMA]  = &xa_open_bzip2_lzma;
  	open_archive[XARCHIVETYPE_XZ]  = &xa_open_bzip2_lzma;
@@ -239,15 +239,15 @@ diff -Nur xarchiver-0.5.3.orig/src/main.c xarchiver-0.5.3/src/main.c
  	open_archive[XARCHIVETYPE_RPM]  = &xa_open_rpm;
  	open_archive[XARCHIVETYPE_TAR]  = open_archive[XARCHIVETYPE_TAR_BZ2] = open_archive[XARCHIVETYPE_TAR_GZ] = open_archive[XARCHIVETYPE_TAR_LZMA] = open_archive[XARCHIVETYPE_TAR_XZ] = open_archive[XARCHIVETYPE_TAR_LZOP] = &xa_open_tar;
  	open_archive[XARCHIVETYPE_ZIP] = &xa_open_zip;
-@@ -330,7 +327,6 @@
- 	delete[XARCHIVETYPE_GZIP]  = 0;
- 	delete[XARCHIVETYPE_LZMA]  = 0;
- 	delete[XARCHIVETYPE_XZ]  = 0;
--	delete[XARCHIVETYPE_RAR]  = delete[XARCHIVETYPE_RAR5]  = &xa_rar_delete;
+@@ -332,7 +329,6 @@
+ 	delete[XARCHIVETYPE_ARJ]  = &xa_arj_delete;
+ 	delete[XARCHIVETYPE_DEB]  = 0;
+ 	delete[XARCHIVETYPE_BZIP2]  = delete[XARCHIVETYPE_GZIP] = delete[XARCHIVETYPE_LZMA] = delete[XARCHIVETYPE_XZ] = delete[XARCHIVETYPE_LZOP] = &xa_tar_delete;
+-	delete[XARCHIVETYPE_RAR]  = delete[XARCHIVETYPE_RAR5] = &xa_rar_delete;
  	delete[XARCHIVETYPE_RPM]  = 0;
  	delete[XARCHIVETYPE_TAR]  = delete[XARCHIVETYPE_TAR_BZ2] = delete[XARCHIVETYPE_TAR_GZ] = delete[XARCHIVETYPE_TAR_LZMA] = delete[XARCHIVETYPE_TAR_XZ] = delete[XARCHIVETYPE_TAR_LZOP] = &xa_tar_delete;
  	delete[XARCHIVETYPE_ZIP] = &xa_zip_delete;
-@@ -343,7 +339,6 @@
+@@ -344,7 +340,6 @@
  	add[XARCHIVETYPE_ARJ]  = &xa_arj_add;
  	add[XARCHIVETYPE_DEB]  = 0;
  	add[XARCHIVETYPE_BZIP2]  = add[XARCHIVETYPE_GZIP] = add[XARCHIVETYPE_LZMA] = add[XARCHIVETYPE_XZ] = add[XARCHIVETYPE_LZOP] = &xa_tar_add;
@@ -255,7 +255,7 @@ diff -Nur xarchiver-0.5.3.orig/src/main.c xarchiver-0.5.3/src/main.c
  	add[XARCHIVETYPE_RPM]  = 0;
  	add[XARCHIVETYPE_TAR]  = add[XARCHIVETYPE_TAR_BZ2] = add[XARCHIVETYPE_TAR_GZ] = add[XARCHIVETYPE_TAR_LZMA] = add[XARCHIVETYPE_TAR_XZ] = add[XARCHIVETYPE_TAR_LZOP] = &xa_tar_add;
  	add[XARCHIVETYPE_ZIP] = &xa_zip_add;
-@@ -354,7 +349,6 @@
+@@ -355,7 +350,6 @@
  	extract[XARCHIVETYPE_ARJ]  = &xa_arj_extract;
  	extract[XARCHIVETYPE_DEB]  = &xa_deb_extract;;
  	extract[XARCHIVETYPE_BZIP2]  = extract[XARCHIVETYPE_GZIP] = extract[XARCHIVETYPE_LZMA] = extract[XARCHIVETYPE_XZ] = extract[XARCHIVETYPE_LZOP] = &xa_tar_extract;
@@ -263,7 +263,7 @@ diff -Nur xarchiver-0.5.3.orig/src/main.c xarchiver-0.5.3/src/main.c
  	extract[XARCHIVETYPE_RPM]  = &xa_rpm_extract;
  	extract[XARCHIVETYPE_TAR]  = extract[XARCHIVETYPE_TAR_BZ2] = extract[XARCHIVETYPE_TAR_GZ] = extract[XARCHIVETYPE_TAR_LZMA] = extract[XARCHIVETYPE_TAR_XZ] = extract[XARCHIVETYPE_TAR_LZOP] = &xa_tar_extract;
  	extract[XARCHIVETYPE_ZIP] = &xa_zip_extract;
-@@ -364,7 +358,6 @@
+@@ -365,7 +359,6 @@
  	test[XARCHIVETYPE_7ZIP]  = &xa_7zip_test;
  	test[XARCHIVETYPE_ARJ]  = &xa_arj_test;
  	test[XARCHIVETYPE_DEB]  = test[XARCHIVETYPE_BZIP2] = test[XARCHIVETYPE_GZIP] = test[XARCHIVETYPE_LZMA] = test[XARCHIVETYPE_XZ] = test[XARCHIVETYPE_LZOP] = &xa_tar_test;
@@ -271,7 +271,7 @@ diff -Nur xarchiver-0.5.3.orig/src/main.c xarchiver-0.5.3/src/main.c
  	test[XARCHIVETYPE_RPM]  = 0;
  	test[XARCHIVETYPE_TAR]  = test[XARCHIVETYPE_TAR_BZ2] = test[XARCHIVETYPE_TAR_GZ] = test[XARCHIVETYPE_TAR_LZMA] = test[XARCHIVETYPE_TAR_XZ] = test[XARCHIVETYPE_TAR_LZOP] =  &xa_tar_test;
  	test[XARCHIVETYPE_ZIP] = &xa_zip_test;
-@@ -435,39 +428,6 @@
+@@ -436,39 +429,6 @@
  		//ArchiveSuffix = g_list_append(ArchiveSuffix, "");
  	}
  
@@ -385,9 +385,9 @@ diff -Nur xarchiver-0.5.3.orig/src/pref_dialog.c xarchiver-0.5.3/src/pref_dialog
  		else
  			gtk_combo_box_append_text (GTK_COMBO_BOX (prefs_data->combo_prefered_format),archive_type->data );
  		next:
-diff -Nur xarchiver-0.5.3.orig/src/window.c xarchiver-0.5.3/src/window.c
---- xarchiver-0.5.3.orig/src/window.c	2014-02-09 13:49:07.000000000 -0200
-+++ xarchiver-0.5.3/src/window.c	2014-05-05 17:19:54.769288791 -0300
+diff -Nur xarchiver-0.5.4.orig/src/window.c xarchiver-0.5.4/src/window.c
+--- xarchiver-0.5.4.orig/src/window.c	2014-09-30 16:21:18.428751931 -0300
++++ xarchiver-0.5.4/src/window.c	2014-09-30 16:36:11.114336732 -0300
 @@ -26,7 +26,6 @@
  
  extern GList *ArchiveType;
@@ -436,8 +436,8 @@ diff -Nur xarchiver-0.5.3.orig/src/window.c xarchiver-0.5.3/src/window.c
  void xa_about (GtkMenuItem *menuitem,gpointer user_data)
  {
      static GtkWidget *about = NULL;
--    const char *authors[] = {"Main developer:\nGiuseppe Torelli <colossus73@gmail.com>\n\nArchive navigation code:\nJohn Berthels\n\nCode fixing:\nEnrico Tröger\n\nLHA and DEB support:\nŁukasz Zemczak <sil2100@vexillium.org>\n\nLZMA support:\nThomas Dy <dysprosium66@gmail.com>\n\nLZOP support:\nKevin Day\n\nRAR5, XZ, TAR.XZ support:\nFrederick GUERIN <fguerin01@gmail.com>\n",NULL};
-+    const char *authors[] = {"Main developer:\nGiuseppe Torelli <colossus73@gmail.com>\n\nArchive navigation code:\nJohn Berthels\n\nCode fixing:\nEnrico Tröger\n\nLHA and DEB support:\nŁukasz Zemczak <sil2100@vexillium.org>\n\nLZMA support:\nThomas Dy <dysprosium66@gmail.com>\n\nLZOP support:\nKevin Day\n\nXZ, TAR.XZ support:\nFrederick GUERIN <fguerin01@gmail.com>\n",NULL};
+-    const char *authors[] = {"Main developer:\nGiuseppe Torelli <colossus73@gmail.com>\n\nArchive navigation code:\nJohn Berthels\n\nLHA and DEB support:\nŁukasz Zemczak <sil2100@vexillium.org>\n\nLZMA support:\nThomas Dy <dysprosium66@gmail.com>\n\nLZOP support:\nKevin Day\n\nRAR5, XZ, TAR.XZ support:\nFrederick GUERIN <fguerin01@gmail.com>\n",NULL};
++    const char *authors[] = {"Main developer:\nGiuseppe Torelli <colossus73@gmail.com>\n\nArchive navigation code:\nJohn Berthels\n\nLHA and DEB support:\nŁukasz Zemczak <sil2100@vexillium.org>\n\nLZMA support:\nThomas Dy <dysprosium66@gmail.com>\n\nLZOP support:\nKevin Day\n\nXZ, TAR.XZ support:\nFrederick GUERIN <fguerin01@gmail.com>\n",NULL};
      const char *documenters[] = {"Special thanks to Bjoern Martensen for\nbugs hunting and Xarchiver Tango logo.\n\nThanks to:\nBenedikt Meurer\nStephan Arts\nBruno Jesus <00cpxxx@gmail.com>\nUracile for the stunning logo\n",NULL};
  
  	if (about == NULL)
diff --git a/libre/xarchiver/xarchiver-0.5.3-fix-double-escaping.patch b/libre/xarchiver/xarchiver-0.5.3-fix-double-escaping.patch
deleted file mode 100644
index 8b44d91a0..000000000
--- a/libre/xarchiver/xarchiver-0.5.3-fix-double-escaping.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: =?UTF-8?q?Guido=20Berh=C3=B6rster?= <gber@opensuse.org>
-Date: Sat, 19 Jan 2013 09:27:36 +0100
-Subject: fix-double-escaping
-
-Do not escape file names twice. Fixes an error when trying to create archives
-with spaces.
-
-Bug: http://bugs.debian.org/697493.
----
- src/main.c |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/main.c b/src/main.c
-index a13d737..a6a7f93 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -208,13 +208,13 @@ int main (int argc, char **argv)
- 				g_free(_current_dir);
- 				GSList *files = NULL;
- 				_current_dir = g_path_get_basename(add_files);
--				files = g_slist_append(files,xa_escape_filename(_current_dir,"$'`\"\\!?* ()[]&|:;<>#"));
-+				files = g_slist_append(files,g_strdup(_current_dir));
- 				g_free(_current_dir);
- 				g_free(add_files);
- 				for (x = 1; x< argc; x++)
- 				{
- 					_current_dir = g_path_get_basename(argv[x]);
--					files = g_slist_append(files,xa_escape_filename(_current_dir,"$'`\"\\!?* ()[]&|:;<>#"));
-+					files = g_slist_append(files,g_strdup(_current_dir));
- 					g_free (_current_dir);
- 				}
- 				xa_execute_add_commands(archive,files,NULL);