From 149a85dff3e7fd908c2935a6ba8784e848d53110 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sun, 28 Sep 2014 21:30:21 -0300 Subject: sdl-1.2.15-7.parabola1: import most of Fedora's patches (FS#39227 -> https://bugs.archlinux.org/task/39227) --- libre/sdl/PKGBUILD | 31 ++++++--- libre/sdl/SDL-1.2.10-GrabNotViewable.patch | 22 +++++++ ...5-SDL_EnableUNICODE_drops_keyboard_events.patch | 73 ++++++++++++++++++++++ libre/sdl/SDL-1.2.15-const_XData32.patch | 16 +++++ .../SDL-1.2.15-ignore_insane_joystick_axis.patch | 20 ++++++ .../sdl/SDL-1.2.15-no-default-backing-store.patch | 24 +++++++ ...1-Bypass-SetGammaRamp-when-changing-gamma.patch | 44 +++++++++++++ libre/sdl/fix_joystick_misc_axes.diff | 13 ---- libre/sdl/sdl_x11sym.patch | 12 ---- 9 files changed, 222 insertions(+), 33 deletions(-) create mode 100644 libre/sdl/SDL-1.2.10-GrabNotViewable.patch create mode 100644 libre/sdl/SDL-1.2.15-SDL_EnableUNICODE_drops_keyboard_events.patch create mode 100644 libre/sdl/SDL-1.2.15-const_XData32.patch create mode 100644 libre/sdl/SDL-1.2.15-ignore_insane_joystick_axis.patch create mode 100644 libre/sdl/SDL-1.2.15-no-default-backing-store.patch create mode 100644 libre/sdl/SDL-1.2.15-x11-Bypass-SetGammaRamp-when-changing-gamma.patch delete mode 100644 libre/sdl/fix_joystick_misc_axes.diff delete mode 100644 libre/sdl/sdl_x11sym.patch diff --git a/libre/sdl/PKGBUILD b/libre/sdl/PKGBUILD index 957598225..c958e8d09 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) # Contributor (Arch): Allan McRae # Contributor (Arch): dorphell @@ -8,7 +8,7 @@ pkgname=sdl pkgver=1.2.15 -pkgrel=6.parabola1 +pkgrel=7.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" @@ -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 . +See . + +--- ./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 +# 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-1.2.15-const_XData32.patch b/libre/sdl/SDL-1.2.15-const_XData32.patch new file mode 100644 index 000000000..0f1c07cfb --- /dev/null +++ b/libre/sdl/SDL-1.2.15-const_XData32.patch @@ -0,0 +1,16 @@ +libX11-1.5.99.901 has changed prototype of _XData32 + + + +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 +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. + + + + +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?= +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 . +--- + 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 Date: Sun, 28 Sep 2014 21:39:20 -0300 Subject: ghostscript-9.15-1.parabola1: updating version --- libre/ghostscript/PKGBUILD | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libre/ghostscript/PKGBUILD b/libre/ghostscript/PKGBUILD index e12f428a6..e45474add 100644 --- a/libre/ghostscript/PKGBUILD +++ b/libre/ghostscript/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 208881 2014-03-27 20:54:33Z andyrtr $ +# $Id: PKGBUILD 222874 2014-09-23 17:46:02Z andyrtr $ # Maintainer (Arch): AndyRTR # Maintainer: André Silva ### !!! rebuild groff from core that picks up hardcoding the GS versioned font path !!! ### pkgname=ghostscript -pkgver=9.14 +pkgver=9.15 pkgrel=1.parabola1 pkgdesc="An interpreter for the PostScript language, without nonfree JPEG XR support" arch=('i686' 'x86_64' 'mips64el') @@ -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() { -- cgit v1.2.3-54-g00ecf From 17e0d1b016da6863362c1b3c65bfa1913b160f5f Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Mon, 29 Sep 2014 03:47:18 -0300 Subject: rebuild packages due server migration --- libre/calibre/PKGBUILD | 2 +- libre/cups-filters/PKGBUILD | 2 +- libre/doublecmd/PKGBUILD | 2 +- libre/ghostscript/PKGBUILD | 2 +- libre/kdebase-konqueror/PKGBUILD | 2 +- libre/kdebase-runtime/PKGBUILD | 2 +- libre/kdelibs/PKGBUILD | 2 +- libre/kdenetwork-kopete/PKGBUILD | 2 +- libre/kdeutils-ark/PKGBUILD | 2 +- libre/sdl/PKGBUILD | 2 +- nonprism/kdenetwork-kopete/PKGBUILD | 2 +- nonprism/kdepim-runtime/PKGBUILD | 2 +- nonprism/kdepim/PKGBUILD | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) 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/ghostscript/PKGBUILD b/libre/ghostscript/PKGBUILD index e45474add..ec459e8bc 100644 --- a/libre/ghostscript/PKGBUILD +++ b/libre/ghostscript/PKGBUILD @@ -6,7 +6,7 @@ pkgname=ghostscript pkgver=9.15 -pkgrel=1.parabola1 +pkgrel=1.parabola2 pkgdesc="An interpreter for the PostScript language, without nonfree JPEG XR support" arch=('i686' 'x86_64' 'mips64el') license=('AGPL' 'custom') 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/sdl/PKGBUILD b/libre/sdl/PKGBUILD index c958e8d09..85ba31d66 100644 --- a/libre/sdl/PKGBUILD +++ b/libre/sdl/PKGBUILD @@ -8,7 +8,7 @@ pkgname=sdl pkgver=1.2.15 -pkgrel=7.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" diff --git a/nonprism/kdenetwork-kopete/PKGBUILD b/nonprism/kdenetwork-kopete/PKGBUILD index 7ee60e610..7c6fffad1 100644 --- a/nonprism/kdenetwork-kopete/PKGBUILD +++ b/nonprism/kdenetwork-kopete/PKGBUILD @@ -4,7 +4,7 @@ pkgname=kdenetwork-kopete pkgver=4.14.1 -pkgrel=1.parabola1.nonprism1 +pkgrel=1.parabola2.nonprism1 pkgdesc='Instant Messenger, without nonfree Skype support and support for unsafe and dangerous for privacy protocols' url='http://kde.org/applications/internet/kopete/' arch=('i686' 'x86_64' 'mips64el') diff --git a/nonprism/kdepim-runtime/PKGBUILD b/nonprism/kdepim-runtime/PKGBUILD index 8f481ac69..929ba532a 100644 --- a/nonprism/kdepim-runtime/PKGBUILD +++ b/nonprism/kdepim-runtime/PKGBUILD @@ -5,7 +5,7 @@ pkgname=kdepim-runtime pkgver=4.14.1 -pkgrel=1.nonprism1 +pkgrel=1.nonprism2 pkgdesc='Extends the functionality of kdepim, without libkgapi and libkfbapi support' arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/projects/kde/kdepim-runtime' diff --git a/nonprism/kdepim/PKGBUILD b/nonprism/kdepim/PKGBUILD index 2a1900688..8ca7b72ca 100644 --- a/nonprism/kdepim/PKGBUILD +++ b/nonprism/kdepim/PKGBUILD @@ -13,7 +13,7 @@ pkgname=('kdepim-akonadiconsole' 'kdepim-korganizer' 'kdepim-libkdepim') pkgver=4.14.1 -pkgrel=1.nonprism1 +pkgrel=1.nonprism2 arch=('i686' 'x86_64' 'mips64el') url='http://pim.kde.org' license=('GPL' 'LGPL' 'FDL') -- cgit v1.2.3-54-g00ecf From f66f017f7d7b370be4331ba0c9c67d693912732a Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Mon, 29 Sep 2014 16:39:47 -0300 Subject: qupzilla: rebuild due server migration --- libre/qupzilla/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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') -- cgit v1.2.3-54-g00ecf From d93f33914c6233cea2e5b5c96a91aedfd0953708 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Mon, 29 Sep 2014 17:47:35 -0300 Subject: ice{cat,weasel}-noscript-2.6.8.43-1: updating version --- libre/icecat-noscript/PKGBUILD | 6 +++--- libre/iceweasel-noscript/PKGBUILD | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) 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 # Maintainer: André Silva _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 # Maintainer: André Silva _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") -- cgit v1.2.3-54-g00ecf From 70dbf452f3778f8c99713f392d5eb39e353c8a40 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Mon, 29 Sep 2014 17:48:52 -0300 Subject: linux-libre-grsec-3.16.3_gnu.201409282025-1: updating version --- libre/linux-libre-grsec/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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' -- cgit v1.2.3-54-g00ecf From 4557905db1c687238d2c41b7c64f2fa611b1cf3c Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Mon, 29 Sep 2014 17:50:28 -0300 Subject: linux-libre-lts-grsec{,-knock}-3.14.19_gnu.201409282024-1: updating version --- kernels/linux-libre-lts-grsec-knock/PKGBUILD | 4 ++-- kernels/linux-libre-lts-grsec/PKGBUILD | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/kernels/linux-libre-lts-grsec-knock/PKGBUILD b/kernels/linux-libre-lts-grsec-knock/PKGBUILD index 113026d58..98752579f 100644 --- a/kernels/linux-libre-lts-grsec-knock/PKGBUILD +++ b/kernels/linux-libre-lts-grsec-knock/PKGBUILD @@ -14,7 +14,7 @@ pkgbase=linux-libre-lts-grsec-knock # Build kernel with lts-grsec-knock localn _pkgbasever=3.14-gnu _pkgver=3.14.19-gnu _grsecver=3.0 -_timestamp=201409180900 +_timestamp=201409282024 _knockpatchver=3.16_1 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname @@ -50,7 +50,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li '3.14.14-a410a5e2b7-loongson-community.patch') sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b' 'de38c0a43db601774a0374aeea99f3c24931139208ac5370e07841db3dceccfe' - 'b2f4a4fe2f6ff9fca7fb33427c0f0f09be8bad0684c57cc973d0a75ae320fbce' + '15738fd826a0bdf2c5fceecde3ec59f8eacbcaa59b5fa099f0a64fc32975b217' 'SKIP' '70cbe962aa01989ffa83490bb0765d6e4c781f6133dc8d768d84bd6716ac0209' '421bd0710d0fb9b16f53eb20a298bed5fc10e47697e14d566126afc8827e17bb' diff --git a/kernels/linux-libre-lts-grsec/PKGBUILD b/kernels/linux-libre-lts-grsec/PKGBUILD index e0770c793..c7a7e1cc0 100644 --- a/kernels/linux-libre-lts-grsec/PKGBUILD +++ b/kernels/linux-libre-lts-grsec/PKGBUILD @@ -14,7 +14,7 @@ pkgbase=linux-libre-lts-grsec # Build kernel with lts-grsec localname _pkgbasever=3.14-gnu _pkgver=3.14.19-gnu _grsecver=3.0 -_timestamp=201409180900 +_timestamp=201409282024 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname _replacesoldkernels=('kernel26%' 'kernel26-libre%') # '%' gets replaced with _kernelname @@ -48,7 +48,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li '3.14.14-a410a5e2b7-loongson-community.patch') sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b' 'de38c0a43db601774a0374aeea99f3c24931139208ac5370e07841db3dceccfe' - 'b2f4a4fe2f6ff9fca7fb33427c0f0f09be8bad0684c57cc973d0a75ae320fbce' + '15738fd826a0bdf2c5fceecde3ec59f8eacbcaa59b5fa099f0a64fc32975b217' 'SKIP' 'b579108a60b56edccdf99fd3873cc49fbe174be239a5f69d50082d26cb9d3053' 'ca675995cacff121facf54cf84077c1238b47731f3f7dd637d6c9d12161c765f' -- cgit v1.2.3-54-g00ecf From a9e3f906cea0091b1e36b37a0caf011b6576c642 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Tue, 30 Sep 2014 14:51:36 -0300 Subject: atril-1.8.1-1.parabola1: updating version --- libre/atril/PKGBUILD | 10 +++++----- 1 file changed, 5 insertions(+), 5 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 # Maintainer: André Silva 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() { -- cgit v1.2.3-54-g00ecf From 50b9c9ce6d0b4bfb80c10234d4876fbf1018d2c0 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Tue, 30 Sep 2014 16:13:10 -0300 Subject: engrampa-1.8.1-1.parabola1: updating version --- libre/engrampa/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 # Maintainer: André Silva 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 -- cgit v1.2.3-54-g00ecf From 272855c0b93e2c37030a145d0d502f55d6abfd00 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Tue, 30 Sep 2014 16:46:10 -0300 Subject: xarchiver-0.5.4-1.parabola1: updating version --- libre/xarchiver/PKGBUILD | 31 +- libre/xarchiver/add-mime-types.patch | 17 + libre/xarchiver/fix-password-protected.patch | 42 ++ libre/xarchiver/fix-rpm-support.patch | 86 ++++ libre/xarchiver/remove-nonfree-unrar-support.patch | 525 +++++++++++++++++++++ .../xarchiver/xarchiver-0.5.3-add-mime-types.patch | 17 - .../xarchiver-0.5.3-fix-double-escaping.patch | 32 -- .../xarchiver-0.5.3-fix-password-protected.patch | 42 -- .../xarchiver-0.5.3-fix-rpm-support.patch | 86 ---- ...chiver-0.5.3-remove-nonfree-unrar-support.patch | 525 --------------------- 10 files changed, 683 insertions(+), 720 deletions(-) create mode 100644 libre/xarchiver/add-mime-types.patch create mode 100644 libre/xarchiver/fix-password-protected.patch create mode 100644 libre/xarchiver/fix-rpm-support.patch create mode 100644 libre/xarchiver/remove-nonfree-unrar-support.patch delete mode 100644 libre/xarchiver/xarchiver-0.5.3-add-mime-types.patch delete mode 100644 libre/xarchiver/xarchiver-0.5.3-fix-double-escaping.patch delete mode 100644 libre/xarchiver/xarchiver-0.5.3-fix-password-protected.patch delete mode 100644 libre/xarchiver/xarchiver-0.5.3-fix-rpm-support.patch delete mode 100644 libre/xarchiver/xarchiver-0.5.3-remove-nonfree-unrar-support.patch 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 # Contributor (Arch): Alexander Fehr # Contributor (Arch): Andrew Simmons # Maintainer: André Silva 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/add-mime-types.patch b/libre/xarchiver/add-mime-types.patch new file mode 100644 index 000000000..ec427b99a --- /dev/null +++ b/libre/xarchiver/add-mime-types.patch @@ -0,0 +1,17 @@ +diff -Naur xarchiver-0.5.3.orig/xarchiver.desktop.in xarchiver-0.5.3/xarchiver.desktop.in +--- xarchiver-0.5.3.orig/xarchiver.desktop.in 2014-05-12 01:08:12.159131913 +0000 ++++ xarchiver-0.5.3/xarchiver.desktop.in 2014-05-12 01:09:02.585526393 +0000 +@@ -4,11 +4,11 @@ + _Name=Xarchiver + _Comment=A GTK+2 only archive manager + _GenericName=Archive manager +-Exec=xarchiver ++Exec=xarchiver %f + Icon=xarchiver + Terminal=false + Type=Application + X-MultipleArgs=false + Categories=GTK;Archiving;Utility; + StartupNotify=true +-MimeType=application/x-arj;application/arj;application/x-bzip;application/x-bzip-compressed-tar;application/x-gzip;application/x-rar;application/x-rar-compressed;application/x-tar;application/x-zip;application/x-zip-compressed;application/zip;multipart/x-zip;application/x-7z-compressed;application/x-compressed-tar;application/x-bzip2;application/x-bzip2-compressed-tar; ++MimeType=application/x-arj;application/arj;application/x-bzip;application/x-bzip-compressed-tar;application/x-gzip;application/x-rar;application/x-rar-compressed;application/x-tar;application/x-zip;application/x-zip-compressed;application/zip;application/x-7z-compressed;application/x-compressed-tar;application/x-bzip2;application/x-bzip2-compressed-tar;application/x-lzma;application/x-lzma-compressed-tar;application/x-lzop;application/x-lzop-compressed-tar;application/x-xz;application/x-xz-compressed-tar;application/x-deb;application/x-rpm; diff --git a/libre/xarchiver/fix-password-protected.patch b/libre/xarchiver/fix-password-protected.patch new file mode 100644 index 000000000..00969349d --- /dev/null +++ b/libre/xarchiver/fix-password-protected.patch @@ -0,0 +1,42 @@ +diff -Naur xarchiver-0.5.3.orig/src/window.c xarchiver-0.5.2/src/window.c +--- xarchiver-0.5.3.orig/src/window.c 2014-01-24 08:10:09.305990000 +0100 ++++ xarchiver-0.5.3/src/window.c 2014-01-24 08:42:45.110729290 +0100 +@@ -1694,7 +1694,7 @@ + { + if (archive->passwd == NULL) + { +- archive->passwd = xa_create_password_dialog(NULL); ++ archive->passwd = xa_create_password_dialog(archive); + if ( archive->passwd == NULL) + { + gtk_drag_finish (dc,FALSE,FALSE,t); +@@ -2702,9 +2702,12 @@ + + if (entry->is_encrypted) + { +- archive[idx]->passwd = xa_create_password_dialog(archive[idx]); + if (archive[idx]->passwd == NULL) +- return; ++ { ++ archive[idx]->passwd = xa_create_password_dialog(archive[idx]); ++ if (archive[idx]->passwd == NULL) ++ return; ++ } + } + filename = g_strconcat(archive[idx]->tmp,"/",entry->filename,NULL); + if (g_file_test(filename,G_FILE_TEST_EXISTS)) +@@ -2768,8 +2771,12 @@ + { + if (entry->is_encrypted) + { +- if (archive->passwd == NULL) +- return; ++ if (archive->passwd == NULL) ++ { ++ archive->passwd = xa_create_password_dialog(archive); ++ if (archive->passwd == NULL) ++ return; ++ } + } + if (archive->extraction_path) + { diff --git a/libre/xarchiver/fix-rpm-support.patch b/libre/xarchiver/fix-rpm-support.patch new file mode 100644 index 000000000..cf17ff738 --- /dev/null +++ b/libre/xarchiver/fix-rpm-support.patch @@ -0,0 +1,86 @@ +diff -Naur xarchiver-0.5.3.orig/src/rpm.c xarchiver-0.5.3/src/rpm.c +--- xarchiver-0.5.3.orig/src/rpm.c 2014-02-09 16:26:24.000000000 +0100 ++++ xarchiver-0.5.3/src/rpm.c 2014-02-19 07:54:27.744136749 +0100 +@@ -23,8 +23,11 @@ + + void xa_open_rpm (XArchive *archive) + { ++ unsigned char bytes[8]; + unsigned short int i; +- int response; ++ int dl,il,sigsize,offset,response; ++ gchar *ibs,*executable; ++ gchar *gzip_tmp = NULL; + GSList *list = NULL; + FILE *stream; + gboolean result; +@@ -53,14 +56,68 @@ + archive->column_types[i] = types[i]; + + xa_create_liststore (archive,names); ++ if (fseek ( stream, 104 , SEEK_CUR ) ) ++ { ++ fclose (stream); ++ response = xa_show_message_dialog (GTK_WINDOW (xa_main_window),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,_("Can't fseek to position 104:"),g_strerror(errno)); ++ return; ++ } ++ if ( fread ( bytes, 1, 8, stream ) == 0 ) ++ { ++ fclose ( stream ); ++ response = xa_show_message_dialog (GTK_WINDOW (xa_main_window),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,_("Can't read data from file:"),g_strerror(errno)); ++ return; ++ } ++ il = 256 * ( 256 * ( 256 * bytes[0] + bytes[1]) + bytes[2] ) + bytes[3]; ++ dl = 256 * ( 256 * ( 256 * bytes[4] + bytes[5]) + bytes[6] ) + bytes[7]; ++ sigsize = 8 + 16 * il + dl; ++ offset = 104 + sigsize + ( 8 - ( sigsize % 8 ) ) % 8 + 8; ++ if (fseek ( stream, offset , SEEK_SET ) ) ++ { ++ fclose (stream); ++ response = xa_show_message_dialog (GTK_WINDOW (xa_main_window),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,_("Can't fseek in file:"),g_strerror(errno)); ++ return; ++ } ++ if ( fread ( bytes, 1, 8, stream ) == 0 ) ++ { ++ fclose ( stream ); ++ response = xa_show_message_dialog (GTK_WINDOW (xa_main_window),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,_("Can't read data from file:"),g_strerror(errno)); ++ return; ++ } ++ il = 256 * ( 256 * ( 256 * bytes[0] + bytes[1]) + bytes[2] ) + bytes[3]; ++ dl = 256 * ( 256 * ( 256 * bytes[4] + bytes[5]) + bytes[6] ) + bytes[7]; ++ sigsize = 8 + 16 * il + dl; ++ offset = offset + sigsize; ++ fclose (stream); + + /* Create a unique temp dir in /tmp */ + result = xa_create_temp_directory (archive); + if (!result) + return; + ++ gzip_tmp = g_strconcat (archive->tmp,"/file.gz_bz",NULL); ++ ibs = g_strdup_printf ( "%u" , offset ); ++ + /* Now I run dd to have the bzip2 / gzip compressed cpio archive in /tmp */ +- gchar *command = g_strconcat ( "sh -c \"rpm2cpio ",archive->escaped_path," > ",archive->tmp, "/file.cpio\"",NULL); ++ gchar *command = g_strconcat ( "dd if=",archive->escaped_path," ibs=",ibs," skip=1 of=",gzip_tmp,NULL); ++ g_free (ibs); ++ list = g_slist_append(list,command); ++ batch_mode = TRUE; ++ result = xa_run_command (archive,list); ++ if (result == FALSE) ++ { ++ g_free (gzip_tmp); ++ return; ++ } ++ if (xa_detect_archive_type (gzip_tmp) == XARCHIVETYPE_GZIP) ++ executable = "gzip -dc "; ++ else if (xa_detect_archive_type (gzip_tmp) == XARCHIVETYPE_BZIP2) ++ executable = "bzip2 -dc "; ++ else ++ executable = "xz -dc "; ++ ++ command = g_strconcat("sh -c \"",executable,gzip_tmp," > ",archive->tmp,"/file.cpio\"",NULL); ++ g_free(gzip_tmp); + list = NULL; + list = g_slist_append(list,command); + result = xa_run_command (archive,list); diff --git a/libre/xarchiver/remove-nonfree-unrar-support.patch b/libre/xarchiver/remove-nonfree-unrar-support.patch new file mode 100644 index 000000000..5473cf3b3 --- /dev/null +++ b/libre/xarchiver/remove-nonfree-unrar-support.patch @@ -0,0 +1,525 @@ +diff -Nur xarchiver-0.5.3.orig/doc/html/ch01.html xarchiver-0.5.3/doc/html/ch01.html +--- xarchiver-0.5.3.orig/doc/html/ch01.html 2008-11-10 06:05:07.000000000 -0200 ++++ xarchiver-0.5.3/doc/html/ch01.html 2014-05-05 16:32:35.166604039 -0300 +@@ -23,13 +23,13 @@ +
  • Archives are detected by their magic header and not by the extension except for .tar.bz2 and .tar.gz
    • +
  • Drag and drop from and to Xarchiver window
    • +
  • Progress window when using Xarchiver from the cmd-line or from a file-manager
    • +-
  • ARJ, RAR and ZIP archive comment are supported
    • ++
  • ARJ and ZIP archive comment are supported
    • +
  • Ability to convert the archive to self-extracting for those archive types which support it
    • +-
  • Smart detection of arj, zip and rar password encrypted archives
    • ++
  • Smart detection of arj and zip password encrypted archives
    • +
  • All the the output of the cmd-line archiver is displayed in the Xarchiver window
    • +-
  • All common formats are supported: arj, bzip2, gzip, lha, lzma, 7z, rar, tar, tar.bz2, tar.gz, tar.lzma, tar.lzop, zip, deb and rpm packages (open and extract only)
    • ++
  • All common formats are supported: arj, bzip2, gzip, lha, lzma, 7z, tar, tar.bz2, tar.gz, tar.lzma, tar.lzop, zip, deb and rpm packages (open and extract only)
    • +
  • Deb and Rpm packages are handled internally, their package managers are NOT required.
    • +-
  • Zip, rar, arj and 7z password encrypted archives are fully supported (7z automatic password detection is not supported)
    • ++
  • Zip, arj and 7z password encrypted archives are fully supported (7z automatic password detection is not supported)
    • +

    Prev   Next
    + Xarchiver 0.5.2 +  Home Where to get it
    +diff -Nur xarchiver-0.5.3.orig/doc/html/ch03s03.html xarchiver-0.5.3/doc/html/ch03s03.html +--- xarchiver-0.5.3.orig/doc/html/ch03s03.html 2008-11-03 04:49:49.000000000 -0200 ++++ xarchiver-0.5.3/doc/html/ch03s03.html 2014-05-05 16:25:59.026943013 -0300 +@@ -1,7 +1,7 @@ + + + General
    General
    Prev Chapter 3. Usage Next

    General

    Startup

    +- At startup, Xarchiver detects the available installed archivers (tar,rar,zip etc) and the script xdg-open for handling different file types. Since Xarchiver is a frontend (a graphic user interface to the cmd-line executables) it can't create archives whose archiver is not available. For instance if you have the free edition of rar, unrar, Xarchiver can't create rar archives since unrar allows rar archives to be opened, tested and extracted but not to be created. ++ At startup, Xarchiver detects the available installed archivers (tar,zip etc) and the script xdg-open for handling different file types. Since Xarchiver is a frontend (a graphic user interface to the cmd-line executables) it can't create archives whose archiver is not available. +

    How it works

    + Xarchiver will run in the background the cmd-line executable of the archiver with the archiver's proper switches to perform the selected operation. If something goes wrong Xarchiver reports the full output of the archiver executable in the command line output window. From the release 0.5 the files in the archive can be opened within Xarchiver. The script xdg-open will detect the file type and run the proper application to handle it. If you don't have such script installed in your system (it's found in the xdg-utils package) Xarchiver will recognize HTML, txt and images files only. The Preferences dialog will notify this to you when you click the Advanced section inside it. +

    Drag and Drop

    +diff -Nur xarchiver-0.5.3.orig/doc/html/ch04s02.html xarchiver-0.5.3/doc/html/ch04s02.html +--- xarchiver-0.5.3.orig/doc/html/ch04s02.html 2007-08-23 07:27:40.000000000 -0300 ++++ xarchiver-0.5.3/doc/html/ch04s02.html 2014-05-05 16:31:53.479628949 -0300 +@@ -1,5 +1,5 @@ + + +-How can I create an archive with some files password protected and others not?

    How can I create an archive with some files password protected and others not?
    Prev Chapter 4. FAQ Next

    How can I create an archive with some files password protected and others not?

    First of all choose 'New' and select one of arj, 7zip, rar or zip archive formats and choose 'Add' from the Action menu. Do NOT check "Password" in the Add dialog. Add your files and then reopen the Add dialog again but this time check "Password" and ++How can I create an archive with some files password protected and others not?

    How can I create an archive with some files password protected and others not?
    Prev Chapter 4. FAQ Next

    How can I create an archive with some files password protected and others not?

    First of all choose 'New' and select one of arj, 7zip or zip archive formats and choose 'Add' from the Action menu. Do NOT check "Password" in the Add dialog. Add your files and then reopen the Add dialog again but this time check "Password" and + enter your password. From now on all the files you add to the archive will be password protected. +

    Prev Up Next
    Chapter 4. FAQ Home Why does Xarchiver emit this error message when handling tar archives?
    +diff -Nur xarchiver-0.5.3.orig/doc/html/ch04s06.html xarchiver-0.5.3/doc/html/ch04s06.html +--- xarchiver-0.5.3.orig/doc/html/ch04s06.html 2008-11-03 04:49:49.000000000 -0200 ++++ xarchiver-0.5.3/doc/html/ch04s06.html 2014-05-05 16:33:00.806793156 -0300 +@@ -1,4 +1,4 @@ + + +-Why Xarchiver doesn't allow me to choose the archive self-extracting path as it happens with zip and 7z?
    Why Xarchiver doesn't allow me to choose the archive self-extracting path as it happens with zip and 7z?
    Prev Chapter 4. FAQ 

    Why Xarchiver doesn't allow me to choose the archive self-extracting path as it happens with zip and 7z?

    Because rar and arj executable do not allow to do so. Zip and 7z convertion to self-extracting is made by appending an sfx module to the archive so it's possible to choose a different path. ++Why Xarchiver doesn't allow me to choose the archive self-extracting path as it happens with zip and 7z?

    Why Xarchiver doesn't allow me to choose the archive self-extracting path as it happens with zip and 7z?
    Prev Chapter 4. FAQ 

    Why Xarchiver doesn't allow me to choose the archive self-extracting path as it happens with zip and 7z?

    Because arj executable do not allow to do so. Zip and 7z convertion to self-extracting is made by appending an sfx module to the archive so it's possible to choose a different path. +

    Prev Up 
    Why does Xarchiver sometimes report errors but the Error messages window is empty? Home 
    +diff -Nur xarchiver-0.5.3.orig/doc/xarchiver.docbook xarchiver-0.5.3/doc/xarchiver.docbook +--- xarchiver-0.5.3.orig/doc/xarchiver.docbook 2007-08-22 07:49:19.000000000 -0300 ++++ xarchiver-0.5.3/doc/xarchiver.docbook 2014-05-05 16:25:17.863287969 -0300 +@@ -50,14 +50,14 @@ + The most used archiver cmd-line options are supported in the Add and Extract dialog + Archives are detected by their magic header and not by the extension except for .tar.bz2 and .tar.gz + Drag and drop from and to Xarchiver window is supported with XDS protocol +- ZIP and ARJ archive comment are supported. RAR comment is not yet supported because it's compressed inside the archive itself ++ ZIP and ARJ archive comment are supported. + Tabs Firefox style support + Ability to convert the archive to self-extracting for those archive types which support it +- Smart detection of arj, zip and rar password encrypted archives ++ Smart detection of arj and zip password encrypted archives + All the the output of the cmd-line archiver is displayed in the Xarchiver window +- All common formats are supported: arj, bzip2, lha, gzip, 7z, rar, tar, tar.bz2, tar.gz, zip, DEB and RPM (only open,view and extract) ++ All common formats are supported: arj, bzip2, lha, gzip, 7z, tar, tar.bz2, tar.gz, zip, DEB and RPM (only open,view and extract) + Support of RPM files without RPM executable. This is useful on not RPM-based distributions like Slackware and Arch Linux +- Zip, rar, arj and 7z password encrypted archives are fully supported (7z automatic password detection is not supported) ++ Zip, arj and 7z password encrypted archives are fully supported (7z automatic password detection is not supported) + + + +@@ -204,7 +204,7 @@ +
    + Startup + +- At startup, &app; detects the available installed archivers (tar,rar,zip etc). Since Xarchiver is a frontend (a graphic user interface to the cmd-line executables) it can't create archives whose archiver is not available. For instance if you have the free edition of rar, unrar, Xarchiver can't create rar archives since unrar allows rar archives to be opened, tested and extracted but not to be created. ++ At startup, &app; detects the available installed archivers (tar,zip etc). Since Xarchiver is a frontend (a graphic user interface to the cmd-line executables) it can't create archives whose archiver is not available. + +
    +
    +@@ -244,7 +244,7 @@ + Open + + Opens a new archive. If you force &app; to open an unsupported archive +- type an error message will be emitted. The archive type is detected by its magic header and not by the extension. Password protected archives are supported also. The password detection is done by looking for the password flag inside the archive structure except for rar ones since encrypted files in rar archives have an asterisk right before their filename. 7zip encrypted archives are not detected due to the complexity of 7zip format. Please see ++ type an error message will be emitted. The archive type is detected by its magic header and not by the extension. Password protected archives are supported also. The password detection is done by looking for the password flag inside the archive structure. 7zip encrypted archives are not detected due to the complexity of 7zip format. Please see + this thread on sf.net + for more information. + +@@ -394,7 +394,7 @@ +
    +
    + How can I create an archive with some files password protected and others not? +- First of all choose 'New' and select one of arj, 7zip, rar or zip archive formats and choose 'Add' from the Action menu. Do NOT check "Password" in the Add dialog. Add your files and then reopen the Add dialog again but this time check "Password" and ++ First of all choose 'New' and select one of arj, 7zip or zip archive formats and choose 'Add' from the Action menu. Do NOT check "Password" in the Add dialog. Add your files and then reopen the Add dialog again but this time check "Password" and + enter your password. From now on all the files you add to the archive will be password protected. + +
    +@@ -427,7 +427,7 @@ + +
    + Why Xarchiver doesn't allow me to choose the archive self-extracting path as it happens with zip and 7z? +- Because rar and arj executable do not allow to do so. Zip and 7z convertion to self-extracting is made by appending an sfx module to the archive so it's possible to choose a different path. ++ Because arj executable do not allow to do so. Zip and 7z convertion to self-extracting is made by appending an sfx module to the archive so it's possible to choose a different path. + +
    + +diff -Nur xarchiver-0.5.3.orig/po/POTFILES.in xarchiver-0.5.3/po/POTFILES.in +--- xarchiver-0.5.3.orig/po/POTFILES.in 2008-08-26 08:53:27.000000000 -0300 ++++ xarchiver-0.5.3/po/POTFILES.in 2014-05-05 16:28:26.154740706 -0300 +@@ -15,7 +15,6 @@ + src/open-with-dlg.c + src/new_dialog.c + src/pref_dialog.c +-src/rar.c + src/rpm.c + src/tar.c + src/zip.c +diff -Nur xarchiver-0.5.3.orig/src/Makefile.am xarchiver-0.5.3/src/Makefile.am +--- xarchiver-0.5.3.orig/src/Makefile.am 2008-09-23 03:39:50.000000000 -0300 ++++ xarchiver-0.5.3/src/Makefile.am 2014-05-05 16:30:14.628892353 -0300 +@@ -16,7 +16,6 @@ + arj.c arj.h \ + deb.c deb.h \ + zip.c zip.h \ +- rar.c rar.h \ + 7zip.c 7zip.h \ + tar.c tar.h \ + bzip2.c bzip2.h \ +diff -Nur xarchiver-0.5.3.orig/src/Makefile.in xarchiver-0.5.3/src/Makefile.in +--- xarchiver-0.5.3.orig/src/Makefile.in 2008-11-12 05:50:37.000000000 -0200 ++++ xarchiver-0.5.3/src/Makefile.in 2014-05-05 16:30:50.625828168 -0300 +@@ -57,7 +57,7 @@ + xarchiver-archive.$(OBJEXT) xarchiver-interface.$(OBJEXT) \ + xarchiver-window.$(OBJEXT) xarchiver-arj.$(OBJEXT) \ + xarchiver-deb.$(OBJEXT) xarchiver-zip.$(OBJEXT) \ +- xarchiver-rar.$(OBJEXT) xarchiver-7zip.$(OBJEXT) \ ++ xarchiver-7zip.$(OBJEXT) \ + xarchiver-tar.$(OBJEXT) xarchiver-bzip2.$(OBJEXT) \ + xarchiver-gzip.$(OBJEXT) xarchiver-rpm.$(OBJEXT) \ + xarchiver-lha.$(OBJEXT) xarchiver-extract_dialog.$(OBJEXT) \ +@@ -267,7 +267,6 @@ + arj.c arj.h \ + deb.c deb.h \ + zip.c zip.h \ +- rar.c rar.h \ + 7zip.c 7zip.h \ + tar.c tar.h \ + bzip2.c bzip2.h \ +@@ -381,7 +380,6 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xarchiver-new_dialog.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xarchiver-open-with-dlg.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xarchiver-pref_dialog.Po@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xarchiver-rar.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xarchiver-rpm.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xarchiver-sexy-icon-entry.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xarchiver-socket.Po@am__quote@ +@@ -595,20 +593,6 @@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xarchiver_CFLAGS) $(CFLAGS) -c -o xarchiver-zip.obj `if test -f 'zip.c'; then $(CYGPATH_W) 'zip.c'; else $(CYGPATH_W) '$(srcdir)/zip.c'; fi` + +-xarchiver-rar.o: rar.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xarchiver_CFLAGS) $(CFLAGS) -MT xarchiver-rar.o -MD -MP -MF "$(DEPDIR)/xarchiver-rar.Tpo" -c -o xarchiver-rar.o `test -f 'rar.c' || echo '$(srcdir)/'`rar.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xarchiver-rar.Tpo" "$(DEPDIR)/xarchiver-rar.Po"; else rm -f "$(DEPDIR)/xarchiver-rar.Tpo"; exit 1; fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='rar.c' object='xarchiver-rar.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xarchiver_CFLAGS) $(CFLAGS) -c -o xarchiver-rar.o `test -f 'rar.c' || echo '$(srcdir)/'`rar.c +- +-xarchiver-rar.obj: rar.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xarchiver_CFLAGS) $(CFLAGS) -MT xarchiver-rar.obj -MD -MP -MF "$(DEPDIR)/xarchiver-rar.Tpo" -c -o xarchiver-rar.obj `if test -f 'rar.c'; then $(CYGPATH_W) 'rar.c'; else $(CYGPATH_W) '$(srcdir)/rar.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xarchiver-rar.Tpo" "$(DEPDIR)/xarchiver-rar.Po"; else rm -f "$(DEPDIR)/xarchiver-rar.Tpo"; exit 1; fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='rar.c' object='xarchiver-rar.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xarchiver_CFLAGS) $(CFLAGS) -c -o xarchiver-rar.obj `if test -f 'rar.c'; then $(CYGPATH_W) 'rar.c'; else $(CYGPATH_W) '$(srcdir)/rar.c'; fi` +- + xarchiver-7zip.o: 7zip.c + @am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xarchiver_CFLAGS) $(CFLAGS) -MT xarchiver-7zip.o -MD -MP -MF "$(DEPDIR)/xarchiver-7zip.Tpo" -c -o xarchiver-7zip.o `test -f '7zip.c' || echo '$(srcdir)/'`7zip.c; \ + @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xarchiver-7zip.Tpo" "$(DEPDIR)/xarchiver-7zip.Po"; else rm -f "$(DEPDIR)/xarchiver-7zip.Tpo"; exit 1; fi +diff -Nur xarchiver-0.5.3.orig/src/interface.c xarchiver-0.5.3/src/interface.c +--- xarchiver-0.5.3.orig/src/interface.c 2014-02-09 13:26:24.000000000 -0200 ++++ xarchiver-0.5.3/src/interface.c 2014-05-05 17:04:24.879755668 -0300 +@@ -45,7 +45,7 @@ + { "text/uri-list",0,0 }, + }; + +-extern gboolean unrar,batch_mode; ++extern gboolean batch_mode; + + static gboolean xa_progress_dialog_delete_event (GtkWidget *caller,GdkEvent *event,GPid pid); + static void xa_progress_dialog_stop_action (GtkWidget *widget,GPid pid); +@@ -600,7 +600,7 @@ + if (selection != NULL) + xa_row_selected(selection,archive[id]); + +- if (archive[id]->type == XARCHIVETYPE_7ZIP || archive[id]->type == XARCHIVETYPE_ZIP || archive[id]->type == XARCHIVETYPE_RAR || archive[id]->type == XARCHIVETYPE_RAR5 || archive[id]->type == XARCHIVETYPE_ARJ) ++ if (archive[id]->type == XARCHIVETYPE_7ZIP || archive[id]->type == XARCHIVETYPE_ZIP || archive[id]->type == XARCHIVETYPE_ARJ) + gtk_widget_set_sensitive (comment_menu,TRUE); + else + gtk_widget_set_sensitive (comment_menu,FALSE); +@@ -623,12 +623,7 @@ + { + gtk_widget_show(selected_frame); + gtk_widget_set_sensitive(deselect_all,TRUE); +- if ((archive[id]->type == XARCHIVETYPE_RAR || archive[id]->type == XARCHIVETYPE_RAR5) && unrar) +- { +- gtk_widget_set_sensitive (delete_menu,FALSE); +- gtk_widget_set_sensitive (rename_menu,FALSE); +- } +- else if (archive[id]->type == XARCHIVETYPE_BZIP2 || archive[id]->type == XARCHIVETYPE_GZIP || archive[id]->type == XARCHIVETYPE_DEB || archive[id]->type == XARCHIVETYPE_RPM || archive[id]->type == XARCHIVETYPE_LZMA || archive[id]->type == XARCHIVETYPE_XZ || archive[id]->type == XARCHIVETYPE_LZOP) ++ if (archive[id]->type == XARCHIVETYPE_BZIP2 || archive[id]->type == XARCHIVETYPE_GZIP || archive[id]->type == XARCHIVETYPE_DEB || archive[id]->type == XARCHIVETYPE_RPM || archive[id]->type == XARCHIVETYPE_LZMA || archive[id]->type == XARCHIVETYPE_XZ || archive[id]->type == XARCHIVETYPE_LZOP) + { + gtk_widget_set_sensitive (delete_menu,FALSE); + gtk_widget_set_sensitive (rename_menu,FALSE); +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; + gboolean batch_mode = FALSE; +-gboolean unrar = FALSE; + gboolean sevenzr = FALSE, sevenza = FALSE, xdg_open = FALSE; + static gboolean show_version = FALSE; + int response; + extern gchar *current_open_directory; + extern int status; +-extern int rar_version; + + extern Progress_bar_data *pb; + Prefs_dialog_data *prefs_window = NULL; +@@ -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; +- open_archive[XARCHIVETYPE_RAR] = open_archive[XARCHIVETYPE_RAR5] = &xa_open_rar; + 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; +@@ -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; +@@ -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; +- add[XARCHIVETYPE_RAR] = add[XARCHIVETYPE_RAR5] = &xa_rar_add; + 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; +@@ -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; +- extract[XARCHIVETYPE_RAR] = extract[XARCHIVETYPE_RAR5] = &xa_rar_extract; + 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; +@@ -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; +- test[XARCHIVETYPE_RAR] = test[XARCHIVETYPE_RAR5] = &xa_rar_test; + 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; +@@ -436,39 +429,6 @@ + //ArchiveSuffix = g_list_append(ArchiveSuffix, ""); + } + +- absolute_path = g_find_program_in_path ("rar"); +- if ( absolute_path ) +- { +- ArchiveType = g_list_append(ArchiveType, "rar"); +- ArchiveSuffix = g_list_append(ArchiveSuffix, "*.rar"); +- // Is RAR v5 ? +- xa_rar_checkversion (absolute_path); +- if (rar_version == 5) +- { +- ArchiveType = g_list_append(ArchiveType, "rar5"); +- ArchiveSuffix = g_list_append(ArchiveSuffix, "*.rar5"); +- } +- g_free (absolute_path); +- } +- else +- { +- absolute_path = g_find_program_in_path("unrar"); +- if ( absolute_path ) +- { +- unrar = TRUE; +- ArchiveType = g_list_append(ArchiveType, "rar"); +- ArchiveSuffix = g_list_append(ArchiveSuffix, "*.rar"); +- // Is RAR v5 ? +- xa_rar_checkversion (absolute_path); +- if (rar_version == 5) +- { +- ArchiveType = g_list_append(ArchiveType, "rar5"); +- ArchiveSuffix = g_list_append(ArchiveSuffix, "*.rar5"); +- } +- g_free (absolute_path); +- } +- } +- + absolute_path = g_find_program_in_path("cpio"); + if ( absolute_path ) + { +diff -Nur xarchiver-0.5.3.orig/src/mime.c xarchiver-0.5.3/src/mime.c +--- xarchiver-0.5.3.orig/src/mime.c 2008-11-05 07:53:22.000000000 -0200 ++++ xarchiver-0.5.3/src/mime.c 2014-05-05 16:31:28.126107426 -0300 +@@ -44,7 +44,7 @@ + icon_name = "gnome-mime-application-vnd.ms-excel"; + else if (strcmp(mime,"application/vnd.ms-powerpoint") == 0 || strcmp (mime,"application/vnd.oasis.opendocument.presentation") == 0) + icon_name = "gnome-mime-application-vnd.ms-powerpoint"; +- else if (strcmp(mime,"application/zip") == 0 || strcmp(mime,"application/x-rar") == 0 || strcmp(mime,"application/x-tar") == 0 ++ else if (strcmp(mime,"application/zip") == 0 || strcmp(mime,"application/x-tar") == 0 + || strcmp(mime,"application/x-7z-compressed") == 0 || strcmp(mime,"application/x-bzip-compressed-tar") == 0 + || strcmp (mime,"application/x-compressed-tar") == 0 || strcmp (mime,"application/x-lha") == 0 + || strcmp (mime,"application/x-rpm") == 0 || strcmp (mime,"application/x-deb") == 0 +diff -Nur xarchiver-0.5.3.orig/src/new_dialog.c xarchiver-0.5.3/src/new_dialog.c +--- xarchiver-0.5.3.orig/src/new_dialog.c 2014-02-09 13:26:24.000000000 -0200 ++++ xarchiver-0.5.3/src/new_dialog.c 2014-05-05 16:21:07.714600036 -0300 +@@ -24,7 +24,6 @@ + #include "string_utils.h" + #include "main.h" + +-extern gboolean unrar; + extern Prefs_dialog_data *prefs_window; + gchar *current_new_directory = NULL; + gint new_combo_box = -1; +@@ -100,11 +99,6 @@ + Name = g_list_first (ArchiveType); + + while (Name) +- { +- if (!(strncmp(Name->data, "rar", 3) == 0 && unrar)) +- gtk_combo_box_append_text(GTK_COMBO_BOX(combo_box),Name->data); +- Name = g_list_next (Name); +- } + if (new_combo_box == -1) + gtk_combo_box_set_active(GTK_COMBO_BOX(combo_box),gtk_combo_box_get_active(GTK_COMBO_BOX(prefs_window->combo_prefered_format))); + else +@@ -227,16 +221,6 @@ + type = XARCHIVETYPE_LZOP; + format = "LZOP"; + } +- else if (strcmp (ComboArchiveType,"rar") == 0) +- { +- type = XARCHIVETYPE_RAR; +- format = "RAR"; +- } +- else if (strcmp (ComboArchiveType,"rar5") == 0) +- { +- type = XARCHIVETYPE_RAR5; +- format = "RAR5"; +- } + else if (strcmp (ComboArchiveType,"tar") == 0) + { + type = XARCHIVETYPE_TAR; +diff -Nur xarchiver-0.5.3.orig/src/pref_dialog.c xarchiver-0.5.3/src/pref_dialog.c +--- xarchiver-0.5.3.orig/src/pref_dialog.c 2014-02-09 13:26:24.000000000 -0200 ++++ xarchiver-0.5.3/src/pref_dialog.c 2014-05-05 17:29:05.494321392 -0300 +@@ -23,7 +23,6 @@ + #include "main.h" + #include "support.h" + +-extern gboolean unrar; + extern gboolean xdg_open; + extern Extract_dialog_data *extract_window; + extern Add_dialog_data *add_window; +@@ -103,9 +102,7 @@ + while ( archive_type != NULL ) + { + if (strcmp(archive_type->data, "tgz") == 0 || +- strcmp(archive_type->data, "rpm") == 0 || +- (strncmp(archive_type->data, "rar", 3) == 0 && unrar) ) +- goto next; ++ strcmp(archive_type->data, "rpm") == 0); + else + gtk_combo_box_append_text (GTK_COMBO_BOX (prefs_data->combo_prefered_format),archive_type->data ); + next: +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; + extern GList *ArchiveSuffix; +-extern gboolean unrar; + extern gboolean xdg_open; + extern Prefs_dialog_data *prefs_window; + extern Extract_dialog_data *extract_window; +@@ -326,11 +325,7 @@ + + /* Does the user open an archive from the command line whose archiver is not installed? */ + gchar *ext = NULL; +- if (type == XARCHIVETYPE_RAR) +- ext = "rar"; +- else if (type == XARCHIVETYPE_RAR5) +- ext = "rar5"; +- else if (type == XARCHIVETYPE_7ZIP) ++ if (type == XARCHIVETYPE_7ZIP) + ext = "7z"; + else if (type == XARCHIVETYPE_ARJ) + ext = "arj"; +@@ -358,7 +353,7 @@ + g_free (path); + return; + } +- /* Detect archive comment,rar one is detected in rar.c */ ++ /* Detect archive comment */ + if (type == XARCHIVETYPE_ZIP) + archive[current_page]->has_comment = xa_detect_archive_comment (XARCHIVETYPE_ZIP,path,archive[current_page]); + else if (type == XARCHIVETYPE_ARJ) +@@ -780,13 +775,6 @@ + archive[idx]->status = XA_ARCHIVESTATUS_SFX; + switch ( archive[idx]->type) + { +- case XARCHIVETYPE_RAR: +- case XARCHIVETYPE_RAR5: +- command = g_strconcat ("rar s -o+ ",archive[idx]->escaped_path,NULL); +- list = g_slist_append(list,command); +- xa_run_command (archive[idx],list); +- break; +- + case XARCHIVETYPE_ZIP: + { + gchar *archive_name = NULL; +@@ -964,7 +952,7 @@ + void xa_about (GtkMenuItem *menuitem,gpointer user_data) + { + static GtkWidget *about = NULL; +- const char *authors[] = {"Main developer:\nGiuseppe Torelli \n\nArchive navigation code:\nJohn Berthels\n\nLHA and DEB support:\nŁukasz Zemczak \n\nLZMA support:\nThomas Dy \n\nLZOP support:\nKevin Day\n\nRAR5, XZ, TAR.XZ support:\nFrederick GUERIN \n",NULL}; ++ const char *authors[] = {"Main developer:\nGiuseppe Torelli \n\nArchive navigation code:\nJohn Berthels\n\nLHA and DEB support:\nŁukasz Zemczak \n\nLZMA support:\nThomas Dy \n\nLZOP support:\nKevin Day\n\nXZ, TAR.XZ support:\nFrederick GUERIN \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) +@@ -1122,10 +1110,6 @@ + xx = XARCHIVETYPE_ZIP; + else if (memcmp (magic,"\x60\xea",2) == 0) + xx = XARCHIVETYPE_ARJ; +- else if (memcmp ( magic,"\x52\x61\x72\x21\x1a\x07\x00",7) == 0) +- xx = XARCHIVETYPE_RAR; +- else if (memcmp ( magic,"\x52\x61\x72\x21\x1a\x07\x01",7) == 0) +- xx = XARCHIVETYPE_RAR5; + else if (memcmp ( magic,"\x42\x5a\x68",3) == 0) + xx = XARCHIVETYPE_BZIP2; + else if (memcmp ( magic,"\x1f\x8b",2) == 0 || memcmp ( magic,"\x1f\x9d",2) == 0) +@@ -1479,8 +1463,6 @@ + pos = 3; + break; + +- case XARCHIVETYPE_RAR: +- case XARCHIVETYPE_RAR5: + case XARCHIVETYPE_ARJ: + case XARCHIVETYPE_7ZIP: + pos = 2; +@@ -1545,8 +1527,6 @@ + pos = 3; + break; + +- case XARCHIVETYPE_RAR: +- case XARCHIVETYPE_RAR5: + case XARCHIVETYPE_ARJ: + case XARCHIVETYPE_7ZIP: + pos = 2; +@@ -1584,7 +1564,7 @@ + gtk_widget_show(selected_frame); + gtk_widget_set_sensitive(deselect_all,TRUE); + } +- if ( (archive->type == XARCHIVETYPE_RAR && unrar) || (archive->type == XARCHIVETYPE_RAR5 && unrar) || archive->type == XARCHIVETYPE_BZIP2 || archive->type == XARCHIVETYPE_GZIP || archive->type == XARCHIVETYPE_LZMA || archive->type == XARCHIVETYPE_XZ || archive->type == XARCHIVETYPE_LZOP) ++ if (archive->type == XARCHIVETYPE_BZIP2 || archive->type == XARCHIVETYPE_GZIP || archive->type == XARCHIVETYPE_LZMA || archive->type == XARCHIVETYPE_XZ || archive->type == XARCHIVETYPE_LZOP) + { + gtk_widget_set_sensitive (delete_menu,FALSE); + gtk_widget_set_sensitive (rename_menu,FALSE); +@@ -1801,11 +1781,6 @@ + else + idx = xa_find_archive_index (current_page); + +- if ((archive[idx]->type == XARCHIVETYPE_RAR || archive[idx]->type == XARCHIVETYPE_RAR5) && unrar) +- { +- response = xa_show_message_dialog (GTK_WINDOW (xa_main_window),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,_("Can't perform this action:"),_("You have to install rar package!")); +- return; +- } + if (archive[idx]->type == XARCHIVETYPE_DEB || archive[idx]->type == XARCHIVETYPE_RPM) + { + gchar *msg; +@@ -2111,11 +2086,6 @@ + command = g_strconcat ("arj c ",archive[idx]->escaped_path," -z",tmp,NULL); + break; + +- case XARCHIVETYPE_RAR: +- case XARCHIVETYPE_RAR5: +- command = g_strconcat ("rar c ",archive[idx]->escaped_path," -z",tmp,NULL); +- break; +- + case XARCHIVETYPE_ZIP: + command = g_strconcat ("sh -c \"zip ",archive[idx]->escaped_path," -z <",tmp,"\"",NULL); + break; +diff -Nur xarchiver-0.5.3.orig/src/window.h xarchiver-0.5.3/src/window.h +--- xarchiver-0.5.3.orig/src/window.h 2008-10-24 07:26:51.000000000 -0200 ++++ xarchiver-0.5.3/src/window.h 2014-05-05 16:29:42.841987069 -0300 +@@ -40,7 +40,6 @@ + #include "deb.h" + #include "lha.h" + #include "zip.h" +-#include "rar.h" + #include "tar.h" + #include "7zip.h" + #include "bzip2.h" +diff -Nur xarchiver-0.5.3.orig/xarchiver.desktop.in xarchiver-0.5.3/xarchiver.desktop.in +--- xarchiver-0.5.3.orig/xarchiver.desktop.in 2014-05-12 02:00:44.138672823 -0300 ++++ xarchiver-0.5.3/xarchiver.desktop.in 2014-05-12 02:01:31.452361143 -0300 +@@ -11,4 +11,4 @@ + X-MultipleArgs=false + Categories=GTK;Archiving;Utility; + StartupNotify=true +-MimeType=application/x-arj;application/arj;application/x-bzip;application/x-bzip-compressed-tar;application/x-gzip;application/x-rar;application/x-rar-compressed;application/x-tar;application/x-zip;application/x-zip-compressed;application/zip;application/x-7z-compressed;application/x-compressed-tar;application/x-bzip2;application/x-bzip2-compressed-tar;application/x-lzma;application/x-lzma-compressed-tar;application/x-lzop;application/x-lzop-compressed-tar;application/x-xz;application/x-xz-compressed-tar;application/x-deb;application/x-rpm; ++MimeType=application/x-arj;application/arj;application/x-bzip;application/x-bzip-compressed-tar;application/x-gzip;application/x-tar;application/x-zip;application/x-zip-compressed;application/zip;application/x-7z-compressed;application/x-compressed-tar;application/x-bzip2;application/x-bzip2-compressed-tar;application/x-lzma;application/x-lzma-compressed-tar;application/x-lzop;application/x-lzop-compressed-tar;application/x-xz;application/x-xz-compressed-tar;application/x-deb;application/x-rpm; diff --git a/libre/xarchiver/xarchiver-0.5.3-add-mime-types.patch b/libre/xarchiver/xarchiver-0.5.3-add-mime-types.patch deleted file mode 100644 index ec427b99a..000000000 --- a/libre/xarchiver/xarchiver-0.5.3-add-mime-types.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -Naur xarchiver-0.5.3.orig/xarchiver.desktop.in xarchiver-0.5.3/xarchiver.desktop.in ---- xarchiver-0.5.3.orig/xarchiver.desktop.in 2014-05-12 01:08:12.159131913 +0000 -+++ xarchiver-0.5.3/xarchiver.desktop.in 2014-05-12 01:09:02.585526393 +0000 -@@ -4,11 +4,11 @@ - _Name=Xarchiver - _Comment=A GTK+2 only archive manager - _GenericName=Archive manager --Exec=xarchiver -+Exec=xarchiver %f - Icon=xarchiver - Terminal=false - Type=Application - X-MultipleArgs=false - Categories=GTK;Archiving;Utility; - StartupNotify=true --MimeType=application/x-arj;application/arj;application/x-bzip;application/x-bzip-compressed-tar;application/x-gzip;application/x-rar;application/x-rar-compressed;application/x-tar;application/x-zip;application/x-zip-compressed;application/zip;multipart/x-zip;application/x-7z-compressed;application/x-compressed-tar;application/x-bzip2;application/x-bzip2-compressed-tar; -+MimeType=application/x-arj;application/arj;application/x-bzip;application/x-bzip-compressed-tar;application/x-gzip;application/x-rar;application/x-rar-compressed;application/x-tar;application/x-zip;application/x-zip-compressed;application/zip;application/x-7z-compressed;application/x-compressed-tar;application/x-bzip2;application/x-bzip2-compressed-tar;application/x-lzma;application/x-lzma-compressed-tar;application/x-lzop;application/x-lzop-compressed-tar;application/x-xz;application/x-xz-compressed-tar;application/x-deb;application/x-rpm; 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?= -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); diff --git a/libre/xarchiver/xarchiver-0.5.3-fix-password-protected.patch b/libre/xarchiver/xarchiver-0.5.3-fix-password-protected.patch deleted file mode 100644 index 00969349d..000000000 --- a/libre/xarchiver/xarchiver-0.5.3-fix-password-protected.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -Naur xarchiver-0.5.3.orig/src/window.c xarchiver-0.5.2/src/window.c ---- xarchiver-0.5.3.orig/src/window.c 2014-01-24 08:10:09.305990000 +0100 -+++ xarchiver-0.5.3/src/window.c 2014-01-24 08:42:45.110729290 +0100 -@@ -1694,7 +1694,7 @@ - { - if (archive->passwd == NULL) - { -- archive->passwd = xa_create_password_dialog(NULL); -+ archive->passwd = xa_create_password_dialog(archive); - if ( archive->passwd == NULL) - { - gtk_drag_finish (dc,FALSE,FALSE,t); -@@ -2702,9 +2702,12 @@ - - if (entry->is_encrypted) - { -- archive[idx]->passwd = xa_create_password_dialog(archive[idx]); - if (archive[idx]->passwd == NULL) -- return; -+ { -+ archive[idx]->passwd = xa_create_password_dialog(archive[idx]); -+ if (archive[idx]->passwd == NULL) -+ return; -+ } - } - filename = g_strconcat(archive[idx]->tmp,"/",entry->filename,NULL); - if (g_file_test(filename,G_FILE_TEST_EXISTS)) -@@ -2768,8 +2771,12 @@ - { - if (entry->is_encrypted) - { -- if (archive->passwd == NULL) -- return; -+ if (archive->passwd == NULL) -+ { -+ archive->passwd = xa_create_password_dialog(archive); -+ if (archive->passwd == NULL) -+ return; -+ } - } - if (archive->extraction_path) - { diff --git a/libre/xarchiver/xarchiver-0.5.3-fix-rpm-support.patch b/libre/xarchiver/xarchiver-0.5.3-fix-rpm-support.patch deleted file mode 100644 index cf17ff738..000000000 --- a/libre/xarchiver/xarchiver-0.5.3-fix-rpm-support.patch +++ /dev/null @@ -1,86 +0,0 @@ -diff -Naur xarchiver-0.5.3.orig/src/rpm.c xarchiver-0.5.3/src/rpm.c ---- xarchiver-0.5.3.orig/src/rpm.c 2014-02-09 16:26:24.000000000 +0100 -+++ xarchiver-0.5.3/src/rpm.c 2014-02-19 07:54:27.744136749 +0100 -@@ -23,8 +23,11 @@ - - void xa_open_rpm (XArchive *archive) - { -+ unsigned char bytes[8]; - unsigned short int i; -- int response; -+ int dl,il,sigsize,offset,response; -+ gchar *ibs,*executable; -+ gchar *gzip_tmp = NULL; - GSList *list = NULL; - FILE *stream; - gboolean result; -@@ -53,14 +56,68 @@ - archive->column_types[i] = types[i]; - - xa_create_liststore (archive,names); -+ if (fseek ( stream, 104 , SEEK_CUR ) ) -+ { -+ fclose (stream); -+ response = xa_show_message_dialog (GTK_WINDOW (xa_main_window),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,_("Can't fseek to position 104:"),g_strerror(errno)); -+ return; -+ } -+ if ( fread ( bytes, 1, 8, stream ) == 0 ) -+ { -+ fclose ( stream ); -+ response = xa_show_message_dialog (GTK_WINDOW (xa_main_window),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,_("Can't read data from file:"),g_strerror(errno)); -+ return; -+ } -+ il = 256 * ( 256 * ( 256 * bytes[0] + bytes[1]) + bytes[2] ) + bytes[3]; -+ dl = 256 * ( 256 * ( 256 * bytes[4] + bytes[5]) + bytes[6] ) + bytes[7]; -+ sigsize = 8 + 16 * il + dl; -+ offset = 104 + sigsize + ( 8 - ( sigsize % 8 ) ) % 8 + 8; -+ if (fseek ( stream, offset , SEEK_SET ) ) -+ { -+ fclose (stream); -+ response = xa_show_message_dialog (GTK_WINDOW (xa_main_window),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,_("Can't fseek in file:"),g_strerror(errno)); -+ return; -+ } -+ if ( fread ( bytes, 1, 8, stream ) == 0 ) -+ { -+ fclose ( stream ); -+ response = xa_show_message_dialog (GTK_WINDOW (xa_main_window),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,_("Can't read data from file:"),g_strerror(errno)); -+ return; -+ } -+ il = 256 * ( 256 * ( 256 * bytes[0] + bytes[1]) + bytes[2] ) + bytes[3]; -+ dl = 256 * ( 256 * ( 256 * bytes[4] + bytes[5]) + bytes[6] ) + bytes[7]; -+ sigsize = 8 + 16 * il + dl; -+ offset = offset + sigsize; -+ fclose (stream); - - /* Create a unique temp dir in /tmp */ - result = xa_create_temp_directory (archive); - if (!result) - return; - -+ gzip_tmp = g_strconcat (archive->tmp,"/file.gz_bz",NULL); -+ ibs = g_strdup_printf ( "%u" , offset ); -+ - /* Now I run dd to have the bzip2 / gzip compressed cpio archive in /tmp */ -- gchar *command = g_strconcat ( "sh -c \"rpm2cpio ",archive->escaped_path," > ",archive->tmp, "/file.cpio\"",NULL); -+ gchar *command = g_strconcat ( "dd if=",archive->escaped_path," ibs=",ibs," skip=1 of=",gzip_tmp,NULL); -+ g_free (ibs); -+ list = g_slist_append(list,command); -+ batch_mode = TRUE; -+ result = xa_run_command (archive,list); -+ if (result == FALSE) -+ { -+ g_free (gzip_tmp); -+ return; -+ } -+ if (xa_detect_archive_type (gzip_tmp) == XARCHIVETYPE_GZIP) -+ executable = "gzip -dc "; -+ else if (xa_detect_archive_type (gzip_tmp) == XARCHIVETYPE_BZIP2) -+ executable = "bzip2 -dc "; -+ else -+ executable = "xz -dc "; -+ -+ command = g_strconcat("sh -c \"",executable,gzip_tmp," > ",archive->tmp,"/file.cpio\"",NULL); -+ g_free(gzip_tmp); - list = NULL; - list = g_slist_append(list,command); - result = xa_run_command (archive,list); diff --git a/libre/xarchiver/xarchiver-0.5.3-remove-nonfree-unrar-support.patch b/libre/xarchiver/xarchiver-0.5.3-remove-nonfree-unrar-support.patch deleted file mode 100644 index e8ba41d59..000000000 --- a/libre/xarchiver/xarchiver-0.5.3-remove-nonfree-unrar-support.patch +++ /dev/null @@ -1,525 +0,0 @@ -diff -Nur xarchiver-0.5.3.orig/doc/html/ch01.html xarchiver-0.5.3/doc/html/ch01.html ---- xarchiver-0.5.3.orig/doc/html/ch01.html 2008-11-10 06:05:07.000000000 -0200 -+++ xarchiver-0.5.3/doc/html/ch01.html 2014-05-05 16:32:35.166604039 -0300 -@@ -23,13 +23,13 @@ -
  • Archives are detected by their magic header and not by the extension except for .tar.bz2 and .tar.gz
    • -
  • Drag and drop from and to Xarchiver window
    • -
  • Progress window when using Xarchiver from the cmd-line or from a file-manager
    • --
  • ARJ, RAR and ZIP archive comment are supported
    • -+
  • ARJ and ZIP archive comment are supported
    • -
  • Ability to convert the archive to self-extracting for those archive types which support it
    • --
  • Smart detection of arj, zip and rar password encrypted archives
    • -+
  • Smart detection of arj and zip password encrypted archives
    • -
  • All the the output of the cmd-line archiver is displayed in the Xarchiver window
    • --
  • All common formats are supported: arj, bzip2, gzip, lha, lzma, 7z, rar, tar, tar.bz2, tar.gz, tar.lzma, tar.lzop, zip, deb and rpm packages (open and extract only)
    • -+
  • All common formats are supported: arj, bzip2, gzip, lha, lzma, 7z, tar, tar.bz2, tar.gz, tar.lzma, tar.lzop, zip, deb and rpm packages (open and extract only)
    • -
  • Deb and Rpm packages are handled internally, their package managers are NOT required.
    • --
  • Zip, rar, arj and 7z password encrypted archives are fully supported (7z automatic password detection is not supported)
    • -+
  • Zip, arj and 7z password encrypted archives are fully supported (7z automatic password detection is not supported)
    • -

    Prev   Next
    - Xarchiver 0.5.2 -  Home Where to get it
    -diff -Nur xarchiver-0.5.3.orig/doc/html/ch03s03.html xarchiver-0.5.3/doc/html/ch03s03.html ---- xarchiver-0.5.3.orig/doc/html/ch03s03.html 2008-11-03 04:49:49.000000000 -0200 -+++ xarchiver-0.5.3/doc/html/ch03s03.html 2014-05-05 16:25:59.026943013 -0300 -@@ -1,7 +1,7 @@ - - - General
    General
    Prev Chapter 3. Usage Next

    General

    Startup

    -- At startup, Xarchiver detects the available installed archivers (tar,rar,zip etc) and the script xdg-open for handling different file types. Since Xarchiver is a frontend (a graphic user interface to the cmd-line executables) it can't create archives whose archiver is not available. For instance if you have the free edition of rar, unrar, Xarchiver can't create rar archives since unrar allows rar archives to be opened, tested and extracted but not to be created. -+ At startup, Xarchiver detects the available installed archivers (tar,zip etc) and the script xdg-open for handling different file types. Since Xarchiver is a frontend (a graphic user interface to the cmd-line executables) it can't create archives whose archiver is not available. -

    How it works

    - Xarchiver will run in the background the cmd-line executable of the archiver with the archiver's proper switches to perform the selected operation. If something goes wrong Xarchiver reports the full output of the archiver executable in the command line output window. From the release 0.5 the files in the archive can be opened within Xarchiver. The script xdg-open will detect the file type and run the proper application to handle it. If you don't have such script installed in your system (it's found in the xdg-utils package) Xarchiver will recognize HTML, txt and images files only. The Preferences dialog will notify this to you when you click the Advanced section inside it. -

    Drag and Drop

    -diff -Nur xarchiver-0.5.3.orig/doc/html/ch04s02.html xarchiver-0.5.3/doc/html/ch04s02.html ---- xarchiver-0.5.3.orig/doc/html/ch04s02.html 2007-08-23 07:27:40.000000000 -0300 -+++ xarchiver-0.5.3/doc/html/ch04s02.html 2014-05-05 16:31:53.479628949 -0300 -@@ -1,5 +1,5 @@ - - --How can I create an archive with some files password protected and others not?

    How can I create an archive with some files password protected and others not?
    Prev Chapter 4. FAQ Next

    How can I create an archive with some files password protected and others not?

    First of all choose 'New' and select one of arj, 7zip, rar or zip archive formats and choose 'Add' from the Action menu. Do NOT check "Password" in the Add dialog. Add your files and then reopen the Add dialog again but this time check "Password" and -+How can I create an archive with some files password protected and others not?

    How can I create an archive with some files password protected and others not?
    Prev Chapter 4. FAQ Next

    How can I create an archive with some files password protected and others not?

    First of all choose 'New' and select one of arj, 7zip or zip archive formats and choose 'Add' from the Action menu. Do NOT check "Password" in the Add dialog. Add your files and then reopen the Add dialog again but this time check "Password" and - enter your password. From now on all the files you add to the archive will be password protected. -

    Prev Up Next
    Chapter 4. FAQ Home Why does Xarchiver emit this error message when handling tar archives?
    -diff -Nur xarchiver-0.5.3.orig/doc/html/ch04s06.html xarchiver-0.5.3/doc/html/ch04s06.html ---- xarchiver-0.5.3.orig/doc/html/ch04s06.html 2008-11-03 04:49:49.000000000 -0200 -+++ xarchiver-0.5.3/doc/html/ch04s06.html 2014-05-05 16:33:00.806793156 -0300 -@@ -1,4 +1,4 @@ - - --Why Xarchiver doesn't allow me to choose the archive self-extracting path as it happens with zip and 7z?
    Why Xarchiver doesn't allow me to choose the archive self-extracting path as it happens with zip and 7z?
    Prev Chapter 4. FAQ 

    Why Xarchiver doesn't allow me to choose the archive self-extracting path as it happens with zip and 7z?

    Because rar and arj executable do not allow to do so. Zip and 7z convertion to self-extracting is made by appending an sfx module to the archive so it's possible to choose a different path. -+Why Xarchiver doesn't allow me to choose the archive self-extracting path as it happens with zip and 7z?

    Why Xarchiver doesn't allow me to choose the archive self-extracting path as it happens with zip and 7z?
    Prev Chapter 4. FAQ 

    Why Xarchiver doesn't allow me to choose the archive self-extracting path as it happens with zip and 7z?

    Because arj executable do not allow to do so. Zip and 7z convertion to self-extracting is made by appending an sfx module to the archive so it's possible to choose a different path. -

    Prev Up 
    Why does Xarchiver sometimes report errors but the Error messages window is empty? Home 
    -diff -Nur xarchiver-0.5.3.orig/doc/xarchiver.docbook xarchiver-0.5.3/doc/xarchiver.docbook ---- xarchiver-0.5.3.orig/doc/xarchiver.docbook 2007-08-22 07:49:19.000000000 -0300 -+++ xarchiver-0.5.3/doc/xarchiver.docbook 2014-05-05 16:25:17.863287969 -0300 -@@ -50,14 +50,14 @@ - The most used archiver cmd-line options are supported in the Add and Extract dialog - Archives are detected by their magic header and not by the extension except for .tar.bz2 and .tar.gz - Drag and drop from and to Xarchiver window is supported with XDS protocol -- ZIP and ARJ archive comment are supported. RAR comment is not yet supported because it's compressed inside the archive itself -+ ZIP and ARJ archive comment are supported. - Tabs Firefox style support - Ability to convert the archive to self-extracting for those archive types which support it -- Smart detection of arj, zip and rar password encrypted archives -+ Smart detection of arj and zip password encrypted archives - All the the output of the cmd-line archiver is displayed in the Xarchiver window -- All common formats are supported: arj, bzip2, lha, gzip, 7z, rar, tar, tar.bz2, tar.gz, zip, DEB and RPM (only open,view and extract) -+ All common formats are supported: arj, bzip2, lha, gzip, 7z, tar, tar.bz2, tar.gz, zip, DEB and RPM (only open,view and extract) - Support of RPM files without RPM executable. This is useful on not RPM-based distributions like Slackware and Arch Linux -- Zip, rar, arj and 7z password encrypted archives are fully supported (7z automatic password detection is not supported) -+ Zip, arj and 7z password encrypted archives are fully supported (7z automatic password detection is not supported) - - - -@@ -204,7 +204,7 @@ -
    - Startup - -- At startup, &app; detects the available installed archivers (tar,rar,zip etc). Since Xarchiver is a frontend (a graphic user interface to the cmd-line executables) it can't create archives whose archiver is not available. For instance if you have the free edition of rar, unrar, Xarchiver can't create rar archives since unrar allows rar archives to be opened, tested and extracted but not to be created. -+ At startup, &app; detects the available installed archivers (tar,zip etc). Since Xarchiver is a frontend (a graphic user interface to the cmd-line executables) it can't create archives whose archiver is not available. - -
    -
    -@@ -244,7 +244,7 @@ - Open - - Opens a new archive. If you force &app; to open an unsupported archive -- type an error message will be emitted. The archive type is detected by its magic header and not by the extension. Password protected archives are supported also. The password detection is done by looking for the password flag inside the archive structure except for rar ones since encrypted files in rar archives have an asterisk right before their filename. 7zip encrypted archives are not detected due to the complexity of 7zip format. Please see -+ type an error message will be emitted. The archive type is detected by its magic header and not by the extension. Password protected archives are supported also. The password detection is done by looking for the password flag inside the archive structure. 7zip encrypted archives are not detected due to the complexity of 7zip format. Please see - this thread on sf.net - for more information. - -@@ -394,7 +394,7 @@ -
    -
    - How can I create an archive with some files password protected and others not? -- First of all choose 'New' and select one of arj, 7zip, rar or zip archive formats and choose 'Add' from the Action menu. Do NOT check "Password" in the Add dialog. Add your files and then reopen the Add dialog again but this time check "Password" and -+ First of all choose 'New' and select one of arj, 7zip or zip archive formats and choose 'Add' from the Action menu. Do NOT check "Password" in the Add dialog. Add your files and then reopen the Add dialog again but this time check "Password" and - enter your password. From now on all the files you add to the archive will be password protected. - -
    -@@ -427,7 +427,7 @@ - -
    - Why Xarchiver doesn't allow me to choose the archive self-extracting path as it happens with zip and 7z? -- Because rar and arj executable do not allow to do so. Zip and 7z convertion to self-extracting is made by appending an sfx module to the archive so it's possible to choose a different path. -+ Because arj executable do not allow to do so. Zip and 7z convertion to self-extracting is made by appending an sfx module to the archive so it's possible to choose a different path. - -
    - -diff -Nur xarchiver-0.5.3.orig/po/POTFILES.in xarchiver-0.5.3/po/POTFILES.in ---- xarchiver-0.5.3.orig/po/POTFILES.in 2008-08-26 08:53:27.000000000 -0300 -+++ xarchiver-0.5.3/po/POTFILES.in 2014-05-05 16:28:26.154740706 -0300 -@@ -15,7 +15,6 @@ - src/open-with-dlg.c - src/new_dialog.c - src/pref_dialog.c --src/rar.c - src/rpm.c - src/tar.c - src/zip.c -diff -Nur xarchiver-0.5.3.orig/src/Makefile.am xarchiver-0.5.3/src/Makefile.am ---- xarchiver-0.5.3.orig/src/Makefile.am 2008-09-23 03:39:50.000000000 -0300 -+++ xarchiver-0.5.3/src/Makefile.am 2014-05-05 16:30:14.628892353 -0300 -@@ -16,7 +16,6 @@ - arj.c arj.h \ - deb.c deb.h \ - zip.c zip.h \ -- rar.c rar.h \ - 7zip.c 7zip.h \ - tar.c tar.h \ - bzip2.c bzip2.h \ -diff -Nur xarchiver-0.5.3.orig/src/Makefile.in xarchiver-0.5.3/src/Makefile.in ---- xarchiver-0.5.3.orig/src/Makefile.in 2008-11-12 05:50:37.000000000 -0200 -+++ xarchiver-0.5.3/src/Makefile.in 2014-05-05 16:30:50.625828168 -0300 -@@ -57,7 +57,7 @@ - xarchiver-archive.$(OBJEXT) xarchiver-interface.$(OBJEXT) \ - xarchiver-window.$(OBJEXT) xarchiver-arj.$(OBJEXT) \ - xarchiver-deb.$(OBJEXT) xarchiver-zip.$(OBJEXT) \ -- xarchiver-rar.$(OBJEXT) xarchiver-7zip.$(OBJEXT) \ -+ xarchiver-7zip.$(OBJEXT) \ - xarchiver-tar.$(OBJEXT) xarchiver-bzip2.$(OBJEXT) \ - xarchiver-gzip.$(OBJEXT) xarchiver-rpm.$(OBJEXT) \ - xarchiver-lha.$(OBJEXT) xarchiver-extract_dialog.$(OBJEXT) \ -@@ -267,7 +267,6 @@ - arj.c arj.h \ - deb.c deb.h \ - zip.c zip.h \ -- rar.c rar.h \ - 7zip.c 7zip.h \ - tar.c tar.h \ - bzip2.c bzip2.h \ -@@ -381,7 +380,6 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xarchiver-new_dialog.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xarchiver-open-with-dlg.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xarchiver-pref_dialog.Po@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xarchiver-rar.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xarchiver-rpm.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xarchiver-sexy-icon-entry.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xarchiver-socket.Po@am__quote@ -@@ -595,20 +593,6 @@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xarchiver_CFLAGS) $(CFLAGS) -c -o xarchiver-zip.obj `if test -f 'zip.c'; then $(CYGPATH_W) 'zip.c'; else $(CYGPATH_W) '$(srcdir)/zip.c'; fi` - --xarchiver-rar.o: rar.c --@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xarchiver_CFLAGS) $(CFLAGS) -MT xarchiver-rar.o -MD -MP -MF "$(DEPDIR)/xarchiver-rar.Tpo" -c -o xarchiver-rar.o `test -f 'rar.c' || echo '$(srcdir)/'`rar.c; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xarchiver-rar.Tpo" "$(DEPDIR)/xarchiver-rar.Po"; else rm -f "$(DEPDIR)/xarchiver-rar.Tpo"; exit 1; fi --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='rar.c' object='xarchiver-rar.o' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xarchiver_CFLAGS) $(CFLAGS) -c -o xarchiver-rar.o `test -f 'rar.c' || echo '$(srcdir)/'`rar.c -- --xarchiver-rar.obj: rar.c --@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xarchiver_CFLAGS) $(CFLAGS) -MT xarchiver-rar.obj -MD -MP -MF "$(DEPDIR)/xarchiver-rar.Tpo" -c -o xarchiver-rar.obj `if test -f 'rar.c'; then $(CYGPATH_W) 'rar.c'; else $(CYGPATH_W) '$(srcdir)/rar.c'; fi`; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xarchiver-rar.Tpo" "$(DEPDIR)/xarchiver-rar.Po"; else rm -f "$(DEPDIR)/xarchiver-rar.Tpo"; exit 1; fi --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='rar.c' object='xarchiver-rar.obj' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xarchiver_CFLAGS) $(CFLAGS) -c -o xarchiver-rar.obj `if test -f 'rar.c'; then $(CYGPATH_W) 'rar.c'; else $(CYGPATH_W) '$(srcdir)/rar.c'; fi` -- - xarchiver-7zip.o: 7zip.c - @am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xarchiver_CFLAGS) $(CFLAGS) -MT xarchiver-7zip.o -MD -MP -MF "$(DEPDIR)/xarchiver-7zip.Tpo" -c -o xarchiver-7zip.o `test -f '7zip.c' || echo '$(srcdir)/'`7zip.c; \ - @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xarchiver-7zip.Tpo" "$(DEPDIR)/xarchiver-7zip.Po"; else rm -f "$(DEPDIR)/xarchiver-7zip.Tpo"; exit 1; fi -diff -Nur xarchiver-0.5.3.orig/src/interface.c xarchiver-0.5.3/src/interface.c ---- xarchiver-0.5.3.orig/src/interface.c 2014-02-09 13:26:24.000000000 -0200 -+++ xarchiver-0.5.3/src/interface.c 2014-05-05 17:04:24.879755668 -0300 -@@ -45,7 +45,7 @@ - { "text/uri-list",0,0 }, - }; - --extern gboolean unrar,batch_mode; -+extern gboolean batch_mode; - - static gboolean xa_progress_dialog_delete_event (GtkWidget *caller,GdkEvent *event,GPid pid); - static void xa_progress_dialog_stop_action (GtkWidget *widget,GPid pid); -@@ -600,7 +600,7 @@ - if (selection != NULL) - xa_row_selected(selection,archive[id]); - -- if (archive[id]->type == XARCHIVETYPE_7ZIP || archive[id]->type == XARCHIVETYPE_ZIP || archive[id]->type == XARCHIVETYPE_RAR || archive[id]->type == XARCHIVETYPE_RAR5 || archive[id]->type == XARCHIVETYPE_ARJ) -+ if (archive[id]->type == XARCHIVETYPE_7ZIP || archive[id]->type == XARCHIVETYPE_ZIP || archive[id]->type == XARCHIVETYPE_ARJ) - gtk_widget_set_sensitive (comment_menu,TRUE); - else - gtk_widget_set_sensitive (comment_menu,FALSE); -@@ -623,12 +623,7 @@ - { - gtk_widget_show(selected_frame); - gtk_widget_set_sensitive(deselect_all,TRUE); -- if ((archive[id]->type == XARCHIVETYPE_RAR || archive[id]->type == XARCHIVETYPE_RAR5) && unrar) -- { -- gtk_widget_set_sensitive (delete_menu,FALSE); -- gtk_widget_set_sensitive (rename_menu,FALSE); -- } -- else if (archive[id]->type == XARCHIVETYPE_BZIP2 || archive[id]->type == XARCHIVETYPE_GZIP || archive[id]->type == XARCHIVETYPE_DEB || archive[id]->type == XARCHIVETYPE_RPM || archive[id]->type == XARCHIVETYPE_LZMA || archive[id]->type == XARCHIVETYPE_XZ || archive[id]->type == XARCHIVETYPE_LZOP) -+ if (archive[id]->type == XARCHIVETYPE_BZIP2 || archive[id]->type == XARCHIVETYPE_GZIP || archive[id]->type == XARCHIVETYPE_DEB || archive[id]->type == XARCHIVETYPE_RPM || archive[id]->type == XARCHIVETYPE_LZMA || archive[id]->type == XARCHIVETYPE_XZ || archive[id]->type == XARCHIVETYPE_LZOP) - { - 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 -@@ -33,13 +33,11 @@ - gchar *add_files; - gboolean error_output, file_to_open, ask_and_extract, ask_and_add, multi_extract; - gboolean batch_mode = FALSE; --gboolean unrar = FALSE; - gboolean sevenzr = FALSE, sevenza = FALSE, xdg_open = FALSE; - static gboolean show_version = FALSE; - int response; - extern gchar *current_open_directory; - extern int status; --extern int rar_version; - - extern Progress_bar_data *pb; - Prefs_dialog_data *prefs_window = NULL; -@@ -315,7 +313,6 @@ - open_archive[XARCHIVETYPE_GZIP] = &xa_open_gzip; - open_archive[XARCHIVETYPE_LZMA] = &xa_open_bzip2_lzma; - open_archive[XARCHIVETYPE_XZ] = &xa_open_bzip2_lzma; -- open_archive[XARCHIVETYPE_RAR] = open_archive[XARCHIVETYPE_RAR5] = &xa_open_rar; - 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; - 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 @@ - 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; -- add[XARCHIVETYPE_RAR] = add[XARCHIVETYPE_RAR5] = &xa_rar_add; - 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 @@ - 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; -- extract[XARCHIVETYPE_RAR] = extract[XARCHIVETYPE_RAR5] = &xa_rar_extract; - 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 @@ - 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; -- test[XARCHIVETYPE_RAR] = test[XARCHIVETYPE_RAR5] = &xa_rar_test; - 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 @@ - //ArchiveSuffix = g_list_append(ArchiveSuffix, ""); - } - -- absolute_path = g_find_program_in_path ("rar"); -- if ( absolute_path ) -- { -- ArchiveType = g_list_append(ArchiveType, "rar"); -- ArchiveSuffix = g_list_append(ArchiveSuffix, "*.rar"); -- // Is RAR v5 ? -- xa_rar_checkversion (absolute_path); -- if (rar_version == 5) -- { -- ArchiveType = g_list_append(ArchiveType, "rar5"); -- ArchiveSuffix = g_list_append(ArchiveSuffix, "*.rar5"); -- } -- g_free (absolute_path); -- } -- else -- { -- absolute_path = g_find_program_in_path("unrar"); -- if ( absolute_path ) -- { -- unrar = TRUE; -- ArchiveType = g_list_append(ArchiveType, "rar"); -- ArchiveSuffix = g_list_append(ArchiveSuffix, "*.rar"); -- // Is RAR v5 ? -- xa_rar_checkversion (absolute_path); -- if (rar_version == 5) -- { -- ArchiveType = g_list_append(ArchiveType, "rar5"); -- ArchiveSuffix = g_list_append(ArchiveSuffix, "*.rar5"); -- } -- g_free (absolute_path); -- } -- } -- - absolute_path = g_find_program_in_path("cpio"); - if ( absolute_path ) - { -diff -Nur xarchiver-0.5.3.orig/src/mime.c xarchiver-0.5.3/src/mime.c ---- xarchiver-0.5.3.orig/src/mime.c 2008-11-05 07:53:22.000000000 -0200 -+++ xarchiver-0.5.3/src/mime.c 2014-05-05 16:31:28.126107426 -0300 -@@ -44,7 +44,7 @@ - icon_name = "gnome-mime-application-vnd.ms-excel"; - else if (strcmp(mime,"application/vnd.ms-powerpoint") == 0 || strcmp (mime,"application/vnd.oasis.opendocument.presentation") == 0) - icon_name = "gnome-mime-application-vnd.ms-powerpoint"; -- else if (strcmp(mime,"application/zip") == 0 || strcmp(mime,"application/x-rar") == 0 || strcmp(mime,"application/x-tar") == 0 -+ else if (strcmp(mime,"application/zip") == 0 || strcmp(mime,"application/x-tar") == 0 - || strcmp(mime,"application/x-7z-compressed") == 0 || strcmp(mime,"application/x-bzip-compressed-tar") == 0 - || strcmp (mime,"application/x-compressed-tar") == 0 || strcmp (mime,"application/x-lha") == 0 - || strcmp (mime,"application/x-rpm") == 0 || strcmp (mime,"application/x-deb") == 0 -diff -Nur xarchiver-0.5.3.orig/src/new_dialog.c xarchiver-0.5.3/src/new_dialog.c ---- xarchiver-0.5.3.orig/src/new_dialog.c 2014-02-09 13:26:24.000000000 -0200 -+++ xarchiver-0.5.3/src/new_dialog.c 2014-05-05 16:21:07.714600036 -0300 -@@ -24,7 +24,6 @@ - #include "string_utils.h" - #include "main.h" - --extern gboolean unrar; - extern Prefs_dialog_data *prefs_window; - gchar *current_new_directory = NULL; - gint new_combo_box = -1; -@@ -100,11 +99,6 @@ - Name = g_list_first (ArchiveType); - - while (Name) -- { -- if (!(strncmp(Name->data, "rar", 3) == 0 && unrar)) -- gtk_combo_box_append_text(GTK_COMBO_BOX(combo_box),Name->data); -- Name = g_list_next (Name); -- } - if (new_combo_box == -1) - gtk_combo_box_set_active(GTK_COMBO_BOX(combo_box),gtk_combo_box_get_active(GTK_COMBO_BOX(prefs_window->combo_prefered_format))); - else -@@ -227,16 +221,6 @@ - type = XARCHIVETYPE_LZOP; - format = "LZOP"; - } -- else if (strcmp (ComboArchiveType,"rar") == 0) -- { -- type = XARCHIVETYPE_RAR; -- format = "RAR"; -- } -- else if (strcmp (ComboArchiveType,"rar5") == 0) -- { -- type = XARCHIVETYPE_RAR5; -- format = "RAR5"; -- } - else if (strcmp (ComboArchiveType,"tar") == 0) - { - type = XARCHIVETYPE_TAR; -diff -Nur xarchiver-0.5.3.orig/src/pref_dialog.c xarchiver-0.5.3/src/pref_dialog.c ---- xarchiver-0.5.3.orig/src/pref_dialog.c 2014-02-09 13:26:24.000000000 -0200 -+++ xarchiver-0.5.3/src/pref_dialog.c 2014-05-05 17:29:05.494321392 -0300 -@@ -23,7 +23,6 @@ - #include "main.h" - #include "support.h" - --extern gboolean unrar; - extern gboolean xdg_open; - extern Extract_dialog_data *extract_window; - extern Add_dialog_data *add_window; -@@ -103,9 +102,7 @@ - while ( archive_type != NULL ) - { - if (strcmp(archive_type->data, "tgz") == 0 || -- strcmp(archive_type->data, "rpm") == 0 || -- (strncmp(archive_type->data, "rar", 3) == 0 && unrar) ) -- goto next; -+ strcmp(archive_type->data, "rpm") == 0); - 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 -@@ -26,7 +26,6 @@ - - extern GList *ArchiveType; - extern GList *ArchiveSuffix; --extern gboolean unrar; - extern gboolean xdg_open; - extern Prefs_dialog_data *prefs_window; - extern Extract_dialog_data *extract_window; -@@ -326,11 +325,7 @@ - - /* Does the user open an archive from the command line whose archiver is not installed? */ - gchar *ext = NULL; -- if (type == XARCHIVETYPE_RAR) -- ext = "rar"; -- else if (type == XARCHIVETYPE_RAR5) -- ext = "rar5"; -- else if (type == XARCHIVETYPE_7ZIP) -+ if (type == XARCHIVETYPE_7ZIP) - ext = "7z"; - else if (type == XARCHIVETYPE_ARJ) - ext = "arj"; -@@ -358,7 +353,7 @@ - g_free (path); - return; - } -- /* Detect archive comment,rar one is detected in rar.c */ -+ /* Detect archive comment */ - if (type == XARCHIVETYPE_ZIP) - archive[current_page]->has_comment = xa_detect_archive_comment (XARCHIVETYPE_ZIP,path,archive[current_page]); - else if (type == XARCHIVETYPE_ARJ) -@@ -780,13 +775,6 @@ - archive[idx]->status = XA_ARCHIVESTATUS_SFX; - switch ( archive[idx]->type) - { -- case XARCHIVETYPE_RAR: -- case XARCHIVETYPE_RAR5: -- command = g_strconcat ("rar s -o+ ",archive[idx]->escaped_path,NULL); -- list = g_slist_append(list,command); -- xa_run_command (archive[idx],list); -- break; -- - case XARCHIVETYPE_ZIP: - { - gchar *archive_name = NULL; -@@ -964,7 +952,7 @@ - void xa_about (GtkMenuItem *menuitem,gpointer user_data) - { - static GtkWidget *about = NULL; -- const char *authors[] = {"Main developer:\nGiuseppe Torelli \n\nArchive navigation code:\nJohn Berthels\n\nCode fixing:\nEnrico Tröger\n\nLHA and DEB support:\nŁukasz Zemczak \n\nLZMA support:\nThomas Dy \n\nLZOP support:\nKevin Day\n\nRAR5, XZ, TAR.XZ support:\nFrederick GUERIN \n",NULL}; -+ const char *authors[] = {"Main developer:\nGiuseppe Torelli \n\nArchive navigation code:\nJohn Berthels\n\nCode fixing:\nEnrico Tröger\n\nLHA and DEB support:\nŁukasz Zemczak \n\nLZMA support:\nThomas Dy \n\nLZOP support:\nKevin Day\n\nXZ, TAR.XZ support:\nFrederick GUERIN \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) -@@ -1122,10 +1110,6 @@ - xx = XARCHIVETYPE_ZIP; - else if (memcmp (magic,"\x60\xea",2) == 0) - xx = XARCHIVETYPE_ARJ; -- else if (memcmp ( magic,"\x52\x61\x72\x21\x1a\x07\x00",7) == 0) -- xx = XARCHIVETYPE_RAR; -- else if (memcmp ( magic,"\x52\x61\x72\x21\x1a\x07\x01",7) == 0) -- xx = XARCHIVETYPE_RAR5; - else if (memcmp ( magic,"\x42\x5a\x68",3) == 0) - xx = XARCHIVETYPE_BZIP2; - else if (memcmp ( magic,"\x1f\x8b",2) == 0 || memcmp ( magic,"\x1f\x9d",2) == 0) -@@ -1479,8 +1463,6 @@ - pos = 3; - break; - -- case XARCHIVETYPE_RAR: -- case XARCHIVETYPE_RAR5: - case XARCHIVETYPE_ARJ: - case XARCHIVETYPE_7ZIP: - pos = 2; -@@ -1545,8 +1527,6 @@ - pos = 3; - break; - -- case XARCHIVETYPE_RAR: -- case XARCHIVETYPE_RAR5: - case XARCHIVETYPE_ARJ: - case XARCHIVETYPE_7ZIP: - pos = 2; -@@ -1584,7 +1564,7 @@ - gtk_widget_show(selected_frame); - gtk_widget_set_sensitive(deselect_all,TRUE); - } -- if ( (archive->type == XARCHIVETYPE_RAR && unrar) || (archive->type == XARCHIVETYPE_RAR5 && unrar) || archive->type == XARCHIVETYPE_BZIP2 || archive->type == XARCHIVETYPE_GZIP || archive->type == XARCHIVETYPE_LZMA || archive->type == XARCHIVETYPE_XZ || archive->type == XARCHIVETYPE_LZOP) -+ if (archive->type == XARCHIVETYPE_BZIP2 || archive->type == XARCHIVETYPE_GZIP || archive->type == XARCHIVETYPE_LZMA || archive->type == XARCHIVETYPE_XZ || archive->type == XARCHIVETYPE_LZOP) - { - gtk_widget_set_sensitive (delete_menu,FALSE); - gtk_widget_set_sensitive (rename_menu,FALSE); -@@ -1801,11 +1781,6 @@ - else - idx = xa_find_archive_index (current_page); - -- if ((archive[idx]->type == XARCHIVETYPE_RAR || archive[idx]->type == XARCHIVETYPE_RAR5) && unrar) -- { -- response = xa_show_message_dialog (GTK_WINDOW (xa_main_window),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,_("Can't perform this action:"),_("You have to install rar package!")); -- return; -- } - if (archive[idx]->type == XARCHIVETYPE_DEB || archive[idx]->type == XARCHIVETYPE_RPM) - { - gchar *msg; -@@ -2111,11 +2086,6 @@ - command = g_strconcat ("arj c ",archive[idx]->escaped_path," -z",tmp,NULL); - break; - -- case XARCHIVETYPE_RAR: -- case XARCHIVETYPE_RAR5: -- command = g_strconcat ("rar c ",archive[idx]->escaped_path," -z",tmp,NULL); -- break; -- - case XARCHIVETYPE_ZIP: - command = g_strconcat ("sh -c \"zip ",archive[idx]->escaped_path," -z <",tmp,"\"",NULL); - break; -diff -Nur xarchiver-0.5.3.orig/src/window.h xarchiver-0.5.3/src/window.h ---- xarchiver-0.5.3.orig/src/window.h 2008-10-24 07:26:51.000000000 -0200 -+++ xarchiver-0.5.3/src/window.h 2014-05-05 16:29:42.841987069 -0300 -@@ -40,7 +40,6 @@ - #include "deb.h" - #include "lha.h" - #include "zip.h" --#include "rar.h" - #include "tar.h" - #include "7zip.h" - #include "bzip2.h" -diff -Nur xarchiver-0.5.3.orig/xarchiver.desktop.in xarchiver-0.5.3/xarchiver.desktop.in ---- xarchiver-0.5.3.orig/xarchiver.desktop.in 2014-05-12 02:00:44.138672823 -0300 -+++ xarchiver-0.5.3/xarchiver.desktop.in 2014-05-12 02:01:31.452361143 -0300 -@@ -11,4 +11,4 @@ - X-MultipleArgs=false - Categories=GTK;Archiving;Utility; - StartupNotify=true --MimeType=application/x-arj;application/arj;application/x-bzip;application/x-bzip-compressed-tar;application/x-gzip;application/x-rar;application/x-rar-compressed;application/x-tar;application/x-zip;application/x-zip-compressed;application/zip;application/x-7z-compressed;application/x-compressed-tar;application/x-bzip2;application/x-bzip2-compressed-tar;application/x-lzma;application/x-lzma-compressed-tar;application/x-lzop;application/x-lzop-compressed-tar;application/x-xz;application/x-xz-compressed-tar;application/x-deb;application/x-rpm; -+MimeType=application/x-arj;application/arj;application/x-bzip;application/x-bzip-compressed-tar;application/x-gzip;application/x-tar;application/x-zip;application/x-zip-compressed;application/zip;application/x-7z-compressed;application/x-compressed-tar;application/x-bzip2;application/x-bzip2-compressed-tar;application/x-lzma;application/x-lzma-compressed-tar;application/x-lzop;application/x-lzop-compressed-tar;application/x-xz;application/x-xz-compressed-tar;application/x-deb;application/x-rpm; -- cgit v1.2.3-54-g00ecf