From c9e4976968b0f847cc693453df1e947531af2e76 Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Wed, 22 Jan 2014 03:54:26 +0000 Subject: Wed Jan 22 03:51:02 UTC 2014 --- community/i3-wm/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'community/i3-wm/PKGBUILD') diff --git a/community/i3-wm/PKGBUILD b/community/i3-wm/PKGBUILD index a7e08bae5..382982548 100644 --- a/community/i3-wm/PKGBUILD +++ b/community/i3-wm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 102909 2013-12-23 21:00:35Z ttoepper $ +# $Id: PKGBUILD 104492 2014-01-21 20:50:05Z ttoepper $ # Maintainer: Thorsten Töpper pkgname=i3-wm _pkgsourcename=i3 -pkgver=4.7 +pkgver=4.7.1 pkgrel=1 pkgdesc='An improved dynamic tiling window manager' arch=('i686' 'x86_64') @@ -20,7 +20,7 @@ optdepends=('dmenu: As menu.' options=('docs' '!strip') source=("http://i3wm.org/downloads/${_pkgsourcename}-${pkgver}.tar.bz2" "http://i3wm.org/downloads/${_pkgsourcename}-${pkgver}.tar.bz2.asc") -md5sums=('34dade2bc69e241ab3e3ffaa81122266' +md5sums=('7e25d9198bbbe4d0c0e3d2c6eba6980b' 'SKIP') build() { -- cgit v1.2.3-54-g00ecf From bceed102ef20163ec69542342988b89b9ceb1fcf Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Sat, 25 Jan 2014 03:57:09 +0000 Subject: Sat Jan 25 03:51:36 UTC 2014 --- community/darktable/PKGBUILD | 4 +- community/gimp-ufraw/PKGBUILD | 4 +- community/i3-wm/PKGBUILD | 6 +- community/mate-mplayer/PKGBUILD | 30 ++ community/mate-mplayer/mate-mplayer.install | 13 + community/nodejs/PKGBUILD | 6 +- community/phantomjs/PKGBUILD | 27 +- community/rekonq/PKGBUILD | 6 +- community/sysstat/PKGBUILD | 6 +- community/task/PKGBUILD | 4 +- community/xboard/PKGBUILD | 15 +- community/xl2tpd/PKGBUILD | 6 +- core/dbus/PKGBUILD | 18 +- extra/calligra/PKGBUILD | 13 +- extra/enlightenment/PKGBUILD | 2 +- extra/gtk-vnc/PKGBUILD | 6 +- extra/lftp/PKGBUILD | 6 +- extra/libvorbis/PKGBUILD | 6 +- extra/oxygen-gtk2/PKGBUILD | 6 +- extra/oxygen-gtk3/PKGBUILD | 6 +- extra/quazip/PKGBUILD | 8 +- extra/redland/PKGBUILD | 10 +- extra/wayland/PKGBUILD | 6 +- extra/xfig/PKGBUILD | 19 +- .../xfig-fix_dash_list_for_different_styles.patch | 34 ++ libre/calibre-libre/PKGBUILD | 8 +- libre/icecat-noscript/PKGBUILD | 6 +- libre/iceweasel-noscript/PKGBUILD | 6 +- libre/xarchiver-libre/PKGBUILD | 115 ++++-- libre/xarchiver-libre/rePKGBUILD | 26 -- .../xarchiver-0.5.2-add_mime_types.patch | 9 + .../xarchiver-0.5.2-add_unar_support.patch | 380 ++++++++++++++++++++ .../xarchiver-0.5.2-add_xz_support.patch | 397 +++++++++++++++++++++ .../xarchiver-0.5.2-drag-n-drop_escaped_path.patch | 13 + .../xarchiver-0.5.2-fix-double-escaping.patch | 32 ++ .../xarchiver-0.5.2-fix-non-existent-archive.patch | 26 ++ .../xarchiver-0.5.2-no-donators-menu.patch | 50 +++ .../xarchiver-0.5.2-segfault-delete-file.patch | 21 ++ ...rchiver-0.5.2-segfault-password-protected.patch | 43 +++ pcr/youtube-dl-current/PKGBUILD | 4 +- 40 files changed, 1232 insertions(+), 171 deletions(-) create mode 100644 community/mate-mplayer/PKGBUILD create mode 100644 community/mate-mplayer/mate-mplayer.install create mode 100644 extra/xfig/xfig-fix_dash_list_for_different_styles.patch delete mode 100644 libre/xarchiver-libre/rePKGBUILD create mode 100644 libre/xarchiver-libre/xarchiver-0.5.2-add_mime_types.patch create mode 100644 libre/xarchiver-libre/xarchiver-0.5.2-add_unar_support.patch create mode 100644 libre/xarchiver-libre/xarchiver-0.5.2-add_xz_support.patch create mode 100644 libre/xarchiver-libre/xarchiver-0.5.2-drag-n-drop_escaped_path.patch create mode 100644 libre/xarchiver-libre/xarchiver-0.5.2-fix-double-escaping.patch create mode 100644 libre/xarchiver-libre/xarchiver-0.5.2-fix-non-existent-archive.patch create mode 100644 libre/xarchiver-libre/xarchiver-0.5.2-no-donators-menu.patch create mode 100644 libre/xarchiver-libre/xarchiver-0.5.2-segfault-delete-file.patch create mode 100644 libre/xarchiver-libre/xarchiver-0.5.2-segfault-password-protected.patch (limited to 'community/i3-wm/PKGBUILD') diff --git a/community/darktable/PKGBUILD b/community/darktable/PKGBUILD index 7adf0c7a4..da2241725 100644 --- a/community/darktable/PKGBUILD +++ b/community/darktable/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 103896 2014-01-13 13:22:57Z spupykin $ +# $Id: PKGBUILD 104671 2014-01-24 14:19:50Z lcarlier $ # Maintainer: Sergej Pupykin # Maintainer: Christian Himpel # Contributor: Johannes Hanika @@ -6,7 +6,7 @@ pkgname=darktable pkgver=1.4 _pkgver=1.4 -pkgrel=2 +pkgrel=2.1 pkgdesc="Utility to organize and develop raw images" arch=('i686' 'x86_64') url=http://darktable.sf.net/ diff --git a/community/gimp-ufraw/PKGBUILD b/community/gimp-ufraw/PKGBUILD index 5adf7b8b2..00cf9081f 100644 --- a/community/gimp-ufraw/PKGBUILD +++ b/community/gimp-ufraw/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 90037 2013-05-06 19:37:26Z foutrelis $ +# $Id: PKGBUILD 104699 2014-01-24 16:28:05Z lcarlier $ # Maintainer: Alexander Rødseth # Contributor: Tobias Kieslich # Contributor: Martin Sugioarto pkgname=gimp-ufraw pkgver=0.19 -pkgrel=2 +pkgrel=2.1 pkgdesc='Converter for raw files; utility and GIMP plugin' url='http://ufraw.sourceforge.net/' arch=('x86_64' 'i686') diff --git a/community/i3-wm/PKGBUILD b/community/i3-wm/PKGBUILD index 382982548..17fb5a034 100644 --- a/community/i3-wm/PKGBUILD +++ b/community/i3-wm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 104492 2014-01-21 20:50:05Z ttoepper $ +# $Id: PKGBUILD 104713 2014-01-24 20:05:37Z ttoepper $ # Maintainer: Thorsten Töpper pkgname=i3-wm _pkgsourcename=i3 -pkgver=4.7.1 +pkgver=4.7.2 pkgrel=1 pkgdesc='An improved dynamic tiling window manager' arch=('i686' 'x86_64') @@ -20,7 +20,7 @@ optdepends=('dmenu: As menu.' options=('docs' '!strip') source=("http://i3wm.org/downloads/${_pkgsourcename}-${pkgver}.tar.bz2" "http://i3wm.org/downloads/${_pkgsourcename}-${pkgver}.tar.bz2.asc") -md5sums=('7e25d9198bbbe4d0c0e3d2c6eba6980b' +md5sums=('64141f7c23f97cd1e52c52918476c1c8' 'SKIP') build() { diff --git a/community/mate-mplayer/PKGBUILD b/community/mate-mplayer/PKGBUILD new file mode 100644 index 000000000..119b0ab70 --- /dev/null +++ b/community/mate-mplayer/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 104685 2014-01-24 16:26:27Z flexiondotorg $ +# Maintainer : Martin Wimpress + +pkgname=mate-mplayer +pkgver=1.0.8 +pkgrel=3 +pkgdesc="Mplayer GUI for MATE" +url="https://github.com/NiceandGently/mate-mplayer" +arch=('i686' 'x86_64') +license=('GPL') +depends=('curl' 'dbus-glib' 'gmtk' 'gtk2' 'libgpod' 'libnotify' 'libmusicbrainz3' + 'mate-file-manager') +optdepends=('mplayer: required to actually play any media') +makedepends=('mate-common' 'perl-xml-parser') +options=('!emptydirs') +source=("https://github.com/NiceandGently/${pkgname}/archive/v${pkgver}.tar.gz") +md5sums=('05a5571f9ffc8493a0814065b78faa11') +install=${pkgname}.install + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure \ + --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/community/mate-mplayer/mate-mplayer.install b/community/mate-mplayer/mate-mplayer.install new file mode 100644 index 000000000..bf6781f93 --- /dev/null +++ b/community/mate-mplayer/mate-mplayer.install @@ -0,0 +1,13 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas/ + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD index f9f3fdedf..679d939f7 100644 --- a/community/nodejs/PKGBUILD +++ b/community/nodejs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 102828 2013-12-21 15:00:24Z bpiotrowski $ +# $Id: PKGBUILD 104706 2014-01-24 17:24:23Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: James Campos @@ -8,7 +8,7 @@ # Contributor: TIanyi Cui pkgname=nodejs -pkgver=0.10.24 +pkgver=0.10.25 pkgrel=1 pkgdesc='Evented I/O for V8 javascript' arch=('i686' 'x86_64') @@ -19,7 +19,7 @@ makedepends=('python2') checkdepends=('curl') options=('!emptydirs') source=(http://nodejs.org/dist/v$pkgver/node-v$pkgver.tar.gz) -sha256sums=('610cd733186842cb7f554336d6851a61b2d3d956050d62e49fa359a47640377a') +sha256sums=('46eef3b9d5475a2081dc2b2f7cf1f4c3a56824d1fc9b04e7ed1d7a88e8f6b36f') prepare() { cd node-v$pkgver diff --git a/community/phantomjs/PKGBUILD b/community/phantomjs/PKGBUILD index 9bbf6f5cc..a9e2d5690 100644 --- a/community/phantomjs/PKGBUILD +++ b/community/phantomjs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 97046 2013-09-11 13:42:10Z fyan $ +# $Id: PKGBUILD 104700 2014-01-24 16:28:53Z fyan $ # Maintainer: Felix Yan # Contributor: grimsock # Contributor: Dieter Plaetinck @@ -6,23 +6,18 @@ # Contributor: Henry Tang pkgname=phantomjs -pkgver=1.9.2 +pkgver=1.9.6 pkgrel=1 pkgdesc="Headless WebKit with JavaScript API" url="http://www.phantomjs.org/" license=('BSD' 'LGPL' 'MIT') arch=('i686' 'x86_64') -depends=('gstreamer0.10-base' 'fontconfig' 'freetype2') -makedepends=('unzip') -source=("http://phantomjs.googlecode.com/files/${pkgname}-${pkgver}-source.zip") -noextract=("${pkgname}-${pkgver}-source.zip") +depends=('gstreamer0.10-base' 'fontconfig' 'freetype2' 'gcc-libs') +makedepends=('git') +source=("git+https://github.com/ariya/${pkgname}.git#tag=$pkgver") build() { - # workaround for https://code.google.com/p/libarchive/issues/detail?id=271 - # cd $srcdir/$pkgname-$pkgver - unzip ${pkgname}-${pkgver}-source.zip - - cd $pkgname-$pkgver + cd $pkgname # workaround for http://code.google.com/p/phantomjs/issues/detail?id=635 sed -i 's/QMAKE_LFLAGS+=-fuse-ld=gold/#QMAKE_LFLAGS+=-fuse-ld=gold/' src/qt/src/3rdparty/webkit/Source/common.pri @@ -30,13 +25,13 @@ build() { } package() { - install -Dm755 "$srcdir/$pkgname-$pkgver/bin/phantomjs" "$pkgdir/usr/bin/phantomjs" + install -Dm755 "$srcdir/$pkgname/bin/phantomjs" "$pkgdir/usr/bin/phantomjs" mkdir -p "$pkgdir/usr/share/$pkgname" - cp -r "$srcdir/$pkgname-$pkgver/examples" "$pkgdir/usr/share/$pkgname"/ + cp -r "$srcdir/$pkgname/examples" "$pkgdir/usr/share/$pkgname"/ - install -Dm644 "$srcdir/$pkgname-$pkgver/LICENSE.BSD" "$pkgdir/usr/share/licenses/$pkgname/LICENSE.BSD" - install -Dm644 "$srcdir/$pkgname-$pkgver/third-party.txt" "$pkgdir/usr/share/licenses/$pkgname/third-party.txt" + install -Dm644 "$srcdir/$pkgname/LICENSE.BSD" "$pkgdir/usr/share/licenses/$pkgname/LICENSE.BSD" + install -Dm644 "$srcdir/$pkgname/third-party.txt" "$pkgdir/usr/share/licenses/$pkgname/third-party.txt" } -sha512sums=('ada4010a1ba43950f25bcf42bc41f158c8dc91320edff18efece68c69cd16d1246512fbd66e2dcbe9d0ecd71d8587252570072e2499ec9dfce0ac871c0ce2720') +sha512sums=('SKIP') diff --git a/community/rekonq/PKGBUILD b/community/rekonq/PKGBUILD index f874e898a..03f7a2cdb 100644 --- a/community/rekonq/PKGBUILD +++ b/community/rekonq/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 101077 2013-11-16 03:53:07Z andrea $ +# $Id: PKGBUILD 104681 2014-01-24 15:11:26Z andrea $ # Maintainer: Peter Lewis # Maintainer: Andrea Scarpino # Contributor: Panagiotis Papadopoulos pkgname=rekonq -pkgver=2.4.0 +pkgver=2.4.2 pkgrel=1 pkgdesc='A WebKit based web browser for KDE' arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ optdepends=('kdebase-konqueror: search engines support' 'qca-ossl: to use the sync handler') install=${pkgname}.install source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz") -sha256sums=('660f40fe612b6706623977d8cdb94b49aaacdb53aac2689d95f02d782ce2715b') +sha256sums=('e9805b32f592ca5809bd1632c624c57fc0109ce98b73a8b8e3ebd04e9c875126') prepare() { mkdir build diff --git a/community/sysstat/PKGBUILD b/community/sysstat/PKGBUILD index 78f8b9338..ecea41d09 100644 --- a/community/sysstat/PKGBUILD +++ b/community/sysstat/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 100454 2013-11-04 12:13:37Z spupykin $ +# $Id: PKGBUILD 104646 2014-01-24 07:28:17Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Martin Devera pkgname=sysstat -pkgver=10.2.0 +pkgver=10.2.1 pkgrel=1 pkgdesc="a collection of performance monitoring tools (iostat,isag,mpstat,pidstat,sadf,sar)" arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ backup=('etc/conf.d/sysstat' source=(http://pagesperso-orange.fr/sebastien.godard/$pkgname-$pkgver.tar.gz sysstat.service lib64-fix.patch) -md5sums=('7a6e3df08590385113a27a76ce64a6ff' +md5sums=('039dcd235dfcfb3d4acc0a05730f9512' '12ba479c606620193e8b7c6e982d5088' '7ffa6bf990609d85367070f71b40a34b') diff --git a/community/task/PKGBUILD b/community/task/PKGBUILD index 7d6f6b3c7..1e349b355 100644 --- a/community/task/PKGBUILD +++ b/community/task/PKGBUILD @@ -5,7 +5,7 @@ # Contributor: coolkehon pkgname=task -pkgver=2.2.0 +pkgver=2.3.0 pkgrel=1 pkgdesc="A command-line todo list manager" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ depends=('util-linux') makedepends=('cmake') optdepends=('bash-completion: for bash completion' 'python: for python export addon' 'ruby: for ruby export addon' 'perl: for perl export addon' 'perl-json: for perl export addon') source=(http://www.taskwarrior.org/download/$pkgname-$pkgver.tar.gz) -sha256sums=('39e25dd285e6bc8474337a5868cb2ec55675978fa1f08c802e6da58b4181ee14') +sha256sums=('2b9a289109e691e305b84631622299853134cf195d4c9af962759b640176ac73') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/xboard/PKGBUILD b/community/xboard/PKGBUILD index c84973936..9f6c46776 100644 --- a/community/xboard/PKGBUILD +++ b/community/xboard/PKGBUILD @@ -1,22 +1,21 @@ -# $Id: PKGBUILD 97844 2013-09-30 10:04:25Z spupykin $ +# $Id: PKGBUILD 104711 2014-01-24 18:40:56Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Jason Chu # Contributor: Tom Newsom pkgname=xboard -pkgver=4.7.2 -pkgrel=3 +pkgver=4.7.3 +pkgrel=1 pkgdesc="Graphical user interfaces for chess" arch=('i686' 'x86_64') url="http://www.gnu.org/software/xboard/" license=('GPL3') -depends=('gnuchess' 'texinfo' 'xdg-utils' - 'xorg-fonts-75dpi' 'xorg-fonts-100dpi' - 'gtk2' 'cairo' 'librsvg') -optdepends=('perl') +depends=('texinfo' 'xdg-utils' 'gtk2' 'cairo' 'librsvg') +optdepends=('gnuchess: chess engine' + 'perl') install=${pkgname}.install source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('83ec086cbf5c4bc362a188654a9332fc') +md5sums=('5ad06ca818c29f499ba227ea3d19df14') build() { cd "${pkgname}-${pkgver}" diff --git a/community/xl2tpd/PKGBUILD b/community/xl2tpd/PKGBUILD index fa63b182d..71b6364b3 100644 --- a/community/xl2tpd/PKGBUILD +++ b/community/xl2tpd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 103870 2014-01-12 22:03:07Z spupykin $ +# $Id: PKGBUILD 104644 2014-01-24 07:01:07Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Hengfu pkgname=xl2tpd -pkgver=1.3.4rc1 +pkgver=1.3.6 pkgrel=1 pkgdesc="an open source implementation of the L2TP maintained by Xelerance Corporation" arch=('i686' 'x86_64') @@ -19,7 +19,7 @@ source=($pkgname-$pkgver.tar.gz::https://github.com/xelerance/xl2tpd/archive/v$p xl2tpd.service xl2tpd.tmpfiles ipparam.patch) -md5sums=('5d26c43791a8347a252c9307794d6179' +md5sums=('2f526cc0c36cf6d8a74f1fb2e08c18ec' '5f0ae07026e61a3dd15a76fd4144a6d5' '16ed0886115d4dcc21072cfb847250bb' 'ed57eb67335cdf246251285dad502cc7' diff --git a/core/dbus/PKGBUILD b/core/dbus/PKGBUILD index 6b6282c1d..7afab2a65 100644 --- a/core/dbus/PKGBUILD +++ b/core/dbus/PKGBUILD @@ -1,28 +1,24 @@ -# $Id: PKGBUILD 203073 2014-01-03 11:02:50Z tomegun $ +# $Id: PKGBUILD 204675 2014-01-24 19:00:33Z dreisner $ # Maintainer: Tom Gundersen # Maintainer: Jan de Groot # Contributor: Link Dupont # pkgbase=dbus pkgname=('dbus' 'libdbus') -pkgver=1.6.18 -pkgrel=3 +pkgver=1.8.0 +pkgrel=1 pkgdesc="Freedesktop.org message bus system" url="http://www.freedesktop.org/Software/dbus" arch=(i686 x86_64) license=('GPL' 'custom') -makedepends=('libx11' 'systemd') +makedepends=('libx11' 'systemd' 'xmlto' 'docbook-xsl') source=(http://dbus.freedesktop.org/releases/dbus/dbus-$pkgver.tar.gz - 30-dbus systemd-user-session.patch memleak.patch) -md5sums=('b02e9c95027a416987b81f9893831061' - '3314d727fa57fc443fce25b5cbeebbcc' - 'd8a1bd529b3ddca671ee1a695a143db9' - 'cf86d68e39d975cec1e9f0342eb9b142') + 30-dbus) +md5sums=('059fbe84e39fc99c67a14f15b1f39dff' + '3314d727fa57fc443fce25b5cbeebbcc') prepare() { cd dbus-$pkgver - patch -Np1 -i ../systemd-user-session.patch - patch -Np1 -i ../memleak.patch } build() { diff --git a/extra/calligra/PKGBUILD b/extra/calligra/PKGBUILD index 176d85456..8ff992555 100644 --- a/extra/calligra/PKGBUILD +++ b/extra/calligra/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 203352 2014-01-08 14:45:06Z lcarlier $ +# $Id: PKGBUILD 204609 2014-01-24 07:32:37Z andyrtr $ # Maintainer: Andrea Scarpino # Contributor: Ronald van Haren @@ -18,20 +18,24 @@ pkgname=('calligra-braindump' 'calligra-stage' 'calligra-words') pkgver=2.7.5 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') url='http://www.calligra-suite.org/' license=('FDL1.2' 'GPL2' 'LGPL') makedepends=('cmake' 'automoc4' 'boost' 'kdepimlibs' 'eigen2' 'kdeedu-marble' 'lcms2' 'libmariadbclient' 'freetds' 'xbase' 'libwpg' 'opencolorio' 'libwps' 'gsl' 'glew' 'fftw' 'poppler-qt' 'libkdcraw' - 'openjpeg' 'kdegraphics-okular' 'pstoedit' 'vc') + 'openjpeg' 'kdegraphics-okular' 'pstoedit' 'vc' 'libvisio') + # libpqxx is in community, move it to extra? groups=('calligra') source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.xz") md5sums=('05d1d0bac970d6dc68ffabc12fca2eb7') prepare() { mkdir build + # fix openjpeg detection + sed -i "s:/usr/include/openjpeg:/usr/include/openjpeg-1.5:" \ + ${srcdir}/${pkgbase}-${pkgver}/cmake/modules/FindOpenJPEG.cmake } build() { @@ -46,7 +50,8 @@ build() { package_calligra-filters() { pkgdesc="Filters for the Calligra office suite" optdepends=('libwpg: Corel WordPerfect Graphics image importer' - 'libwps: Microsoft Works file word processor format import') + 'libwps: Microsoft Works file word processor format import' + 'libvisio: Microsoft Visio import filter') conflicts=('koffice-filters') replaces=('koffice-filters') install=calligra-filters.install diff --git a/extra/enlightenment/PKGBUILD b/extra/enlightenment/PKGBUILD index 06481e29f..6af489c9c 100644 --- a/extra/enlightenment/PKGBUILD +++ b/extra/enlightenment/PKGBUILD @@ -5,7 +5,7 @@ pkgname=enlightenment pkgver=0.18.2 pkgrel=1 pkgdesc="Enlightenment window manager" -arch=('i686' 'x86_64' 'arm') +arch=('i686' 'x86_64') url="http://www.enlightenment.org" license=('BSD') depends=('elementary' 'xcb-util-keysyms' 'hicolor-icon-theme' 'pixman' 'mesa' diff --git a/extra/gtk-vnc/PKGBUILD b/extra/gtk-vnc/PKGBUILD index 913c57508..479693369 100644 --- a/extra/gtk-vnc/PKGBUILD +++ b/extra/gtk-vnc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 203577 2014-01-13 17:12:08Z andyrtr $ +# $Id: PKGBUILD 204613 2014-01-24 10:08:11Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) # Contributor: Jan de Groot # Contributor: Allan McRae @@ -6,12 +6,12 @@ pkgname=gtk-vnc pkgver=0.5.3 -pkgrel=2 +pkgrel=3 pkgdesc="A VNC viewer widget for GTK" arch=('i686' 'x86_64') url="https://wiki.gnome.org/Projects/gtk-vnc" license=('LGPL') -depends=('libgcrypt' 'gtk3') +depends=('libgcrypt' 'gtk3' 'gnutls') optdepends=('gtk2: GTK2 widget') makedepends=('intltool' 'pygtk' 'pygobject2-devel' 'gtk-doc' 'gtk2' 'vala' 'gobject-introspection') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) diff --git a/extra/lftp/PKGBUILD b/extra/lftp/PKGBUILD index e8688de88..98bf838ea 100644 --- a/extra/lftp/PKGBUILD +++ b/extra/lftp/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 201537 2013-12-14 08:34:10Z andyrtr $ +# $Id: PKGBUILD 204639 2014-01-24 13:26:47Z andyrtr $ # Maintainer: Andreas Radke # Contributor: Aaron Griffin pkgname=lftp -pkgver=4.4.14 +pkgver=4.4.15 pkgrel=1 pkgdesc="Sophisticated command line based FTP client" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ optdepends=('perl: needed for convert-netscape-cookies and verify-file') url="http://lftp.yar.ru/" backup=('etc/lftp.conf') source=(http://lftp.yar.ru/ftp/${pkgname}-${pkgver}.tar.xz{,.asc}) -md5sums=('809544255f668a6d3af867f643cc321f' +md5sums=('f19cc0cea1d427aa2a952b27661b91e5' 'SKIP') build() { diff --git a/extra/libvorbis/PKGBUILD b/extra/libvorbis/PKGBUILD index 5e57d8167..027e60707 100644 --- a/extra/libvorbis/PKGBUILD +++ b/extra/libvorbis/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 198262 2013-10-30 13:48:00Z allan $ +# $Id: PKGBUILD 204644 2014-01-24 14:22:14Z tomegun $ # Maintainer: Tobias Kieslich # Contributor: dorphell # Contributor: John Proctor pkgname=libvorbis -pkgver=1.3.3 +pkgver=1.3.4 pkgrel=1 pkgdesc="Vorbis codec library" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ url="http://www.xiph.org/vorbis/" license=('BSD') depends=('libogg') source=(http://downloads.xiph.org/releases/vorbis/${pkgname}-${pkgver}.tar.gz) -md5sums=('6b1a36f0d72332fae5130688e65efe1f') +md5sums=('8851c593a52d1ef9c526d95174873852') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/oxygen-gtk2/PKGBUILD b/extra/oxygen-gtk2/PKGBUILD index e510f4e51..47b958936 100644 --- a/extra/oxygen-gtk2/PKGBUILD +++ b/extra/oxygen-gtk2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 201423 2013-12-11 13:48:51Z andrea $ +# $Id: PKGBUILD 204679 2014-01-24 21:31:40Z andrea $ # Maintainer: Andrea Scarpino # Contributor: birdflesh pkgname=oxygen-gtk2 -pkgver=1.4.1 +pkgver=1.4.3 pkgrel=1 pkgdesc="Port of the default KDE widget theme (Oxygen) to GTK2" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ conflicts=('oxygen-gtk') replaces=('oxygen-gtk') makedepends=('cmake') source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('27bb5826d936fe2bddab35057739908f') +md5sums=('822cedb3ae46907fd262487150a195d4') prepare() { mkdir build diff --git a/extra/oxygen-gtk3/PKGBUILD b/extra/oxygen-gtk3/PKGBUILD index 845dc2fa5..4f8d2bd60 100644 --- a/extra/oxygen-gtk3/PKGBUILD +++ b/extra/oxygen-gtk3/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 201533 2013-12-14 07:15:21Z andrea $ +# $Id: PKGBUILD 204681 2014-01-24 21:32:34Z andrea $ # Maintainer: Andrea Scarpino pkgname=oxygen-gtk3 -pkgver=1.3.1 +pkgver=1.3.3 pkgrel=1 pkgdesc="Port of the default KDE widget theme (Oxygen) to GTK3" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('LGPL') depends=('gtk3') makedepends=('cmake') source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('a8ca81ea29a93c5859f179266f07c66e') +md5sums=('c849ca9ef925b2d967538b1b83b6e72a') prepare() { mkdir build diff --git a/extra/quazip/PKGBUILD b/extra/quazip/PKGBUILD index 78e0282a2..245a07b95 100644 --- a/extra/quazip/PKGBUILD +++ b/extra/quazip/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 199053 2013-11-07 23:52:10Z andrea $ +# $Id: PKGBUILD 204637 2014-01-24 13:14:32Z andrea $ # Maintainer: Andrea Scarpino # Contributor: trya pkgname=quazip -pkgver=0.5.1 -pkgrel=3 +pkgver=0.6 +pkgrel=1 pkgdesc="C++ wrapper for the Gilles Vollant's ZIP/UNZIP C package" url="http://sourceforge.net/projects/quazip/" license=('LGPL') arch=('i686' 'x86_64') depends=('qt4') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('eec6b9b6f19654230dfcd158f29ea9d0') +md5sums=('5ad6f58e9bd6eddf11d8bf37ac995e9e') build() { cd ${pkgname}-${pkgver}/${pkgname} diff --git a/extra/redland/PKGBUILD b/extra/redland/PKGBUILD index 849613af2..facd62271 100644 --- a/extra/redland/PKGBUILD +++ b/extra/redland/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 198397 2013-10-30 14:37:22Z allan $ +# $Id: PKGBUILD 204645 2014-01-24 14:22:15Z tomegun $ # Maintainer: Tom Gundersen # Contributor: AndyRTR # Contributor: Francois Charette @@ -6,16 +6,16 @@ pkgbase=redland epoch=1 pkgname=('redland' 'redland-storage-mysql' 'redland-storage-postgresql' 'redland-storage-virtuoso' 'redland-storage-sqlite') -pkgver=1.0.16 -pkgrel=2 +pkgver=1.0.17 +pkgrel=1 url="http://librdf.org/" license=("GPL") arch=('i686' 'x86_64') makedepends=('rasqal' 'raptor' 'db' 'postgresql-libs' 'libmariadbclient' 'unixodbc' 'sqlite') source=(http://download.librdf.org/source/$pkgname-$pkgver.tar.gz{,.asc} rpath.diff) -sha256sums=('d9a274fc086e61119d5c9beafb8d05527e040ec86f4c0961276ca8de0a049dbd' - '2955af40eb2fbffa6e1ef28f7f1b7f607a3958478a5080896b878da96605246d' +sha256sums=('de1847f7b59021c16bdc72abb4d8e2d9187cd6124d69156f3326dd34ee043681' + 'SKIP' '9ddf9f7581f5194d73ad908f3b26354c70d3079a7a87c8add8a0d0e4c6974fec') build() { diff --git a/extra/wayland/PKGBUILD b/extra/wayland/PKGBUILD index 4729cd6b2..5defd4e30 100644 --- a/extra/wayland/PKGBUILD +++ b/extra/wayland/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 198481 2013-10-30 15:07:38Z allan $ +# $Id: PKGBUILD 204641 2014-01-24 14:01:34Z tomegun $ # Maintainer: Tom Gundersen # Contributor: Sébastien Luttringer # Contributor: Joel Teichroeb pkgname=wayland -pkgver=1.3.0 +pkgver=1.4.0 pkgrel=1 pkgdesc='A computer display server protocol' arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ license=('MIT') depends=('libffi' 'expat') makedepends=('doxygen') source=("http://wayland.freedesktop.org/releases/$pkgname-$pkgver.tar.xz") -sha1sums=('febbbfc8d76ed0b2157077d50cb6e5ceb1aa47de') +sha1sums=('bc91befb8386ec5c1ff4f24ad8464c24a7496ae2') build() { cd $pkgname-$pkgver diff --git a/extra/xfig/PKGBUILD b/extra/xfig/PKGBUILD index 832a84914..0bb6f5d7d 100644 --- a/extra/xfig/PKGBUILD +++ b/extra/xfig/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 194017 2013-09-10 00:31:09Z eric $ +# $Id: PKGBUILD 204604 2014-01-24 03:48:01Z eric $ # Maintainer: Eric Bélanger pkgname=xfig pkgver=3.2.5c -pkgrel=1 +pkgrel=2 pkgdesc="An interactive drawing tool" arch=('i686' 'x86_64') url="http://www.xfig.org/userman/" @@ -13,21 +13,24 @@ makedepends=('imake') optdepends=('transfig: to use the frontend to convert fig files') options=('!makeflags' '!emptydirs') install=xfig.install -source=(http://downloads.sourceforge.net/mcj/${pkgname}.${pkgver}.full.tar.gz \ - xfig-3.2.4-redhat.patch xfig-3.2.5-color-resources.patch \ - xfig-3.2.5-urwfonts.patch \ +source=(http://downloads.sourceforge.net/mcj/${pkgname}.${pkgver}.full.tar.gz + xfig-3.2.4-redhat.patch xfig-3.2.5-color-resources.patch + xfig-3.2.5-urwfonts.patch xfig-fix_dash_list_for_different_styles.patch LICENSE) sha1sums=('47d31dd9ad46819732ab74db340e11489db2c646' '926ad99c7221baa4aa9e9737722958860b2700fc' '45e7fb80193825b088d798089aeade2e1729c9ac' 'e595ccdbe293ea0fdecbf59a2192ae57ced2c8eb' + '6aa98ab4497c30d18b4d0599f9d943bf78991246' '31edf4cfab708820ea3f114d095dfef5aa88e5aa') prepare() { cd ${pkgname}.${pkgver} - patch -p1 < ../xfig-3.2.4-redhat.patch - patch -p1 < ../xfig-3.2.5-color-resources.patch - patch -p1 < ../xfig-3.2.5-urwfonts.patch + patch -p1 -i "${srcdir}/xfig-3.2.4-redhat.patch" + patch -p1 -i "${srcdir}/xfig-3.2.5-color-resources.patch" + patch -p1 -i "${srcdir}/xfig-3.2.5-urwfonts.patch" + patch -p1 -i "${srcdir}/xfig-fix_dash_list_for_different_styles.patch" + sed -i -e 's|X11R6/||' -e 's|image/x-xfig|image/fig;image/x-xfig|' xfig.desktop echo -e "Categories=Application;Graphics;\nIcon=xfig" >> xfig.desktop sed -i 's/#define XAW3D/XCOMM #define XAW3D/' Imakefile diff --git a/extra/xfig/xfig-fix_dash_list_for_different_styles.patch b/extra/xfig/xfig-fix_dash_list_for_different_styles.patch new file mode 100644 index 000000000..7c5aaa94f --- /dev/null +++ b/extra/xfig/xfig-fix_dash_list_for_different_styles.patch @@ -0,0 +1,34 @@ +--- xfig.3.2.5c/w_drawprim.c 2012-10-17 00:14:09.000000000 +0200 ++++ xfig.3.2.5c/w_drawprim.c 2013-11-29 02:45:36.950448714 +0100 +@@ -1292,14 +1292,23 @@ void set_fill_gc(int fill_style, int op, + } + + +-static unsigned char dash_list[16][2] = {{255, 255}, {255, 255}, +- {255, 255}, {255, 255}, +- {255, 255}, {255, 255}, +- {255, 255}, {255, 255}, +- {255, 255}, {255, 255}, +- {255, 255}, {255, 255}, +- {255, 255}, {255, 255}, +- {255, 255}, {255, 255}}; ++static unsigned char dash_list[16][8] = { ++ {255, 255, 255, 255, 255, 255, 255, 255}, ++ {255, 255, 255, 255, 255, 255, 255, 255}, ++ {255, 255, 255, 255, 255, 255, 255, 255}, ++ {255, 255, 255, 255, 255, 255, 255, 255}, ++ {255, 255, 255, 255, 255, 255, 255, 255}, ++ {255, 255, 255, 255, 255, 255, 255, 255}, ++ {255, 255, 255, 255, 255, 255, 255, 255}, ++ {255, 255, 255, 255, 255, 255, 255, 255}, ++ {255, 255, 255, 255, 255, 255, 255, 255}, ++ {255, 255, 255, 255, 255, 255, 255, 255}, ++ {255, 255, 255, 255, 255, 255, 255, 255}, ++ {255, 255, 255, 255, 255, 255, 255, 255}, ++ {255, 255, 255, 255, 255, 255, 255, 255}, ++ {255, 255, 255, 255, 255, 255, 255, 255}, ++ {255, 255, 255, 255, 255, 255, 255, 255}, ++ {255, 255, 255, 255, 255, 255, 255, 255}}; + + static int join_styles[3] = { JoinMiter, JoinRound, JoinBevel }; + static int cap_styles[3] = { CapButt, CapRound, CapProjecting }; diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD index 03dd3e20d..6c4cf6beb 100644 --- a/libre/calibre-libre/PKGBUILD +++ b/libre/calibre-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 104517 2014-01-22 08:38:23Z jelle $ +# $Id: PKGBUILD 104707 2014-01-24 17:26:20Z jelle $ # Maintainer: jelle van der Waa # Maintainer: Daniel Wallace # Contributor: Giovanni Scafora @@ -9,8 +9,8 @@ _pkgname=calibre pkgname=calibre-libre -pkgver=1.20.0 -pkgrel=3 +pkgver=1.21.0 +pkgrel=1 pkgdesc="Ebook management application, with unar support" arch=('i686' 'x86_64' 'mips64el') url="http://calibre-ebook.com/" @@ -30,7 +30,7 @@ install=calibre.install source=("http://download.calibre-ebook.com/${pkgver}/calibre-${pkgver}.tar.xz" 'desktop_integration.patch' 'calibre-mount-helper') -md5sums=('463cdfaa008a2aa16343876b77ae4e17' +md5sums=('f8588ca195354692d172d9fa3fd67dea' '95ca4eb3afa7c737c8371708a23bdad9' '675cd87d41342119827ef706055491e7') diff --git a/libre/icecat-noscript/PKGBUILD b/libre/icecat-noscript/PKGBUILD index 3bff180e8..16579acdd 100644 --- a/libre/icecat-noscript/PKGBUILD +++ b/libre/icecat-noscript/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 104068 2014-01-15 09:48:41Z spupykin $ +# $Id: PKGBUILD 104641 2014-01-24 07:00:27Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer (Parabola): André Silva _pkgname=firefox-noscript pkgname=icecat-noscript -pkgver=2.6.8.12 +pkgver=2.6.8.13 pkgrel=1 pkgdesc="plugin 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=('da4f024487e5ef057eb6377f8bd285b5') +md5sums=('75ec11cc5f3f039e81113abfb908110e') package() { # _ffver=`pacman -Q icecat | cut -f2 -d\ | cut -f1 -d-` diff --git a/libre/iceweasel-noscript/PKGBUILD b/libre/iceweasel-noscript/PKGBUILD index 09bfbe6e8..5cde02a92 100644 --- a/libre/iceweasel-noscript/PKGBUILD +++ b/libre/iceweasel-noscript/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 104068 2014-01-15 09:48:41Z spupykin $ +# $Id: PKGBUILD 104641 2014-01-24 07:00:27Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer (Parabola): André Silva _pkgname=firefox-noscript pkgname=iceweasel-noscript -pkgver=2.6.8.12 +pkgver=2.6.8.13 pkgrel=1 pkgdesc="plugin 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=('da4f024487e5ef057eb6377f8bd285b5') +md5sums=('75ec11cc5f3f039e81113abfb908110e') package() { # _ffver=`pacman -Q iceweasel-libre | cut -f2 -d\ | cut -f1 -d-` diff --git a/libre/xarchiver-libre/PKGBUILD b/libre/xarchiver-libre/PKGBUILD index 9c0c0729c..e606e65f4 100644 --- a/libre/xarchiver-libre/PKGBUILD +++ b/libre/xarchiver-libre/PKGBUILD @@ -1,64 +1,105 @@ -# $Id: PKGBUILD 154769 2012-03-30 16:45:24Z pierre $ -# Maintainer: Alexander Fehr +# $Id: PKGBUILD 104651 2014-01-24 08:23:36Z bgyorgy $ +# Maintainer: Balló György +# Contributor: Alexander Fehr # Contributor: Andrew Simmons +# Maintainer (Parabola): André Silva _pkgname=xarchiver pkgname=xarchiver-libre pkgver=0.5.2 -pkgrel=5.1 -pkgdesc="GTK+ frontend to various command line archivers" -arch=('i686' 'x86_64') -url="http://xarchiver.sourceforge.net" +pkgrel=6 +pkgdesc="GTK+ frontend to various command line archivers, with unar support" +arch=('i686' 'x86_64' 'mips64el') +url="http://xarchiver.sourceforge.net/" license=('GPL') -groups=('xfce4-goodies') -depends=('gtk2' 'desktop-file-utils' 'hicolor-icon-theme') -makedepends=('intltool') provides=("$_pkgname=$pkgver") conflicts=("$_pkgname") -replacesk=("$_pkgname") -optdepends=('tar: TAR support' - 'gzip: GZIP support' - 'bzip2: BZIP2 support' - 'zip: ZIP support' +replaces=("$_pkgname") +depends=('gtk2' 'desktop-file-utils') +makedepends=('intltool') +optdepends=('zip: ZIP support' 'unzip: ZIP support' 'unar: RAR support' 'p7zip: 7z support' 'arj: ARJ support' - 'lha: LHA support' - 'xz: LZMA support' - 'lzop: LZOP support') -options=('!libtool') + 'lzop: LZOP support' + 'cpio: RPM support') install=xarchiver.install source=(http://downloads.sourceforge.net/xarchiver/xarchiver-$pkgver.tar.bz2 - # rpm2cpio.patch by Daniel Hokka Zakrisson - # taken from https://bugzilla.redhat.com/show_bug.cgi?id=577480 - # sent upstream through - # https://sourceforge.net/tracker/?func=detail&aid=3310768&group_id=140153&atid=745602 - xarchiver-0.5.2-rpm2cpio.patch - # segfault-open-with.patch by Bastiaan Jacques - # taken from https://bugzilla.redhat.com/show_bug.cgi?id=690012 - # sent upstream through - # https://sourceforge.net/tracker/?func=detail&aid=3310778&group_id=140153&atid=745600 + xarchiver-0.5.2-no-donators-menu.patch + xarchiver-0.5.2-add_xz_support.patch xarchiver-0.5.2-segfault-open-with.patch - # fix-7z-support.patch by taken from - # https://sourceforge.net/tracker/?func=detail&aid=3137589&group_id=140153&atid=745602 - xarchiver-0.5.2-fix_7z_support.patch) + xarchiver-0.5.2-fix_7z_support.patch + xarchiver-0.5.2-drag-n-drop_escaped_path.patch + xarchiver-0.5.2-fix-double-escaping.patch + xarchiver-0.5.2-fix-non-existent-archive.patch + xarchiver-0.5.2-segfault-delete-file.patch + xarchiver-0.5.2-segfault-password-protected.patch + xarchiver-0.5.2-add_unar_support.patch + xarchiver-0.5.2-add_mime_types.patch) md5sums=('2bc7f06403cc6582dd4a8029ec9d038d' - 'd4a1accdbba2b50e5707097dd3548d7a' + '7ef9fe9aee9f0fbc141ed9683e91ea1c' + '5d5ef8dd1b8b7790af4ece5fcedcd370' 'f9036a44157b318cbc59ed012b04974b' - '782f55c1f1021dc02c7739bf8a47336e') + '782f55c1f1021dc02c7739bf8a47336e' + 'fcd9e04222c5e0ef459977bd7cd0ae4e' + '6178d7ab679b761469c880a8db991907' + '22ed2783e72684a102243c5834bf5ca3' + 'e518b1e0bc4407383aae2783c0c19a04' + 'c46daf2ee9fce7ece608eca33174db6b' + '1bfed3e1a9f8f4858ec90f0d66cfc5ba' + '36a4c3181230aab1e0ce1596acc5ef88') -build() { - cd "$srcdir/xarchiver-$pkgver" - #patches taken from: http://pkgs.fedoraproject.org/gitweb/?p=xarchiver.git - patch -Np1 -i ../xarchiver-0.5.2-rpm2cpio.patch +prepare() { + cd $_pkgname-$pkgver + + # Fix donators menu item (upstream patch) + patch -Np2 -i ../xarchiver-0.5.2-no-donators-menu.patch + + # Add XZ support + # http://sourceforge.net/p/xarchiver/bugs/28/ + patch -Np1 -i ../xarchiver-0.5.2-add_xz_support.patch + + # Fix segfault on open with dialog + # http://sourceforge.net/p/xarchiver/bugs/52/ patch -Np1 -i ../xarchiver-0.5.2-segfault-open-with.patch + + # Fix 7z support + # http://sourceforge.net/p/xarchiver/patches/5/ patch -Np1 -i ../xarchiver-0.5.2-fix_7z_support.patch + + # Fix extraction when the Drag'n'Drop target path contains spaces + patch -Np1 -i ../xarchiver-0.5.2-drag-n-drop_escaped_path.patch + + # Fix error when trying to create archives with spaces + patch -Np1 -i ../xarchiver-0.5.2-fix-double-escaping.patch + + # Fix segfault when non-existent archive specified + patch -Np1 -i ../xarchiver-0.5.2-fix-non-existent-archive.patch + + # Fix segfault when deleting a file + patch -Np1 -i ../xarchiver-0.5.2-segfault-delete-file.patch + + # Fix segfault when handling password protected files + patch -Np1 -i ../xarchiver-0.5.2-segfault-password-protected.patch + + # Add unar support + patch -Np1 -i ../xarchiver-0.5.2-add_unar_support.patch + + # Add more MIME types in the desktop file + patch -Np1 -i ../xarchiver-0.5.2-add_mime_types.patch + + # Update upstream URL + find -type f | xargs sed -i 's|http://xarchiver.xfce.org|http://xarchiver.sf.net|' +} + +build() { + cd $_pkgname-$pkgver ./configure --prefix=/usr --libexecdir=/usr/lib/xfce4 make } package() { - cd "$srcdir/xarchiver-$pkgver" + cd $_pkgname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/libre/xarchiver-libre/rePKGBUILD b/libre/xarchiver-libre/rePKGBUILD deleted file mode 100644 index 7f435d23f..000000000 --- a/libre/xarchiver-libre/rePKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# Maintainer: Nicolás Reynolds -source PKGBUILD -#CARCH=x86_64 -unset build package md5sums source -_repo=extra # Put the repo here -_mirror=ftp://ftp.archlinux.org # Put mirror here -source=(PKGBUILD - "${_mirror}/${_repo}/os/${CARCH}/${pkgname%-libre}-$pkgver-$pkgrel-$CARCH$PKGEXT" - # files for pkg modifications below this line - ) -options=(!strip) - -build() { - cd "${srcdir}/" - rm -vf ./.{INSTALL,PKGINFO} - # put actions for package modifications below this line - -} - -package() { - find ${srcdir} -maxdepth 1 -type l -delete - cp -a ${srcdir}/* ${pkgdir} -} - - -# vim:set ts=2 sw=2 et: diff --git a/libre/xarchiver-libre/xarchiver-0.5.2-add_mime_types.patch b/libre/xarchiver-libre/xarchiver-0.5.2-add_mime_types.patch new file mode 100644 index 000000000..3b510fcb8 --- /dev/null +++ b/libre/xarchiver-libre/xarchiver-0.5.2-add_mime_types.patch @@ -0,0 +1,9 @@ +diff -Naur xarchiver-0.5.2.orig/xarchiver.desktop.in xarchiver-0.5.2/xarchiver.desktop.in +--- xarchiver-0.5.2.orig/xarchiver.desktop.in 2014-01-24 04:05:33.438561000 +0100 ++++ xarchiver-0.5.2/xarchiver.desktop.in 2014-01-24 04:44:00.625750394 +0100 +@@ -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;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-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-debian-package;application/x-rpm; diff --git a/libre/xarchiver-libre/xarchiver-0.5.2-add_unar_support.patch b/libre/xarchiver-libre/xarchiver-0.5.2-add_unar_support.patch new file mode 100644 index 000000000..0168f4e63 --- /dev/null +++ b/libre/xarchiver-libre/xarchiver-0.5.2-add_unar_support.patch @@ -0,0 +1,380 @@ +diff -Nur xarchiver-0.5.2.orig/doc/html/ch03s03.html xarchiver-0.5.2/doc/html/ch03s03.html +--- xarchiver-0.5.2.orig/doc/html/ch03s03.html 2008-11-03 04:49:49.000000000 -0200 ++++ xarchiver-0.5.2/doc/html/ch03s03.html 2014-01-24 11:02:20.640986656 -0200 +@@ -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,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 as in freedom alternative of rar, unar, Xarchiver can't create rar archives since unar allows rar archives to be opened, tested and extracted but not to be created. +

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.2.orig/doc/xarchiver.docbook xarchiver-0.5.2/doc/xarchiver.docbook +--- xarchiver-0.5.2.orig/doc/xarchiver.docbook 2007-08-22 07:49:19.000000000 -0300 ++++ xarchiver-0.5.2/doc/xarchiver.docbook 2014-01-24 11:01:17.088748863 -0200 +@@ -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,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 as in freedom alternative of rar, unar, Xarchiver can't create rar archives since unar allows rar archives to be opened and extracted but not to be created. + +
+
+diff -Nur xarchiver-0.5.2.orig/src/extract_dialog.c xarchiver-0.5.2/src/extract_dialog.c +--- xarchiver-0.5.2.orig/src/extract_dialog.c 2008-11-10 08:28:11.000000000 -0200 ++++ xarchiver-0.5.2/src/extract_dialog.c 2014-01-24 10:55:28.209263885 -0200 +@@ -24,7 +24,7 @@ + #include "string_utils.h" + #include "support.h" + +-extern gboolean unrar,batch_mode; ++extern gboolean unar,batch_mode; + extern Prefs_dialog_data *prefs_window; + extern Progress_bar_data *pb; + extern extract_func extract [XARCHIVETYPE_COUNT]; +@@ -290,11 +290,7 @@ + GSList *names = NULL; + GtkTreeModel *model; + int response; +- +- if (unrar) +- rar = "unrar"; +- else +- rar = "rar"; ++ rar = "unar"; + + while (! done) + { +diff -Nur xarchiver-0.5.2.orig/src/interface.c xarchiver-0.5.2/src/interface.c +--- xarchiver-0.5.2.orig/src/interface.c 2008-11-11 06:09:01.000000000 -0200 ++++ xarchiver-0.5.2/src/interface.c 2014-01-24 10:56:03.893317117 -0200 +@@ -45,7 +45,7 @@ + { "text/uri-list",0,0 }, + }; + +-extern gboolean unrar,batch_mode; ++extern gboolean unar,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); +@@ -629,7 +629,7 @@ + { + gtk_widget_show(selected_frame); + gtk_widget_set_sensitive(deselect_all,TRUE); +- if (archive[id]->type == XARCHIVETYPE_RAR && unrar) ++ if (archive[id]->type == XARCHIVETYPE_RAR && unar) + { + gtk_widget_set_sensitive (delete_menu,FALSE); + gtk_widget_set_sensitive (rename_menu,FALSE); +diff -Nur xarchiver-0.5.2.orig/src/main.c xarchiver-0.5.2/src/main.c +--- xarchiver-0.5.2.orig/src/main.c 2008-11-10 09:21:43.000000000 -0200 ++++ xarchiver-0.5.2/src/main.c 2014-01-24 12:18:53.211684553 -0200 +@@ -33,7 +33,7 @@ + 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 unar = FALSE; + gboolean sevenzr = FALSE, sevenza = FALSE, xdg_open = FALSE; + int response; + extern gchar *current_open_directory; +@@ -312,7 +312,6 @@ + delete[XARCHIVETYPE_GZIP] = 0; + delete[XARCHIVETYPE_LZMA] = 0; + delete[XARCHIVETYPE_XZ] = 0; +- delete[XARCHIVETYPE_RAR] = &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; +@@ -325,7 +324,6 @@ + add[XARCHIVETYPE_ARJ] = &xa_arj_add; + add[XARCHIVETYPE_DEB] = 0; + add[XARCHIVETYPE_BZIP2] = add[XARCHIVETYPE_GZIP] = add[XARCHIVETYPE_LZMA] = add[XARCHIVETYPE_XZ] = &xa_tar_add; +- add[XARCHIVETYPE_RAR] = &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; +@@ -348,7 +346,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] = 0; +- test[XARCHIVETYPE_RAR] = &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] = 0; + test[XARCHIVETYPE_ZIP] = &xa_zip_test; +@@ -420,24 +417,14 @@ + //ArchiveSuffix = g_list_append(ArchiveSuffix, ""); + } + +- absolute_path = g_find_program_in_path ("rar"); +- if ( absolute_path ) ++ absolute_path = g_find_program_in_path("unar"); ++ if ( absolute_path ) + { ++ unar = TRUE; + ArchiveType = g_list_append(ArchiveType, "rar"); + ArchiveSuffix = g_list_append(ArchiveSuffix, "*.rar"); + 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"); +- g_free (absolute_path); +- } +- } + + absolute_path = g_find_program_in_path("cpio"); + if ( absolute_path ) +diff -Nur xarchiver-0.5.2.orig/src/new_dialog.c xarchiver-0.5.2/src/new_dialog.c +--- xarchiver-0.5.2.orig/src/new_dialog.c 2008-11-11 06:28:46.000000000 -0200 ++++ xarchiver-0.5.2/src/new_dialog.c 2014-01-24 10:56:34.274491565 -0200 +@@ -24,7 +24,7 @@ + #include "string_utils.h" + #include "main.h" + +-extern gboolean unrar; ++extern gboolean unar; + extern Prefs_dialog_data *prefs_window; + gchar *current_new_directory = NULL; + gint new_combo_box = -1; +diff -Nur xarchiver-0.5.2.orig/src/pref_dialog.c xarchiver-0.5.2/src/pref_dialog.c +--- xarchiver-0.5.2.orig/src/pref_dialog.c 2008-11-10 06:05:07.000000000 -0200 ++++ xarchiver-0.5.2/src/pref_dialog.c 2014-01-24 10:54:07.611853842 -0200 +@@ -23,7 +23,7 @@ + #include "main.h" + #include "support.h" + +-extern gboolean unrar; ++extern gboolean unar; + extern gboolean xdg_open; + extern Extract_dialog_data *extract_window; + extern Add_dialog_data *add_window; +@@ -104,7 +104,7 @@ + { + if (strcmp(archive_type->data, "tgz") == 0 || + strcmp(archive_type->data, "rpm") == 0 || +- (strcmp(archive_type->data, "rar") == 0 && unrar) ) ++ (strcmp(archive_type->data, "rar") == 0 && unar) ) + goto next; + else + gtk_combo_box_append_text (GTK_COMBO_BOX (prefs_data->combo_prefered_format),archive_type->data ); +diff -Nur xarchiver-0.5.2.orig/src/rar.c xarchiver-0.5.2/src/rar.c +--- xarchiver-0.5.2.orig/src/rar.c 2008-11-10 06:05:07.000000000 -0200 ++++ xarchiver-0.5.2/src/rar.c 2014-01-24 13:09:12.838038687 -0200 +@@ -20,7 +20,7 @@ + #include "rar.h" + #include + +-extern gboolean unrar; ++extern gboolean unar; + extern void xa_reload_archive_content(XArchive *archive); + extern void xa_create_liststore ( XArchive *archive, gchar *columns_names[]); + +@@ -30,19 +30,10 @@ + gchar *command = NULL; + gchar *rar = NULL; + jump_header = read_filename = last_line = encrypted = FALSE; ++ rar = "unar"; ++ archive->can_add = archive->has_sfx = FALSE; + +- if (unrar) +- { +- rar = "unrar"; +- archive->can_add = archive->has_sfx = FALSE; +- } +- else +- { +- rar = "rar"; +- archive->can_add = archive->has_sfx = TRUE; +- } +- +- command = g_strconcat ( rar," v " , archive->escaped_path, NULL ); ++ command = g_strconcat ( rar, archive->escaped_path, NULL ); + archive->can_extract = archive->has_test = archive->has_properties = TRUE; + archive->dummy_size = 0; + archive->nr_of_files = 0; +@@ -222,71 +213,6 @@ + } + } + +-void xa_rar_delete (XArchive *archive,GSList *names) +-{ +- gchar *command,*e_filename = NULL; +- GSList *list = NULL,*_names; +- GString *files = g_string_new(""); +- +- _names = names; +- while (_names) +- { +- e_filename = xa_escape_filename((gchar*)_names->data,"$'`\"\\!?* ()[]&|:;<>#"); +- g_string_prepend (files,e_filename); +- g_string_prepend_c (files,' '); +- _names = _names->next; +- } +- g_slist_foreach(names,(GFunc)g_free,NULL); +- g_slist_free(names); +- +- command = g_strconcat ("rar d ",archive->escaped_path," ",files->str,NULL); +- g_string_free(files,TRUE); +- list = g_slist_append(list,command); +- +- xa_run_command (archive,list); +- if (archive->status == XA_ARCHIVESTATUS_DELETE) +- xa_reload_archive_content(archive); +-} +- +-void xa_rar_add (XArchive *archive,GString *files,gchar *compression_string) +-{ +- GSList *list = NULL; +- gchar *command = NULL; +- +- if (archive->location_entry_path != NULL) +- archive->working_dir = g_strdup(archive->tmp); +- +- if (compression_string == NULL) +- compression_string = "3"; +- if (archive->passwd != NULL) +- command = g_strconcat ( "rar a ", +- archive->update ? "-u " : "", +- archive->freshen ? "-f " : "", +- archive->solid_archive ? "-s " : "", +- archive->remove_files ? "-df " : "", +- "-p" , archive->passwd, +- " -idp ", +- "-m",compression_string," ", +- archive->escaped_path, +- files->str,NULL); +- else +- command = g_strconcat ( "rar a ", +- archive->update ? "-u " : "", +- archive->freshen ? "-f " : "", +- archive->solid_archive ? "-s " : " ", +- archive->remove_files ? "-df " : " ", +- "-idp ", +- "-m",compression_string," ", +- archive->escaped_path, +- files->str,NULL); +- +- g_string_free(files,TRUE); +- list = g_slist_append(list,command); +- +- xa_run_command (archive,list); +- xa_reload_archive_content(archive); +-} +- + gboolean xa_rar_extract(XArchive *archive,GSList *files) + { + gchar *rar, *command, *e_filename = NULL; +@@ -295,10 +221,7 @@ + gboolean result = FALSE; + + _files = files; +- if (unrar) +- rar = "unrar"; +- else +- rar = "rar"; ++ rar = "unar"; + + while (_files) + { +@@ -311,42 +234,16 @@ + g_slist_free(_files); + + if (archive->passwd != NULL) +- command = g_strconcat (rar," ",archive->full_path ? "x " : "e ", +- archive->freshen ? "-f " : "" , archive->update ? "-u " : "", +- " -p",archive->passwd, +- archive->overwrite ? " -o+" : " -o-", +- " -idp ", +- archive->escaped_path,names->str," ",archive->extraction_path , NULL ); +- else +- command = g_strconcat (rar," ",archive->full_path ? "x " : "e ", +- archive->freshen ? "-f " : "" , archive->update ? "-u " : "", +- archive->overwrite ? "-o+" : "-o-", +- " -idp ", +- archive->escaped_path,names->str," ",archive->extraction_path , NULL ); ++ command = g_strconcat (rar," -p",archive->passwd, ++ archive->overwrite ? " -f" : "" , ++ archive->escaped_path,names->str," ",archive->extraction_path , NULL ); ++ else ++ command = g_strconcat (rar," ", ++ archive->overwrite ? " -f" : "" , ++ archive->escaped_path,names->str," ",archive->extraction_path , NULL ); + g_string_free(names,TRUE); + list = g_slist_append(list,command); + + result = xa_run_command (archive,list); + return result; + } +- +-void xa_rar_test (XArchive *archive) +-{ +- gchar *rar = NULL; +- gchar *command = NULL; +- GSList *list = NULL; +- +- if (unrar) +- rar = "unrar"; +- else +- rar = "rar"; +- +- archive->status = XA_ARCHIVESTATUS_TEST; +- if (archive->passwd != NULL) +- command = g_strconcat (rar," t -idp -p" , archive->passwd ," " , archive->escaped_path, NULL); +- else +- command = g_strconcat (rar," t -idp " , archive->escaped_path, NULL); +- +- list = g_slist_append(list,command); +- xa_run_command (archive,list); +- } +diff -Nur xarchiver-0.5.2.orig/src/rar.h xarchiver-0.5.2/src/rar.h +--- xarchiver-0.5.2.orig/src/rar.h 2008-08-22 05:12:38.000000000 -0300 ++++ xarchiver-0.5.2/src/rar.h 2014-01-24 10:49:13.140141939 -0200 +@@ -26,10 +26,7 @@ + #include "support.h" + #include "archive.h" + gboolean jump_header,jump_comment,read_filename, last_line, encrypted; +-void xa_rar_delete (XArchive *,GSList *); +-void xa_rar_add (XArchive *,GString *,gchar *); + gboolean xa_rar_extract(XArchive *,GSList *); +-void xa_rar_test (XArchive *); + void xa_get_rar_line_content (gchar *line, gpointer data); + void xa_open_rar ( XArchive *archive ); + #endif +diff -Nur xarchiver-0.5.2.orig/src/window.c xarchiver-0.5.2/src/window.c +--- xarchiver-0.5.2.orig/src/window.c 2008-11-11 06:31:45.000000000 -0200 ++++ xarchiver-0.5.2/src/window.c 2014-01-24 10:54:28.673636196 -0200 +@@ -26,7 +26,7 @@ + + extern GList *ArchiveType; + extern GList *ArchiveSuffix; +-extern gboolean unrar; ++extern gboolean unar; + extern gboolean xdg_open; + extern Prefs_dialog_data *prefs_window; + extern Extract_dialog_data *extract_window; +@@ -1567,7 +1567,7 @@ + gtk_widget_show(selected_frame); + gtk_widget_set_sensitive(deselect_all,TRUE); + } +- if ( (archive->type == XARCHIVETYPE_RAR && 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_RAR && unar) || 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); +@@ -1781,7 +1781,7 @@ + else + idx = xa_find_archive_index (current_page); + +- if (archive[idx]->type == XARCHIVETYPE_RAR && unrar) ++ if (archive[idx]->type == XARCHIVETYPE_RAR && unar) + { + 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; diff --git a/libre/xarchiver-libre/xarchiver-0.5.2-add_xz_support.patch b/libre/xarchiver-libre/xarchiver-0.5.2-add_xz_support.patch new file mode 100644 index 000000000..d246a8e19 --- /dev/null +++ b/libre/xarchiver-libre/xarchiver-0.5.2-add_xz_support.patch @@ -0,0 +1,397 @@ +diff -uNr xarchiver-0.5.2.orig/src/add_dialog.c xarchiver-0.5.2/src/add_dialog.c +--- xarchiver-0.5.2.orig/src/add_dialog.c 2008-11-10 19:41:31.000000000 +0900 ++++ xarchiver-0.5.2/src/add_dialog.c 2013-05-11 10:01:47.887094708 +0900 +@@ -209,7 +209,7 @@ + else + gtk_widget_set_size_request (add_dialog->dialog1,530,420); + +- if (archive->type == XARCHIVETYPE_BZIP2 || archive->type == XARCHIVETYPE_GZIP || archive->type == XARCHIVETYPE_LZMA || 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_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(add_dialog->filechooserwidget1),FALSE); + else + gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(add_dialog->filechooserwidget1),TRUE); +@@ -222,7 +222,7 @@ + else + gtk_widget_set_sensitive(add_dialog->store_path,TRUE); + /* 7z doesn't appear to let the user chooses if storing full paths */ +- if (archive->type == XARCHIVETYPE_7ZIP || archive->type == XARCHIVETYPE_LZOP || archive->type == XARCHIVETYPE_BZIP2 || archive->type == XARCHIVETYPE_GZIP || archive->type == XARCHIVETYPE_LZMA) ++ if (archive->type == XARCHIVETYPE_7ZIP || archive->type == XARCHIVETYPE_LZOP || archive->type == XARCHIVETYPE_BZIP2 || archive->type == XARCHIVETYPE_GZIP || archive->type == XARCHIVETYPE_LZMA || archive->type == XARCHIVETYPE_XZ ) + { + flag = FALSE; + } +@@ -244,7 +244,7 @@ + flag = TRUE; + gtk_widget_set_sensitive(add_dialog->solid_archive,flag); + +- if (archive->type != XARCHIVETYPE_TAR && archive->type != XARCHIVETYPE_TAR_GZ && archive->type != XARCHIVETYPE_TAR_LZMA && archive->type != XARCHIVETYPE_TAR_BZ2 && archive->type != XARCHIVETYPE_TAR_LZOP) ++ if (archive->type != XARCHIVETYPE_TAR && archive->type != XARCHIVETYPE_TAR_GZ && archive->type != XARCHIVETYPE_TAR_LZMA && archive->type != XARCHIVETYPE_TAR_XZ && archive->type != XARCHIVETYPE_TAR_BZ2 && archive->type != XARCHIVETYPE_TAR_LZOP) + { + flag = TRUE; + if (archive->type == XARCHIVETYPE_7ZIP) +@@ -306,7 +306,7 @@ + g_signal_connect (G_OBJECT (add_dialog->compression_value),"value-changed",G_CALLBACK (fix_adjustment_value), NULL); + gtk_tooltips_set_tip (add_dialog->option_tooltip,add_dialog->compression_scale, compression_msg, NULL ); + +- if (archive->type == XARCHIVETYPE_TAR || archive->type == XARCHIVETYPE_TAR_GZ || archive->type == XARCHIVETYPE_TAR_LZMA || archive->type == XARCHIVETYPE_TAR_BZ2 || archive->type == XARCHIVETYPE_TAR_LZOP) ++ if (archive->type == XARCHIVETYPE_TAR || archive->type == XARCHIVETYPE_TAR_GZ || archive->type == XARCHIVETYPE_TAR_LZMA || archive->type == XARCHIVETYPE_TAR_XZ || archive->type == XARCHIVETYPE_TAR_BZ2 || archive->type == XARCHIVETYPE_TAR_LZOP) + flag = FALSE; + else + flag = TRUE; +diff -uNr xarchiver-0.5.2.orig/src/archive.h xarchiver-0.5.2/src/archive.h +--- xarchiver-0.5.2.orig/src/archive.h 2008-11-07 17:49:41.000000000 +0900 ++++ xarchiver-0.5.2/src/archive.h 2013-05-11 10:01:47.888094708 +0900 +@@ -30,6 +30,7 @@ + XARCHIVETYPE_BZIP2, + XARCHIVETYPE_GZIP, + XARCHIVETYPE_LZMA, ++ XARCHIVETYPE_XZ, + XARCHIVETYPE_LZOP, + XARCHIVETYPE_RAR, + XARCHIVETYPE_RPM, +@@ -37,6 +38,7 @@ + XARCHIVETYPE_TAR_BZ2, + XARCHIVETYPE_TAR_GZ, + XARCHIVETYPE_TAR_LZMA, ++ XARCHIVETYPE_TAR_XZ, + XARCHIVETYPE_TAR_LZOP, + XARCHIVETYPE_ZIP, + XARCHIVETYPE_LHA, +diff -uNr xarchiver-0.5.2.orig/src/bzip2.c xarchiver-0.5.2/src/bzip2.c +--- xarchiver-0.5.2.orig/src/bzip2.c 2008-11-10 20:17:48.000000000 +0900 ++++ xarchiver-0.5.2/src/bzip2.c 2013-05-11 10:01:47.888094708 +0900 +@@ -54,6 +54,15 @@ + archive->extract = extract[archive->type]; + xa_open_tar_compressed_file(archive); + } ++ else if (g_str_has_suffix(archive->escaped_path,".tar.xz") || g_str_has_suffix (archive->escaped_path,".txz")) ++ { ++ archive->type = XARCHIVETYPE_TAR_XZ; ++ archive->format = "TAR.XZ"; ++ archive->delete = delete[archive->type]; ++ archive->add = add[archive->type]; ++ archive->extract = extract[archive->type]; ++ xa_open_tar_compressed_file(archive); ++ } + else if (g_str_has_suffix(archive->escaped_path,".tar.lzop") || + g_str_has_suffix (archive->escaped_path,".tzo") || + g_str_has_suffix(archive->escaped_path,".tar.lzo")) +@@ -85,6 +94,12 @@ + executable = "lzma "; + len = 5; + } ++ else if (archive->type == XARCHIVETYPE_XZ) ++ { ++ archive->format = "XZ"; ++ executable = "xz "; ++ len = 5; ++ } + else if (archive->type == XARCHIVETYPE_LZOP) + { + archive->format = "LZOP"; +@@ -163,6 +178,8 @@ + command = g_strconcat(tar," tfjv ",archive->escaped_path,NULL); + else if (archive->type == XARCHIVETYPE_TAR_LZMA) + command = g_strconcat(tar," tv --use-compress-program=lzma -f ",archive->escaped_path,NULL); ++ else if (archive->type == XARCHIVETYPE_TAR_XZ) ++ command = g_strconcat(tar," tv --use-compress-program=xz -f ",archive->escaped_path,NULL); + else if (archive->type == XARCHIVETYPE_TAR_LZOP) + command = g_strconcat(tar," tv --use-compress-program=lzop -f ",archive->escaped_path,NULL); + /* else fail? */ +@@ -205,6 +222,11 @@ + executable = "lzma "; + len = 5; + } ++ else if (archive->type == XARCHIVETYPE_XZ) ++ { ++ executable = "xz "; ++ len = 5; ++ } + else if (archive->type == XARCHIVETYPE_LZOP) + { + executable = "lzop "; +diff -uNr xarchiver-0.5.2.orig/src/extract_dialog.c xarchiver-0.5.2/src/extract_dialog.c +--- xarchiver-0.5.2.orig/src/extract_dialog.c 2008-11-10 19:28:11.000000000 +0900 ++++ xarchiver-0.5.2/src/extract_dialog.c 2013-05-11 10:01:47.889094708 +0900 +@@ -815,6 +815,11 @@ + archive->type = XARCHIVETYPE_TAR_LZMA; + archive->extract = extract[XARCHIVETYPE_TAR_LZMA]; + } ++ else if (g_str_has_suffix(archive->escaped_path,".tar.xz")|| g_str_has_suffix (archive->escaped_path,".txz")) ++ { ++ archive->type = XARCHIVETYPE_TAR_XZ; ++ archive->extract = extract[XARCHIVETYPE_TAR_XZ]; ++ } + else if (g_str_has_suffix(archive->escaped_path,".tar.lzop") || + g_str_has_suffix (archive->escaped_path,".tzo") || + g_str_has_suffix(archive->escaped_path,".tar.lzo")) +diff -uNr xarchiver-0.5.2.orig/src/main.c xarchiver-0.5.2/src/main.c +--- xarchiver-0.5.2.orig/src/main.c 2008-11-10 20:21:43.000000000 +0900 ++++ xarchiver-0.5.2/src/main.c 2013-05-11 10:17:01.696094044 +0900 +@@ -296,9 +296,10 @@ + open_archive[XARCHIVETYPE_BZIP2] = &xa_open_bzip2_lzma; + 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] = &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_LZOP] = &xa_open_tar; ++ 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; + open_archive[XARCHIVETYPE_LHA] = &xa_open_lha; + open_archive[XARCHIVETYPE_LZOP] = &xa_open_bzip2_lzma; +@@ -310,9 +311,10 @@ + delete[XARCHIVETYPE_BZIP2] = 0; + delete[XARCHIVETYPE_GZIP] = 0; + delete[XARCHIVETYPE_LZMA] = 0; ++ delete[XARCHIVETYPE_XZ] = 0; + delete[XARCHIVETYPE_RAR] = &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_LZOP] = &xa_tar_delete; ++ 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; + delete[XARCHIVETYPE_LHA] = &xa_lha_delete; + delete[XARCHIVETYPE_LZOP] = 0; +@@ -322,10 +324,10 @@ + add[XARCHIVETYPE_7ZIP] = &xa_7zip_add; + add[XARCHIVETYPE_ARJ] = &xa_arj_add; + add[XARCHIVETYPE_DEB] = 0; +- add[XARCHIVETYPE_BZIP2] = add[XARCHIVETYPE_GZIP] = add[XARCHIVETYPE_LZMA] = &xa_tar_add; ++ add[XARCHIVETYPE_BZIP2] = add[XARCHIVETYPE_GZIP] = add[XARCHIVETYPE_LZMA] = add[XARCHIVETYPE_XZ] = &xa_tar_add; + add[XARCHIVETYPE_RAR] = &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_LZOP] = &xa_tar_add; ++ 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; + add[XARCHIVETYPE_LHA] = &xa_lha_add; + add[XARCHIVETYPE_LZOP] = &xa_tar_add; +@@ -334,10 +336,10 @@ + extract[XARCHIVETYPE_7ZIP] = &xa_7zip_extract; + extract[XARCHIVETYPE_ARJ] = &xa_arj_extract; + extract[XARCHIVETYPE_DEB] = &xa_deb_extract;; +- extract[XARCHIVETYPE_BZIP2] = extract[XARCHIVETYPE_GZIP] = extract[XARCHIVETYPE_LZMA] = &xa_tar_extract; ++ extract[XARCHIVETYPE_BZIP2] = extract[XARCHIVETYPE_GZIP] = extract[XARCHIVETYPE_LZMA] = extract[XARCHIVETYPE_XZ] = &xa_tar_extract; + extract[XARCHIVETYPE_RAR] = &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_LZOP] = &xa_tar_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; + extract[XARCHIVETYPE_LHA] = &xa_lha_extract; + extract[XARCHIVETYPE_LZOP] = &xa_tar_extract; +@@ -345,10 +347,10 @@ + test[0] = 0; + test[XARCHIVETYPE_7ZIP] = &xa_7zip_test; + test[XARCHIVETYPE_ARJ] = &xa_arj_test; +- test[XARCHIVETYPE_DEB] = test[XARCHIVETYPE_BZIP2] = test[XARCHIVETYPE_GZIP] = test[XARCHIVETYPE_LZMA] = 0; ++ test[XARCHIVETYPE_DEB] = test[XARCHIVETYPE_BZIP2] = test[XARCHIVETYPE_GZIP] = test[XARCHIVETYPE_LZMA] = test[XARCHIVETYPE_XZ] = 0; + test[XARCHIVETYPE_RAR] = &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_LZOP] = 0; ++ test[XARCHIVETYPE_TAR] = test[XARCHIVETYPE_TAR_BZ2] = test[XARCHIVETYPE_TAR_GZ] = test[XARCHIVETYPE_TAR_LZMA] = test[XARCHIVETYPE_TAR_XZ] = test[XARCHIVETYPE_TAR_LZOP] = 0; + test[XARCHIVETYPE_ZIP] = &xa_zip_test; + test[XARCHIVETYPE_LHA] = &xa_lha_test; + test[XARCHIVETYPE_LZOP] = 0; +@@ -392,6 +394,14 @@ + g_free (absolute_path); + } + ++ absolute_path = g_find_program_in_path("xz"); ++ if ( absolute_path ) ++ { ++ ArchiveType = g_list_append(ArchiveType, "xz"); ++ ArchiveSuffix = g_list_append(ArchiveSuffix, "*.xz"); ++ g_free (absolute_path); ++ } ++ + absolute_path = g_find_program_in_path("lzop"); + if ( absolute_path ) + { +@@ -460,6 +470,11 @@ + ArchiveType = g_list_append(ArchiveType, "tar.lzma"); + ArchiveSuffix = g_list_append(ArchiveSuffix, "*.tlz"); + } ++ if ( g_list_find ( ArchiveType , "xz") ) ++ { ++ ArchiveType = g_list_append(ArchiveType, "tar.xz"); ++ ArchiveSuffix = g_list_append(ArchiveSuffix, "*.txz"); ++ } + if ( g_list_find ( ArchiveType , "lzo") ) + { + ArchiveType = g_list_append(ArchiveType, "tar.lzo"); +@@ -528,6 +543,8 @@ + archive->type = XARCHIVETYPE_TAR_GZ; + else if ( g_str_has_suffix ( archive->escaped_path , ".tar.lzma") || g_str_has_suffix ( archive->escaped_path , ".tlz") ) + archive->type = XARCHIVETYPE_TAR_LZMA; ++ else if ( g_str_has_suffix ( archive->escaped_path , ".tar.xz") || g_str_has_suffix ( archive->escaped_path , ".txz") ) ++ archive->type = XARCHIVETYPE_TAR_XZ; + else if ( g_str_has_suffix ( archive->escaped_path , ".tar.lzo") || + g_str_has_suffix ( archive->escaped_path , ".tzo") || + g_str_has_suffix ( archive->escaped_path , ".tar.lzop")) +diff -uNr xarchiver-0.5.2.orig/src/new_dialog.c xarchiver-0.5.2/src/new_dialog.c +--- xarchiver-0.5.2.orig/src/new_dialog.c 2008-11-11 17:28:46.000000000 +0900 ++++ xarchiver-0.5.2/src/new_dialog.c 2013-05-11 10:01:47.890094708 +0900 +@@ -202,6 +202,8 @@ + type = XARCHIVETYPE_GZIP; + else if (strcmp ( ComboArchiveType,"lzma") == 0) + type = XARCHIVETYPE_LZMA; ++ else if (strcmp ( ComboArchiveType,"xz") == 0) ++ type = XARCHIVETYPE_XZ; + else if (strcmp ( ComboArchiveType,"lzo") == 0) + type = XARCHIVETYPE_LZOP; + else if (strcmp ( ComboArchiveType,"rar") == 0) +@@ -214,6 +216,8 @@ + type = XARCHIVETYPE_TAR_GZ; + else if (strcmp ( ComboArchiveType,"tar.lzma") == 0) + type = XARCHIVETYPE_TAR_LZMA; ++ else if (strcmp ( ComboArchiveType,"tar.xz") == 0) ++ type = XARCHIVETYPE_TAR_XZ; + else if (strcmp ( ComboArchiveType,"tar.lzo") == 0) + type = XARCHIVETYPE_TAR_LZOP; + else if (strcmp ( ComboArchiveType,"jar") == 0 || strcmp ( ComboArchiveType,"zip") == 0 ) +diff -Naur xarchiver-0.5.2.orig/src/rpm.c xarchiver-0.5.2/src/rpm.c +--- xarchiver-0.5.2.orig/src/rpm.c 2014-01-24 03:07:47.729711000 +0100 ++++ xarchiver-0.5.2/src/rpm.c 2014-01-24 03:12:43.717122918 +0100 +@@ -111,8 +111,10 @@ + } + if (xa_detect_archive_type (gzip_tmp) == XARCHIVETYPE_GZIP) + executable = "gzip -dc "; +- else ++ 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);diff -uNr xarchiver-0.5.2.orig/src/tar.c xarchiver-0.5.2/src/tar.c +--- xarchiver-0.5.2.orig/src/tar.c 2008-11-10 19:28:34.000000000 +0900 ++++ xarchiver-0.5.2/src/tar.c 2013-05-11 10:12:01.027094262 +0900 +@@ -242,6 +242,17 @@ + files->str , NULL ); + break; + ++ case XARCHIVETYPE_TAR_XZ: ++ if ( g_file_test ( archive->escaped_path , G_FILE_TEST_EXISTS ) ) ++ xa_add_delete_bzip2_gzip_lzma_compressed_tar (files,archive,1); ++ else ++ command = g_strconcat (tar, " ", ++ archive->add_recurse ? "" : "--no-recursion ", ++ archive->remove_files ? "--remove-files " : "", ++ "--use-compress-program=xz -cvvf ",archive->escaped_path, ++ files->str , NULL ); ++ break; ++ + case XARCHIVETYPE_TAR_LZOP: + if ( g_file_test ( archive->escaped_path , G_FILE_TEST_EXISTS ) ) + xa_add_delete_bzip2_gzip_lzma_compressed_tar (files,archive,1); +@@ -265,6 +276,10 @@ + command = g_strconcat("sh -c \"lzma -c ",files->str,"> ",archive->escaped_path,"\"",NULL); + break; + ++ case XARCHIVETYPE_XZ: ++ command = g_strconcat("sh -c \"xz -c ",files->str,"> ",archive->escaped_path,"\"",NULL); ++ break; ++ + case XARCHIVETYPE_LZOP: + command = g_strconcat("sh -c \"lzop -c ",files->str,"> ",archive->escaped_path,"\"",NULL); + break; +@@ -378,6 +393,25 @@ + } + break; + ++ case XARCHIVETYPE_TAR_XZ: ++ if (archive->full_path == 1) ++ { ++ command = g_strconcat (tar, " --use-compress-program=xz -xvf " , archive->escaped_path, ++ #ifdef __FreeBSD__ ++ archive->overwrite ? " " : " -k", ++ #else ++ archive->overwrite ? " --overwrite" : " --keep-old-files", ++ #endif ++ archive->tar_touch ? " --touch" : "", ++ " -C ",archive->extraction_path," ",names->str,NULL); ++ } ++ else ++ { ++ result = xa_extract_tar_without_directories ( "tar --use-compress-program=xz -xvf ",archive,names->str); ++ command = NULL; ++ } ++ break; ++ + case XARCHIVETYPE_TAR_LZOP: + if (archive->full_path == 1) + { +@@ -402,6 +436,11 @@ + command = NULL; + break; + ++ case XARCHIVETYPE_XZ: ++ result = lzma_bzip2_extract(archive,NULL); ++ command = NULL; ++ break; ++ + case XARCHIVETYPE_LZOP: + result = lzma_bzip2_extract(archive,NULL); + command = NULL; +@@ -449,6 +488,10 @@ + executable = "lzma -f "; + filename = "dummy.lzma"; + break; ++ case XARCHIVETYPE_TAR_XZ: ++ executable = "xz -f "; ++ filename = "dummy.xz"; ++ break; + case XARCHIVETYPE_TAR_LZOP: + executable = "lzop -f "; + filename = "dummy.lzo"; +@@ -493,7 +536,7 @@ + + gboolean is_tar_compressed (gint type) + { +- return (type == XARCHIVETYPE_TAR_BZ2 || type == XARCHIVETYPE_TAR_GZ || type == XARCHIVETYPE_TAR_LZMA || type == XARCHIVETYPE_TAR_LZOP); ++ return (type == XARCHIVETYPE_TAR_BZ2 || type == XARCHIVETYPE_TAR_GZ || type == XARCHIVETYPE_TAR_LZMA || type == XARCHIVETYPE_TAR_XZ || type == XARCHIVETYPE_TAR_LZOP); + } + + gboolean xa_extract_tar_without_directories (gchar *string,XArchive *archive,gchar *files_to_extract) +diff -uNr xarchiver-0.5.2.orig/src/window.c xarchiver-0.5.2/src/window.c +--- xarchiver-0.5.2.orig/src/window.c 2008-11-11 17:31:45.000000000 +0900 ++++ xarchiver-0.5.2/src/window.c 2013-05-11 10:01:47.892094708 +0900 +@@ -1125,6 +1125,8 @@ + xx = XARCHIVETYPE_GZIP; + else if (memcmp ( magic,"\x5d\x00\x00\x80",4) == 0) + xx = XARCHIVETYPE_LZMA; ++ else if ((memcmp ( magic,"\xFD" "7zXZ\x00\x00",7) == 0) || (memcmp ( magic,"\xFD" "7zXZ\x00\x10",7) == 0)) ++ xx = XARCHIVETYPE_XZ; + else if (memcmp ( magic,"\211LZO",4) == 0) + xx = XARCHIVETYPE_LZOP; + else if (memcmp ( magic,"\xed\xab\xee\xdb",4) == 0) +@@ -1462,6 +1464,7 @@ + case XARCHIVETYPE_GZIP: + case XARCHIVETYPE_BZIP2: + case XARCHIVETYPE_LZMA: ++ case XARCHIVETYPE_XZ: + case XARCHIVETYPE_LZOP: + case XARCHIVETYPE_RPM: + pos = 3; +@@ -1481,6 +1484,7 @@ + case XARCHIVETYPE_TAR_GZ: + case XARCHIVETYPE_TAR_BZ2: + case XARCHIVETYPE_TAR_LZMA: ++ case XARCHIVETYPE_TAR_XZ: + case XARCHIVETYPE_TAR_LZOP: + case XARCHIVETYPE_TAR: + case XARCHIVETYPE_ZIP: +@@ -1525,6 +1529,7 @@ + case XARCHIVETYPE_GZIP: + case XARCHIVETYPE_BZIP2: + case XARCHIVETYPE_LZMA: ++ case XARCHIVETYPE_XZ: + case XARCHIVETYPE_LZOP: + case XARCHIVETYPE_RPM: + pos = 3; +@@ -1544,6 +1549,7 @@ + case XARCHIVETYPE_TAR_GZ: + case XARCHIVETYPE_TAR_BZ2: + case XARCHIVETYPE_TAR_LZMA: ++ case XARCHIVETYPE_TAR_XZ: + case XARCHIVETYPE_TAR_LZOP: + case XARCHIVETYPE_TAR: + case XARCHIVETYPE_ZIP: diff --git a/libre/xarchiver-libre/xarchiver-0.5.2-drag-n-drop_escaped_path.patch b/libre/xarchiver-libre/xarchiver-0.5.2-drag-n-drop_escaped_path.patch new file mode 100644 index 000000000..10def7d21 --- /dev/null +++ b/libre/xarchiver-libre/xarchiver-0.5.2-drag-n-drop_escaped_path.patch @@ -0,0 +1,13 @@ +diff -Naur xarchiver-0.5.2.orig/src/window.c xarchiver-0.5.2/src/window.c +--- xarchiver-0.5.2.orig/src/window.c 2012-01-12 13:28:54.000000000 +0100 ++++ xarchiver-0.5.2/src/window.c 2012-01-23 20:43:49.622745851 +0100 +@@ -1724,6 +1724,9 @@ + gtk_tree_selection_selected_foreach (selection,(GtkTreeSelectionForeachFunc) xa_concat_selected_filenames,&names); + archive->full_path = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (extract_window->extract_full)); + archive->overwrite = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (extract_window->overwrite_check)); ++ gchar *unescaped_extraction_path = archive->extraction_path; ++ archive->extraction_path = xa_escape_filename(unescaped_extraction_path, "$'`\"\\!?* ()[]&|:;<>#"); ++ g_free(unescaped_extraction_path); + (*archive->extract) (archive,names); + + g_list_foreach (row_list,(GFunc) gtk_tree_path_free,NULL); diff --git a/libre/xarchiver-libre/xarchiver-0.5.2-fix-double-escaping.patch b/libre/xarchiver-libre/xarchiver-0.5.2-fix-double-escaping.patch new file mode 100644 index 000000000..8b44d91a0 --- /dev/null +++ b/libre/xarchiver-libre/xarchiver-0.5.2-fix-double-escaping.patch @@ -0,0 +1,32 @@ +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-libre/xarchiver-0.5.2-fix-non-existent-archive.patch b/libre/xarchiver-libre/xarchiver-0.5.2-fix-non-existent-archive.patch new file mode 100644 index 000000000..e63687579 --- /dev/null +++ b/libre/xarchiver-libre/xarchiver-0.5.2-fix-non-existent-archive.patch @@ -0,0 +1,26 @@ +From: Markus Koschany +Date: Thu, 28 Feb 2013 17:45:50 +0100 +Subject: fix segfault non-existent archive cmdl switch x + +If using the command line switch -x, the user needs to specify a valid/existent +archive. If the name of the archive is mistyped, xarchiver will segfault. This +patch fixes the issue. + +Bug: http://bugs.debian.org/701909 +--- + src/main.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/main.c b/src/main.c +index a6a7f93..a6e05e3 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -141,7 +141,7 @@ int main (int argc, char **argv) + /* Switch -x */ + if (extract_path != NULL) + { +- if (argv[1] == NULL) ++ if (argv[1] == NULL || archive == NULL) + { + response = xa_show_message_dialog (NULL,GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,_("Can't extract files from the archive:"),_("You missed the archive name!\n")); + return -1; diff --git a/libre/xarchiver-libre/xarchiver-0.5.2-no-donators-menu.patch b/libre/xarchiver-libre/xarchiver-0.5.2-no-donators-menu.patch new file mode 100644 index 000000000..aa2283a7e --- /dev/null +++ b/libre/xarchiver-libre/xarchiver-0.5.2-no-donators-menu.patch @@ -0,0 +1,50 @@ +--- xarchiver/trunk/src/interface.c 2009/03/19 18:03:52 29676 ++++ xarchiver/trunk/src/interface.c 2009/03/19 20:48:19 29677 +@@ -310,22 +310,14 @@ + gtk_widget_show (tmp_image); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (help1),tmp_image); + ++ donate = gtk_image_menu_item_new_with_mnemonic (_("_Donate")); ++ gtk_widget_show (donate); ++ gtk_container_add (GTK_CONTAINER (menuitem4_menu),donate); ++ + about1 = gtk_image_menu_item_new_from_stock ("gtk-about",accel_group); + gtk_widget_show (about1); + gtk_container_add (GTK_CONTAINER (menuitem4_menu),about1); + +- thanks_to = gtk_image_menu_item_new_with_mnemonic (_("_Thanks to")); +- gtk_widget_show (thanks_to); +- gtk_container_add (GTK_CONTAINER (menuitem4_menu),thanks_to); +- +- thanks_to_submenu = gtk_menu_new(); +- gtk_widget_show (thanks_to_submenu); +- gtk_menu_item_set_submenu (GTK_MENU_ITEM (thanks_to),thanks_to_submenu); +- +- donators = gtk_image_menu_item_new_with_mnemonic ("Your name and website here"); +- gtk_widget_show (donators); +- gtk_container_add (GTK_CONTAINER (thanks_to_submenu),donators); +- + /* Create the toolbar */ + toolbar1 = gtk_toolbar_new (); + gtk_widget_show (toolbar1); +@@ -543,7 +535,7 @@ + g_signal_connect ((gpointer) multi_extract_menu,"activate",G_CALLBACK (xa_show_multi_extract_dialog),NULL); + g_signal_connect ((gpointer) help1,"activate",G_CALLBACK (xa_show_help),NULL); + g_signal_connect ((gpointer) about1,"activate",G_CALLBACK (xa_about),NULL); +- g_signal_connect ((gpointer) donators,"activate",G_CALLBACK (xa_show_donate_page_on_the_web),NULL); ++ g_signal_connect ((gpointer) donate,"activate",G_CALLBACK (xa_show_donate_page_on_the_web),NULL); + + g_signal_connect ((gpointer) New_button, "clicked",G_CALLBACK (xa_new_archive),NULL); + g_signal_connect ((gpointer) Open_button, "clicked",G_CALLBACK (xa_open_archive),NULL); +--- xarchiver/trunk/src/interface.h 2008/11/04 10:06:17 28603 ++++ xarchiver/trunk/src/interface.h 2009/03/19 20:48:19 29677 +@@ -48,8 +48,8 @@ + *name_label, *type_label, *compression_data, *encrypted_data, *encrypted_label,*number_of_files_data, *content_data, *comment_data, *size_data, *modified_data, *path_data, *type_data, + *name_data, *separatormenuitem1, *separatormenuitem2, *separatormenuitem3, *separatormenuitem4, *separatormenuitem5, *separatormenuitem6, *quit1, + *close1, *check_menu, *properties, *menuitem2, *menuitem2_menu, *addfile, *extract_menu, *delete_menu, *comment_menu, *multi_extract_menu,*view_shell_output1, +-*prefs_menu,*password_entry_menu, *image1, *image2, *menuitem4, *thanks_to,*thanks_to_submenu,*select_all,*deselect_all,*select_pattern, *exe_menu, *menuitem4_menu, +-*about1, *help1, *donators,*toolbar1, *toolbar2, *hbox1, *tmp_image, *pad_image, *New_button, *Open_button, *back_button, *home_button, *forward_button, ++*prefs_menu,*password_entry_menu, *image1, *image2, *menuitem4, *donate,*select_all,*deselect_all,*select_pattern, *exe_menu, *menuitem4_menu, ++*about1, *help1,*toolbar1, *toolbar2, *hbox1, *tmp_image, *pad_image, *New_button, *Open_button, *back_button, *home_button, *forward_button, + *up_button,*separatortoolitem1,*separatortoolitem2,*separatortoolitem3,*AddFile_button,*Extract_button,*Stop_button,*toolitem1,*location_label, + *location_entry,*hpaned1,*archive_dir_treeview,*scrolledwindow2,*ddelete,*rename_menu,*rrename,*cut,*copy,*paste,*view,*open_popupmenu; diff --git a/libre/xarchiver-libre/xarchiver-0.5.2-segfault-delete-file.patch b/libre/xarchiver-libre/xarchiver-0.5.2-segfault-delete-file.patch new file mode 100644 index 000000000..b8052544b --- /dev/null +++ b/libre/xarchiver-libre/xarchiver-0.5.2-segfault-delete-file.patch @@ -0,0 +1,21 @@ +diff -Naur xarchiver-0.5.2.orig/src/window.c xarchiver-0.5.2/src/window.c +--- xarchiver-0.5.2.orig/src/window.c 2014-01-24 01:22:27.931903000 +0100 ++++ xarchiver-0.5.2/src/window.c 2014-01-24 01:24:49.952825715 +0100 +@@ -1573,7 +1573,7 @@ + gtk_widget_show(selected_frame); + gtk_widget_set_sensitive(deselect_all,TRUE); + } +- if ( (archive->type == XARCHIVETYPE_RAR && unrar) || archive->type == XARCHIVETYPE_BZIP2 || archive->type == XARCHIVETYPE_GZIP) ++ if ( (archive->type == XARCHIVETYPE_RAR && unrar) || 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); +@@ -2287,7 +2287,7 @@ + else + value = TRUE; + } +- if (archive->type == XARCHIVETYPE_BZIP2 || archive->type == XARCHIVETYPE_GZIP || archive->type == XARCHIVETYPE_DEB || archive->type == XARCHIVETYPE_RPM) ++ if (archive->type == XARCHIVETYPE_BZIP2 || archive->type == XARCHIVETYPE_GZIP || archive->type == XARCHIVETYPE_LZMA || archive->type == XARCHIVETYPE_XZ || archive->type == XARCHIVETYPE_LZOP || archive->type == XARCHIVETYPE_DEB || archive->type == XARCHIVETYPE_RPM) + { + gtk_widget_set_sensitive(ddelete,FALSE); + gtk_widget_set_sensitive(rrename,FALSE); diff --git a/libre/xarchiver-libre/xarchiver-0.5.2-segfault-password-protected.patch b/libre/xarchiver-libre/xarchiver-0.5.2-segfault-password-protected.patch new file mode 100644 index 000000000..a1fa1f2ca --- /dev/null +++ b/libre/xarchiver-libre/xarchiver-0.5.2-segfault-password-protected.patch @@ -0,0 +1,43 @@ +diff -Naur xarchiver-0.5.2.orig/src/window.c xarchiver-0.5.2/src/window.c +--- xarchiver-0.5.2.orig/src/window.c 2014-01-24 08:10:09.305990000 +0100 ++++ xarchiver-0.5.2/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)) +@@ -2766,6 +2769,15 @@ + /* The selected entry it's not a dir so extract it to the tmp dir and send it to xa_determine_program_to_run() */ + else + { ++ if (entry->is_encrypted) ++ { ++ if (archive->passwd == NULL) ++ { ++ archive->passwd = xa_create_password_dialog(archive); ++ if (archive->passwd == NULL) ++ return; ++ } ++ } + if (archive->extraction_path) + { + dummy = g_strdup(archive->extraction_path); diff --git a/pcr/youtube-dl-current/PKGBUILD b/pcr/youtube-dl-current/PKGBUILD index 856d909e2..ac9e45365 100644 --- a/pcr/youtube-dl-current/PKGBUILD +++ b/pcr/youtube-dl-current/PKGBUILD @@ -5,7 +5,7 @@ pkgname=youtube-dl-current _pkgname=youtube-dl provides=(youtube-dl) -pkgver=2014.01.23.2 +pkgver=2014.01.23.4 pkgrel=1 pkgdesc="A small command-line program to download videos from YouTube.com and a few more sites" arch=('any') @@ -28,5 +28,5 @@ package() { "${pkgdir}/usr/share/bash-completion/completions/youtube-dl" install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE" } -md5sums=('4be7593dfe2a7d1db6c08e5543b0e2e0' +md5sums=('d9e89ffc9ff572317151e22cac4b3a00' 'SKIP') -- cgit v1.2.3-54-g00ecf