From 2f8045ba14153d1665148e3cff527ce4f6bf66e5 Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Thu, 20 Feb 2014 03:34:20 +0000 Subject: Thu Feb 20 03:30:17 UTC 2014 --- community/libfm/PKGBUILD | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'community/libfm/PKGBUILD') diff --git a/community/libfm/PKGBUILD b/community/libfm/PKGBUILD index a0df8bccd..454759025 100644 --- a/community/libfm/PKGBUILD +++ b/community/libfm/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 105876 2014-02-17 13:45:08Z bpiotrowski $ +# $Id: PKGBUILD 105946 2014-02-19 18:06:55Z bgyorgy $ # Maintainer: Bartłomiej Piotrowski # Contributor: Unknown47 # Contributor: Angel Velasquez # Contributor: Juergen Hoetzel pkgname=libfm -pkgver=1.1.4 -pkgrel=1 +pkgver=1.2.0 +pkgrel=2 pkgdesc='Library for file management' url='http://pcmanfm.sourceforge.net/' arch=('i686' 'x86_64') @@ -14,9 +14,10 @@ license=('GPL') groups=('lxde') depends=('gtk2' 'menu-cache' 'udisks' 'desktop-file-utils' 'libexif') makedepends=('intltool') +replaces=('lxshortcut') install=libfm.install source=(http://downloads.sourceforge.net/pcmanfm/libfm-$pkgver.tar.xz) -md5sums=('fd3ff9174e097ab3fd619e4a10fd822a') +md5sums=('07d1361bc008db46b0fd4c775f5696de') build() { cd $pkgname-$pkgver -- cgit v1.2.3-54-g00ecf From 96cf9235f114b8d960c16a8625937b16979ae1aa Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Fri, 21 Feb 2014 03:34:10 +0000 Subject: Fri Feb 21 03:31:53 UTC 2014 --- community/dbmail/PKGBUILD | 4 +- community/gdal/PKGBUILD | 34 +- community/libfm/PKGBUILD | 8 +- community/libfreexl/PKGBUILD | 26 + community/libftdi/PKGBUILD | 21 +- community/libmediainfo/PKGBUILD | 6 +- community/libspatialite/PKGBUILD | 27 + community/libzdb/PKGBUILD | 8 +- community/lksctp-tools/PKGBUILD | 6 +- community/mediainfo-gui/PKGBUILD | 8 +- community/mediainfo/PKGBUILD | 6 +- community/minitube/PKGBUILD | 18 +- community/minitube/minitube-missing-locale.patch | 12 - community/qingy/PKGBUILD | 36 -- community/qingy/qingy.install | 20 - community/qingy/qingy.logrotate | 9 - community/qingy/qingy@.service | 21 - community/roxterm/PKGBUILD | 8 +- community/yagf/PKGBUILD | 10 +- cross/xtensa-unknown-elf-binutils/PKGBUILD | 25 +- cross/xtensa-unknown-elf-gcc/PKGBUILD | 21 +- extra/easytag/PKGBUILD | 8 +- ...tag-2.1.8-fix_mixed_declarations_and_code.patch | 43 -- extra/gnome-shell/PKGBUILD | 6 +- extra/gparted/PKGBUILD | 8 +- extra/gptfdisk/PKGBUILD | 16 +- extra/mercurial/PKGBUILD | 7 +- extra/mutter-wayland/PKGBUILD | 8 +- extra/mutter/PKGBUILD | 6 +- extra/nasm/PKGBUILD | 6 +- extra/postgresql-old-upgrade/PKGBUILD | 8 +- extra/postgresql/PKGBUILD | 10 +- extra/python-zope-interface/PKGBUILD | 55 +++ extra/xfburn/PKGBUILD | 44 +- extra/xfburn/fix_empty_dir_segfault.diff | 48 -- extra/xmlto/PKGBUILD | 6 +- libre-multilib/pcsx2-libre/PKGBUILD | 14 +- libre/ath9k-htc-firmware/PKGBUILD | 7 +- libre/qupzilla-libre/PKGBUILD | 19 +- libre/xarchiver-libre/PKGBUILD | 80 +-- .../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-fix_7z_support.patch | 110 ----- .../xarchiver-0.5.2-no-donators-menu.patch | 50 -- .../xarchiver-libre/xarchiver-0.5.2-rpm2cpio.patch | 84 ---- .../xarchiver-0.5.2-segfault-delete-file.patch | 21 - .../xarchiver-0.5.2-segfault-open-with.patch | 15 - ...rchiver-0.5.2-segfault-password-protected.patch | 43 -- .../xarchiver-0.5.3-add-mime-types.patch | 9 + .../xarchiver-0.5.3-add-unar-support.patch | 545 +++++++++++++++++++++ .../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 ++++ 57 files changed, 1038 insertions(+), 1589 deletions(-) create mode 100644 community/libfreexl/PKGBUILD create mode 100644 community/libspatialite/PKGBUILD delete mode 100644 community/minitube/minitube-missing-locale.patch delete mode 100644 community/qingy/PKGBUILD delete mode 100644 community/qingy/qingy.install delete mode 100644 community/qingy/qingy.logrotate delete mode 100644 community/qingy/qingy@.service delete mode 100644 extra/easytag/easytag-2.1.8-fix_mixed_declarations_and_code.patch create mode 100644 extra/python-zope-interface/PKGBUILD delete mode 100644 extra/xfburn/fix_empty_dir_segfault.diff delete mode 100644 libre/xarchiver-libre/xarchiver-0.5.2-add_mime_types.patch delete mode 100644 libre/xarchiver-libre/xarchiver-0.5.2-add_unar_support.patch delete mode 100644 libre/xarchiver-libre/xarchiver-0.5.2-add_xz_support.patch delete mode 100644 libre/xarchiver-libre/xarchiver-0.5.2-drag-n-drop_escaped_path.patch delete mode 100644 libre/xarchiver-libre/xarchiver-0.5.2-fix-double-escaping.patch delete mode 100644 libre/xarchiver-libre/xarchiver-0.5.2-fix-non-existent-archive.patch delete mode 100644 libre/xarchiver-libre/xarchiver-0.5.2-fix_7z_support.patch delete mode 100644 libre/xarchiver-libre/xarchiver-0.5.2-no-donators-menu.patch delete mode 100644 libre/xarchiver-libre/xarchiver-0.5.2-rpm2cpio.patch delete mode 100644 libre/xarchiver-libre/xarchiver-0.5.2-segfault-delete-file.patch delete mode 100644 libre/xarchiver-libre/xarchiver-0.5.2-segfault-open-with.patch delete mode 100644 libre/xarchiver-libre/xarchiver-0.5.2-segfault-password-protected.patch create mode 100644 libre/xarchiver-libre/xarchiver-0.5.3-add-mime-types.patch create mode 100644 libre/xarchiver-libre/xarchiver-0.5.3-add-unar-support.patch create mode 100644 libre/xarchiver-libre/xarchiver-0.5.3-fix-double-escaping.patch create mode 100644 libre/xarchiver-libre/xarchiver-0.5.3-fix-password-protected.patch create mode 100644 libre/xarchiver-libre/xarchiver-0.5.3-fix-rpm-support.patch (limited to 'community/libfm/PKGBUILD') diff --git a/community/dbmail/PKGBUILD b/community/dbmail/PKGBUILD index 5c4c4cd2e..c4879af58 100644 --- a/community/dbmail/PKGBUILD +++ b/community/dbmail/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 105591 2014-02-10 18:05:32Z spupykin $ +# $Id: PKGBUILD 105965 2014-02-20 09:01:49Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Sebastian Faltoni pkgname=dbmail pkgver=3.1.10 -pkgrel=2 +pkgrel=3 pkgdesc="Fast and scalable sql based mail services" arch=('i686' 'x86_64') depends=('gmime' 'libzdb' 'mhash' 'libevent') diff --git a/community/gdal/PKGBUILD b/community/gdal/PKGBUILD index 4dbdfe523..74f1b5992 100644 --- a/community/gdal/PKGBUILD +++ b/community/gdal/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 103623 2014-01-08 12:17:02Z bgyorgy $ +# $Id: PKGBUILD 105990 2014-02-20 18:15:10Z bgyorgy $ # Maintainer: Jaroslav Lichtblau # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org # Contributor: William Rea pkgname=gdal pkgver=1.10.1 -pkgrel=1 +pkgrel=2 pkgdesc="A translator library for raster geospatial data formats" arch=('i686' 'x86_64') url="http://www.gdal.org/" license=('custom') -depends=('curl' 'geos' 'giflib' 'hdf5' 'libgeotiff' 'libjpeg' 'libpng' 'libtiff' 'netcdf' 'poppler' 'python2' 'python2-numpy' 'cfitsio' 'sqlite' 'libmariadbclient' 'postgresql-libs') -makedepends=('perl' 'swig' 'chrpath') +depends=('curl' 'geos' 'giflib' 'hdf5' 'libgeotiff' 'libjpeg' 'libpng' 'libspatialite' 'libtiff' 'netcdf' 'poppler' 'python2' 'python2-numpy' 'cfitsio' 'sqlite' 'libmariadbclient' 'postgresql-libs') +makedepends=('perl' 'swig' 'chrpath' 'doxygen') optdepends=('postgresql: postgresql database support' 'mariadb: mariadb database support' 'perl: perl binding support' @@ -22,12 +22,7 @@ source=(http://download.osgeo.org/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar. sha256sums=('9984f0314c0bd831eb59fb646c2bc5e13cf1378be4f51499045166cbe62be6ea' '55a0a961b2d1caddf80f18b6763a96690b0b6443fbd5a0c89e29503ded3bcea6') -build() { - export CFLAGS="$CFLAGS -fno-strict-aliasing" - -# bug 23654 - export LDFLAGS="$LDFLAGS -Wl,--as-needed" - +prepare() { cd "${srcdir}/$pkgname-$pkgver" patch -Np0 -i "${srcdir}/gdal-1.5.1-python-install.patch" @@ -37,27 +32,40 @@ build() { sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file done +# Fix mandir + sed -i "s|^mandir=.*|mandir='\${prefix}/share/man'|" configure +} + +build() { + cd "${srcdir}/$pkgname-$pkgver" + export CFLAGS="$CFLAGS -fno-strict-aliasing" + +# bug 23654 + export LDFLAGS="$LDFLAGS -Wl,--as-needed" + ./configure --prefix=/usr --with-netcdf --with-libtiff --with-sqlite3 \ - --with-geotiff --with-mysql --with-python --without-libtool --with-curl \ - --with-hdf5 --with-perl --with-geos --with-png --with-poppler + --with-geotiff --with-mysql --with-python --with-curl \ + --with-hdf5 --with-perl --with-geos --with-png --with-poppler --with-spatialite # workaround for bug #13646 sed -i 's/PY_HAVE_SETUPTOOLS=1/PY_HAVE_SETUPTOOLS=/g' ./GDALmake.opt sed -i 's/EXE_DEP_LIBS/KILL_EXE_DEP_LIBS/' apps/GNUmakefile make + make man } package () { cd "${srcdir}/$pkgname-$pkgver" - install -d "${pkgdir}/usr/lib/python2.7/site-packages/" make DESTDIR="${pkgdir}" install + make DESTDIR="${pkgdir}" install-man # install license install -D -m644 LICENSE.TXT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" #FS15477 clean up junks rm -f "${pkgdir}"/usr/bin/*.dox + rm -f "${pkgdir}"/usr/share/man/man1/_build_gdal_src_gdal-${pkgver}_apps_.1 # Remove RPATH chrpath --delete "${pkgdir}"/usr/lib/perl5/${CARCH}-linux-thread-multi/auto/Geo/OSR/OSR.so diff --git a/community/libfm/PKGBUILD b/community/libfm/PKGBUILD index 454759025..8e7fff94f 100644 --- a/community/libfm/PKGBUILD +++ b/community/libfm/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 105946 2014-02-19 18:06:55Z bgyorgy $ +# $Id: PKGBUILD 105979 2014-02-20 12:14:35Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski # Contributor: Unknown47 # Contributor: Angel Velasquez @@ -6,15 +6,17 @@ pkgname=libfm pkgver=1.2.0 -pkgrel=2 +pkgrel=3 pkgdesc='Library for file management' url='http://pcmanfm.sourceforge.net/' arch=('i686' 'x86_64') license=('GPL') groups=('lxde') depends=('gtk2' 'menu-cache' 'udisks' 'desktop-file-utils' 'libexif') -makedepends=('intltool') +makedepends=('intltool' 'gtk-doc') replaces=('lxshortcut') +provides=('lxshortcut') +conflicts=('lxshortcut') install=libfm.install source=(http://downloads.sourceforge.net/pcmanfm/libfm-$pkgver.tar.xz) md5sums=('07d1361bc008db46b0fd4c775f5696de') diff --git a/community/libfreexl/PKGBUILD b/community/libfreexl/PKGBUILD new file mode 100644 index 000000000..175bbed9e --- /dev/null +++ b/community/libfreexl/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 105987 2014-02-20 17:40:58Z bgyorgy $ +# Maintainer: Jaroslav Lichtblau +# Contributor: Brian Galey +# Contributor: Bruno Gola + +pkgname=libfreexl +pkgver=1.0.0g +pkgrel=2 +pkgdesc="Library to extract valid data from within an Excel (.xls) spreadsheet" +arch=('i686' 'x86_64') +url="https://www.gaia-gis.it/fossil/freexl‎" +license=('MPL' 'GPL' 'LGPL') +depends=('glibc') +source=("http://www.gaia-gis.it/gaia-sins//${pkgname/lib/}-$pkgver.tar.gz") +sha256sums=('cf2b110f5fc7089fa61c7421f59caa4125b13087b4686ed82dba7abedf2ec266') + +build() { + cd "$srcdir/${pkgname/lib/}-$pkgver" + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/${pkgname/lib/}-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/community/libftdi/PKGBUILD b/community/libftdi/PKGBUILD index 23ff6bc06..b96b62549 100644 --- a/community/libftdi/PKGBUILD +++ b/community/libftdi/PKGBUILD @@ -1,15 +1,17 @@ -# $Id: PKGBUILD 105529 2014-02-09 17:42:22Z kkeen $ +# $Id: PKGBUILD 105985 2014-02-20 16:15:43Z kkeen $ # Maintainer: Kyle Keen pkgname=libftdi pkgver=1.1 -pkgrel=2 -pkgdesc="A library to talk to FTDI chips" +pkgrel=3 +pkgdesc="A library to talk to FTDI chips, optional python bindings." arch=('i686' 'x86_64') url="http://www.intra2net.com/en/developer/libftdi/download.php" license=('GPL2' 'LGPL2.1') depends=('libusbx') -makedepends=('boost' 'cmake') +optdepends=('python: library bindings') +makedepends=('boost' 'cmake' 'python' 'swig') +# doxygen for docs, confuse for eeprom source=(http://www.intra2net.com/en/developer/libftdi/download/${pkgname}1-$pkgver.tar.bz2{,.sig}) sha1sums=('f05ade5614aa31e64f91a30ce3782f7ca3704d18' 'SKIP') @@ -20,15 +22,22 @@ prepare() { } build() { - cd "${pkgname}1-$pkgver" - mkdir build + cd "$srcdir/${pkgname}1-$pkgver" + mkdir -p build cd build cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_SKIP_BUILD_RPATH=ON \ -DCMAKE_BUILD_TYPE=Release -DEXAMPLES=OFF -DFTDI_EEPROM=OFF make } +# needs yet unknown dependencies +#check() { +# cd "$srcdir/${pkgname}1-$pkgver/build" +# make check +#} + package() { cd "${pkgname}1-$pkgver/build" make DESTDIR="$pkgdir" install } + diff --git a/community/libmediainfo/PKGBUILD b/community/libmediainfo/PKGBUILD index 9427d8834..39be1d8a8 100644 --- a/community/libmediainfo/PKGBUILD +++ b/community/libmediainfo/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 101323 2013-11-22 17:32:16Z spupykin $ +# $Id: PKGBUILD 105967 2014-02-20 09:02:05Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: hydro pkgname=libmediainfo -pkgver=0.7.65 +pkgver=0.7.67 pkgrel=1 pkgdesc="shared library for mediainfo" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=( 'curl' 'libmms' 'libzen') makedepends=('libtool' 'automake' 'autoconf') source=(http://downloads.sourceforge.net/mediainfo/${pkgname}_${pkgver}.tar.bz2 libmediainfo-0.7.50-libmms.patch) -md5sums=('51f62420b58a61c27ec9406e82ab3999' +md5sums=('c6372a176f45a9971740b46c652f65eb' '2f4b21cc250f663d52b497dedb963e3b') build() { diff --git a/community/libspatialite/PKGBUILD b/community/libspatialite/PKGBUILD new file mode 100644 index 000000000..d9d3e4dcc --- /dev/null +++ b/community/libspatialite/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 105988 2014-02-20 17:46:02Z bgyorgy $ +# Maintainer: Jaroslav Lichtblau +# Contributor: Brian Galey +# Contributor: Pietro Zambelli + +pkgname=libspatialite +pkgver=4.1.1 +pkgrel=4 +pkgdesc="SQLite extension to support spatial data types and operations" +arch=('i686' 'x86_64') +url="https://www.gaia-gis.it/fossil/libspatialite" +license=('MPL' 'GPL' 'LGPL') +depends=('geos' 'libfreexl' 'libxml2' 'proj' 'sqlite3') +source=("http://www.gaia-gis.it/gaia-sins/$pkgname-$pkgver.tar.gz") +sha256sums=('0481a20af952f4a38c9dbb10f37fd38c45f16c50397f8da0079e02435b9b910f') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr \ + --enable-libxml2 + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/community/libzdb/PKGBUILD b/community/libzdb/PKGBUILD index 42d2fc23c..8467cab1b 100644 --- a/community/libzdb/PKGBUILD +++ b/community/libzdb/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 100245 2013-11-02 08:41:34Z spupykin $ +# $Id: PKGBUILD 105969 2014-02-20 09:02:23Z spupykin $ # Maintainer: Sergej Pupykin pkgname=libzdb -pkgver=2.12 -pkgrel=2 +pkgver=3.0 +pkgrel=1 pkgdesc="Zild Database Library" arch=('i686' 'x86_64') url="http://www.tildeslash.com/libzdb/" license=('GPL') depends=('postgresql-libs' 'sqlite' 'libmariadbclient') source=(http://www.tildeslash.com/libzdb/dist/libzdb-$pkgver.tar.gz) -md5sums=('dd95114cae471d1b5dfda1f263b222c1') +md5sums=('3bb9efff10a1f3ebc5b76c1055c48635') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/lksctp-tools/PKGBUILD b/community/lksctp-tools/PKGBUILD index 17d9f37db..78655c8ae 100644 --- a/community/lksctp-tools/PKGBUILD +++ b/community/lksctp-tools/PKGBUILD @@ -3,15 +3,15 @@ # Contributer: Nicolas Martyanoff pkgname=lksctp-tools -pkgver=1.0.15 -pkgrel=2 +pkgver=1.0.16 +pkgrel=1 pkgdesc='An implementation of the SCTP protocol' arch=('i686' 'x86_64') url='http://lksctp.sourceforge.net/' license=('GPL2' 'LGPL2.1') depends=('bash') source=("http://downloads.sourceforge.net/sourceforge/lksctp/$pkgname-$pkgver.tar.gz") -md5sums=('d829677541fb41061e7f4d61f8413b07') +md5sums=('708bb0b5a6806ad6e8d13c55b067518e') build() { cd $pkgname-$pkgver diff --git a/community/mediainfo-gui/PKGBUILD b/community/mediainfo-gui/PKGBUILD index ae1e1e043..221b9be17 100644 --- a/community/mediainfo-gui/PKGBUILD +++ b/community/mediainfo-gui/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 103859 2014-01-12 19:04:40Z eric $ +# $Id: PKGBUILD 105973 2014-02-20 09:02:55Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: hydro pkgname=mediainfo-gui -pkgver=0.7.65 -pkgrel=6 +pkgver=0.7.67 +pkgrel=1 pkgdesc="GUI for mediainfo" arch=('i686' 'x86_64') url="http://mediainfo.sourceforge.net" @@ -12,7 +12,7 @@ license=('GPL') depends=('libmediainfo' 'wxgtk' 'libsm' 'desktop-file-utils') install=mediainfo-gui.install source=(http://downloads.sourceforge.net/mediainfo/mediainfo_${pkgver}.tar.bz2) -md5sums=('19d7992a7d0cba0f5f731f993e8c537c') +md5sums=('480ac31a4080737f21937f9d260b96de') build() { cd MediaInfo/Project/GNU/GUI diff --git a/community/mediainfo/PKGBUILD b/community/mediainfo/PKGBUILD index 9c262984d..ead0872f2 100644 --- a/community/mediainfo/PKGBUILD +++ b/community/mediainfo/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 101325 2013-11-22 17:32:35Z spupykin $ +# $Id: PKGBUILD 105971 2014-02-20 09:02:40Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: hydro pkgname=mediainfo -pkgver=0.7.65 +pkgver=0.7.67 pkgrel=1 pkgdesc="supplies technical and tag information about a video or audio file" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('GPL') depends=('libmediainfo') makedepends=('libtool' 'automake' 'autoconf') source=(http://downloads.sourceforge.net/mediainfo/${pkgname}_${pkgver}.tar.bz2) -md5sums=('19d7992a7d0cba0f5f731f993e8c537c') +md5sums=('480ac31a4080737f21937f9d260b96de') build() { cd $srcdir/MediaInfo/Project/GNU/CLI diff --git a/community/minitube/PKGBUILD b/community/minitube/PKGBUILD index 890373335..eb670c93c 100644 --- a/community/minitube/PKGBUILD +++ b/community/minitube/PKGBUILD @@ -1,26 +1,18 @@ -# $Id: PKGBUILD 103290 2014-01-02 16:08:02Z speps $ +# $Id: PKGBUILD 105996 2014-02-20 19:25:26Z speps $ # Maintainer : speps # Contributor: Andrea Scarpino pkgname=minitube -pkgver=2.1.5 +pkgver=2.1.6 pkgrel=1 pkgdesc="A native YouTube client in Qt. Watch YouTube videos without Flash Player" arch=('i686' 'x86_64') url='http://flavio.tordini.org/minitube' license=('GPL3') -depends=('phonon') +depends=('phonon-qt4') install="$pkgname.install" -source=("http://flavio.tordini.org/files/$pkgname/$pkgname-$pkgver.tar.gz" - "$pkgname-missing-locale.patch") -md5sums=('e52933f3ae5200f83aa39ac71ac13bfb' - '70cdaa1d3df700cf90243be5a0d55443') - -prepare() { - cd $pkgname - # remove missing translations - patch -p1 -i ../${source[1]} -} +source=("http://flavio.tordini.org/files/$pkgname/$pkgname-1.2.6.tar.gz") # tagging mismatch +md5sums=('b5a7794cad661d47e0e856b864f774af') build() { cd $pkgname diff --git a/community/minitube/minitube-missing-locale.patch b/community/minitube/minitube-missing-locale.patch deleted file mode 100644 index 5288120e4..000000000 --- a/community/minitube/minitube-missing-locale.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -aur minitube/locale/locale.pri minitube.patched/locale/locale.pri ---- minitube/locale/locale.pri 2013-12-19 00:37:27.000000000 +0100 -+++ minitube.patched/locale/locale.pri 2013-12-25 00:03:56.783943888 +0100 -@@ -4,7 +4,7 @@ - DEPENDPATH += $$PWD - - # ls -1 *.ts | tr '\n' ' ' --TRANSLATIONS += ar.ts ast.ts be.ts bg_BG.ts ca.ts ca_ES.ts cs_CZ.ts da.ts de_DE.ts el.ts en.ts es.ts es_AR.ts es_ES.ts es_MX.ts fi.ts fi_FI.ts fr.ts gl.ts he_IL.ts hr.ts hu.ts ia.ts it.ts ja_JP.ts ky.ts ms_MY.ts nb.ts nl.ts pl.ts pl_PL.ts pt.ts pt_BR.ts ro.ts ru.ts sk.ts sl.ts sq.ts sv_SE.ts tr.ts uk.ts uk_UA.ts vi.ts zh_CN.ts zh_TW.ts -+TRANSLATIONS += ar.ts ast.ts bg_BG.ts ca.ts cs_CZ.ts da.ts de_DE.ts el.ts en.ts es.ts es_AR.ts es_ES.ts fi.ts fi_FI.ts fr.ts gl.ts he_IL.ts hu.ts ia.ts it.ts ja_JP.ts ky.ts ms_MY.ts nb.ts nl.ts pl.ts pl_PL.ts pt_BR.ts ro.ts ru.ts sk.ts sl.ts sq.ts sv_SE.ts tr.ts uk.ts uk_UA.ts zh_CN.ts zh_TW.ts - isEmpty(QMAKE_LRELEASE) { - win32:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\lrelease.exe - else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease diff --git a/community/qingy/PKGBUILD b/community/qingy/PKGBUILD deleted file mode 100644 index 1ed0df641..000000000 --- a/community/qingy/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 99973 2013-10-31 02:46:37Z allan $ -# Maintainer: Eric Bélanger -# Contributor: Jaroslav Lichtblau - -pkgname=qingy -pkgver=1.0.0 -pkgrel=9 -pkgdesc="A DirectFB getty replacement" -arch=('i686' 'x86_64') -url="http://qingy.sourceforge.net/" -license=('GPL') -depends=('directfb' 'openssl' 'libxss') -makedepends=('emacs') -backup=('etc/pam.d/qingy' 'etc/logrotate.d/qingy' 'etc/qingy/settings' 'etc/qingy/welcomes') -install=qingy.install -source=(http://downloads.sourceforge.net/sourceforge/qingy/${pkgname}-${pkgver}.tar.bz2 \ - qingy.logrotate qingy@.service) -sha1sums=('22ee505e935bf7ddcbd33e23f754a5a1ca082c81' - '21676cf0b71334c666f7b3e4f3d8b4f319266c81' - '43a6f1cee03ffa598a77cb3c333cb1e8c63b4a2c') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - sed -i 's|/lib/security/||' media/pam/default/qingy - XFREE=/usr/bin/Xorg XINIT=/usr/bin/xinit \ - ./configure --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc \ - --enable-emacs --disable-optimizations --disable-static - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -D -m644 "${srcdir}/qingy.logrotate" "${pkgdir}/etc/logrotate.d/qingy" - install -D -m644 "${srcdir}/qingy@.service" "${pkgdir}/usr/lib/systemd/system/qingy@.service" -} diff --git a/community/qingy/qingy.install b/community/qingy/qingy.install deleted file mode 100644 index 0defe31d8..000000000 --- a/community/qingy/qingy.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=usr/share/info -filelist=(qingy.info.gz) - -post_install() { - [[ -x usr/bin/install-info ]] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ -x usr/bin/install-info ]] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file $infodir/dir 2> /dev/null - done -} diff --git a/community/qingy/qingy.logrotate b/community/qingy/qingy.logrotate deleted file mode 100644 index e16fb8d2a..000000000 --- a/community/qingy/qingy.logrotate +++ /dev/null @@ -1,9 +0,0 @@ -/var/log/qingy.log { - compress - rotate 1 - size=+1024k - notifempty - missingok - copytruncate - noolddir -} diff --git a/community/qingy/qingy@.service b/community/qingy/qingy@.service deleted file mode 100644 index 537eb53fd..000000000 --- a/community/qingy/qingy@.service +++ /dev/null @@ -1,21 +0,0 @@ -[Unit] -Description=Qingy on %I -Documentation=info:qingy -After=systemd-user-sessions.service plymouth-quit-wait.service - -[Service] -Environment=TERM=linux -ExecStart=/usr/bin/qingy %I -n -Type=idle -Restart=always -RestartSec=0 -UtmpIdentifier=%I -TTYPath=/dev/%I -TTYReset=yes -TTYVHangup=yes -TTYVTDisallocate=yes -KillMode=process -IgnoreSIGPIPE=no - -[Install] -Alias=getty.target.wants/qingy@tty1.service diff --git a/community/roxterm/PKGBUILD b/community/roxterm/PKGBUILD index 95892cc10..a9caa0df2 100644 --- a/community/roxterm/PKGBUILD +++ b/community/roxterm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 105882 2014-02-17 19:03:35Z ttoepper $ +# $Id: PKGBUILD 106002 2014-02-20 21:13:47Z ttoepper $ # Maintainer: Thorsten Töpper # Contributor: Alexander Fehr pkgname=roxterm pkgver=2.8.2 -pkgrel=1 +pkgrel=2 pkgdesc='Tabbed, VTE-based terminal emulator' arch=('i686' 'x86_64') url='http://roxterm.sourceforge.net/' @@ -23,7 +23,9 @@ sha1sums=('fcde0b09f6ff02c5ec93a528e870e139d814b529' build() { cd "${srcdir}/roxterm-${pkgver}" - python2 mscript.py configure --prefix='/usr' + # FS#38967: Reenable deprecated VTE3 functions + python2 mscript.py configure --prefix='/usr' \ + --enable-deprecated-bg-opts python2 mscript.py build } diff --git a/community/yagf/PKGBUILD b/community/yagf/PKGBUILD index a810ad8c5..369ee25a1 100644 --- a/community/yagf/PKGBUILD +++ b/community/yagf/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 85428 2013-03-01 10:43:02Z andrea $ +# $Id: PKGBUILD 105975 2014-02-20 09:03:10Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: das-ich pkgname=yagf -pkgver=0.9.2 -pkgrel=3 -pkgdesc="QT4-based GUI for Cuneiform and Tesseract OCRs" +pkgver=0.9.3 +pkgrel=1 +pkgdesc="Qt4-based GUI for Cuneiform and Tesseract OCRs" arch=(i686 x86_64) url="http://symmetrica.net/cuneiform-linux/yagf-en.html" license=('GPL') @@ -16,7 +16,7 @@ optdepends=('cuneiform: recognition tool' makedepends=('cmake') install=yagf.install source=(http://symmetrica.net/cuneiform-linux/${pkgname}-${pkgver}.tar.gz) -md5sums=('13592e52006d20f71c0094aafb13ed0e') +md5sums=('54549f1daef831ca88532b450a9cf1d9') build() { cd "${srcdir}/${pkgname}-$pkgver" diff --git a/cross/xtensa-unknown-elf-binutils/PKGBUILD b/cross/xtensa-unknown-elf-binutils/PKGBUILD index 7b864eeb6..76d6bda78 100644 --- a/cross/xtensa-unknown-elf-binutils/PKGBUILD +++ b/cross/xtensa-unknown-elf-binutils/PKGBUILD @@ -1,20 +1,23 @@ # $Id: PKGBUILD 182407 2013-04-10 07:34:20Z allan $ # Maintainer: Allan McRae # Maintainer (Parabola): André Silva -# Maintainer (Parabola): Márcio Silva +# Maintainer (Parabola): Márcio Silva +# Contributor (Parabola): Taro _pkgname=binutils _target="xtensa-unknown-elf" pkgname=${_target}-${_pkgname} pkgver=2.23.2 -pkgrel=2.5 +pkgrel=2.7 pkgdesc="A set of programs to assemble and manipulate binary and object files for the Xtensa architecture" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/binutils/" license=('GPL') groups=("${_target}-base-devel") depends=('glibc>=2.17' 'zlib') +conflicts=binutils +provides="binutils=2.24" options=('!libtool' '!distcc' '!ccache') install=${_target}-binutils.install source=(ftp://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.bz2{,.sig} @@ -70,4 +73,22 @@ package() { rm $pkgdir/usr/lib/libiberty.a rm $pkgdir/usr/$CHOST/${_target}/include/* && rmdir $pkgdir/usr/$CHOST/${_target}/include rm $pkgdir/usr/share/info/* && rmdir $pkgdir/usr/share/info + + # many packages expect those symlinks + ln -s ${_target}-addr2line $pkgdir/usr/bin/addr2line + ln -s ${_target}-ar $pkgdir/usr/bin/ar + ln -s ${_target}-as $pkgdir/usr/bin/as + ln -s ${_target}-c++filt $pkgdir/usr/bin/c++filt + ln -s ${_target}-elfedit $pkgdir/usr/bin/elfedit + ln -s ${_target}-gprof $pkgdir/usr/bin/gprof + ln -s ${_target}-ld $pkgdir/usr/bin/ld + ln -s ${_target}-ld.bfd $pkgdir/usr/bin/ld.bfd + ln -s ${_target}-nm $pkgdir/usr/bin/nm + ln -s ${_target}-objcopy $pkgdir/usr/bin/objcopy + ln -s ${_target}-objdump $pkgdir/usr/bin/objdump + ln -s ${_target}-ranlib $pkgdir/usr/bin/ranlib + ln -s ${_target}-readelf $pkgdir/usr/bin/readelf + ln -s ${_target}-size $pkgdir/usr/bin/size + ln -s ${_target}-strings $pkgdir/usr/bin/strings + ln -s ${_target}-strip $pkgdir/usr/bin/strip } diff --git a/cross/xtensa-unknown-elf-gcc/PKGBUILD b/cross/xtensa-unknown-elf-gcc/PKGBUILD index 50d125e8a..2d7364143 100644 --- a/cross/xtensa-unknown-elf-gcc/PKGBUILD +++ b/cross/xtensa-unknown-elf-gcc/PKGBUILD @@ -1,7 +1,8 @@ # $Id: PKGBUILD 186915 2013-05-31 23:25:14Z allan $ # Maintainer: Allan McRae # Maintainer (Parabola): André Silva -# Contributor (Parabola): Márcio Silva +# Maintainer (Parabola): Márcio Silva +# Contributor (Parabola): Taro _pkgname=gcc _target="xtensa-unknown-elf" @@ -9,12 +10,12 @@ _sysroot="/usr/$CHOST/${_target}" pkgname=${_target}-${_pkgname} pkgver=4.8.1 -pkgrel=1.3 +pkgrel=1.5 pkgdesc="The GNU Compiler Collection for the Xtensa architecture" arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL' 'FDL' 'custom') url="http://gcc.gnu.org" -makedepends=("${_target}-binutils>=2.23" 'libmpc' 'cloog' 'gcc-ada' 'doxygen') +makedepends=("binutils>=2.23" 'libmpc' 'cloog' 'gcc-ada' 'doxygen') checkdepends=('dejagnu' 'inetutils') options=('!libtool' '!emptydirs') source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2 @@ -78,6 +79,8 @@ build() { package() { pkgdesc="The GNU Compiler Collection for the Xtensa architecture" depends=("${_target}-binutils>=2.23" 'libmpc' 'cloog') + conflicts=gcc + provides="gcc=4.8.2" groups=("${_target}-devel") install=${_target}-gcc.install @@ -85,8 +88,16 @@ package() { make -j1 DESTDIR=${pkgdir} install-gcc - # many packages expect this symlinks - ln -s ${_target}-gcc ${pkgdir}/usr/bin/${_target}-cc + # many packages expect those symlinks + ln -s ${_target}-gcc ${pkgdir}/usr/bin/${_target}-cc + ln -s ${_target}-gcc ${pkgdir}/usr/bin/cc + ln -s ${_target}-cpp ${pkgdir}/usr/bin/cpp + ln -s ${_target}-gcc ${pkgdir}/usr/bin/gcc + ln -s ${_target}-gcc-4.8.1 ${pkgdir}/usr/bin/gcc-4.8.1 + ln -s ${_target}-gcc-ar ${pkgdir}/usr/bin/gcc-ar + ln -s ${_target}-gcc-nm ${pkgdir}/usr/bin/gcc-nm + ln -s ${_target}-gcc-ranlib ${pkgdir}/usr/bin/gcc-ranlib + ln -s ${_target}-gcov ${pkgdir}/usr/bin/gcov # Remove unnecessary files and folders rm $pkgdir/usr/share/info/* && rmdir $pkgdir/usr/share/info diff --git a/extra/easytag/PKGBUILD b/extra/easytag/PKGBUILD index f7a1916c4..fe517e1ba 100644 --- a/extra/easytag/PKGBUILD +++ b/extra/easytag/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 203446 2014-01-10 22:37:23Z guillaume $ +# $Id: PKGBUILD 206159 2014-02-20 12:56:10Z guillaume $ # Maintainer: Guillaume ALAUX # Contributor: Kevin Piche # Contributor: Aaron Griffin # Contributor: dorphell pkgname=easytag -pkgver=2.1.9 +pkgver=2.1.10 pkgrel=1 pkgdesc='Utility for viewing and editing tags for most audio formats' arch=('i686' 'x86_64') @@ -16,7 +16,9 @@ depends=('id3lib' 'libid3tag' 'gtk2' 'libvorbis' 'flac' 'speex' 'wavpack' 'tagli 'desktop-file-utils' 'hicolor-icon-theme') install=${pkgname}.install source=(http://download.gnome.org/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('f5a6e742a458ef6f48f2d5e98a24182a9c87a213e847fcce75c757ac90273501') +sha256sums=('fe73a27aa4ad0a2ddc183a84d923ac214aeaf4a5752cb8640a2f840d9dd023d9') + +# TODO either 'svn delete' patch about mime or add it back here build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/easytag/easytag-2.1.8-fix_mixed_declarations_and_code.patch b/extra/easytag/easytag-2.1.8-fix_mixed_declarations_and_code.patch deleted file mode 100644 index ff7a52a94..000000000 --- a/extra/easytag/easytag-2.1.8-fix_mixed_declarations_and_code.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- src/wavpack_tag.c -+++ src/wavpack_tag.c -@@ -82,15 +82,15 @@ gboolean Wavpack_Tag_Write_File (FILE *file_in, gchar *filename_in, vcedit_state - */ - gboolean Wavpack_Tag_Read_File_Tag (gchar *filename, File_Tag *FileTag) - { -- if (!filename || !FileTag) -- return FALSE; -- - WavpackContext *wpc; - gchar *field, *field2; - guint length; - - int open_flags = OPEN_TAGS; - -+ if (!filename || !FileTag) -+ return FALSE; -+ - wpc = WavpackOpenFileInput(filename, NULL, open_flags, 0); - - if ( wpc == NULL ) { -@@ -271,9 +271,6 @@ gboolean Wavpack_Tag_Read_File_Tag (gchar *filename, File_Tag *FileTag) - - gboolean Wavpack_Tag_Write_File_Tag (ET_File *ETFile) - { -- if (!ETFile || !ETFile->FileTag) -- return FALSE; -- - WavpackContext *wpc; - - gchar *filename = ((File_Name *)((GList *)ETFile->FileNameCur)->data)->value; -@@ -282,6 +279,9 @@ gboolean Wavpack_Tag_Write_File_Tag (ET_File *ETFile) - - int open_flags = OPEN_EDIT_TAGS; - -+ if (!ETFile || !ETFile->FileTag) -+ return FALSE; -+ - wpc = WavpackOpenFileInput(filename, NULL, open_flags, 0); - - if ( wpc == NULL ) { --- -cgit v0.9.1 diff --git a/extra/gnome-shell/PKGBUILD b/extra/gnome-shell/PKGBUILD index 7e5d71aec..02af2218e 100644 --- a/extra/gnome-shell/PKGBUILD +++ b/extra/gnome-shell/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 204299 2014-01-16 21:00:27Z heftig $ +# $Id: PKGBUILD 206149 2014-02-20 09:00:15Z heftig $ # Maintainer: Ionut Biru # Contributor: Flamelab # Contributor: Andrew Simmons # Contributor: György Balló pkgname=gparted -pkgver=0.17.0 -pkgrel=2 +pkgver=0.18.0 +pkgrel=1 pkgdesc="A Partition Magic clone, frontend to GNU Parted" arch=('i686' 'x86_64') url="http://gparted.sourceforge.net" @@ -28,7 +28,7 @@ install=gparted.install source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.bz2" 'org.archlinux.pkexec.gparted.policy' 'gparted_polkit') -md5sums=('ecd66491bb2061c6aa6077cc24823b9e' +md5sums=('c4c928de08519c923abaa5a099881241' '122ed3120c846376bead22b25f6a3b19' '0b68a4e2bc6bc15440730ebe2d7bf9f6') diff --git a/extra/gptfdisk/PKGBUILD b/extra/gptfdisk/PKGBUILD index 13d8320bf..9db6b6dcf 100644 --- a/extra/gptfdisk/PKGBUILD +++ b/extra/gptfdisk/PKGBUILD @@ -1,32 +1,32 @@ -# $Id: PKGBUILD 196742 2013-10-17 14:02:47Z andyrtr $ +# $Id: PKGBUILD 206141 2014-02-20 07:26:51Z foutrelis $ # Maintainer: Evangelos Foutras # Contributor: Tobias Powalowski # Contributor: Hokum pkgname=gptfdisk -pkgver=0.8.8 -pkgrel=2 -pkgdesc="A text-mode partitioning tool that works on Globally Unique Identifier (GUID) Partition Table (GPT) disks" +pkgver=0.8.9 +pkgrel=1 +pkgdesc="A text-mode partitioning tool that works on GUID Partition Table (GPT) disks" arch=('i686' 'x86_64') url="http://www.rodsbooks.com/gdisk/" license=('GPL2') -depends=('gcc-libs' 'util-linux' 'popt' 'icu') +depends=('gcc-libs' 'util-linux' 'popt') provides=("gdisk=$pkgver") conflicts=('gdisk') replaces=('gdisk') source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz) +sha256sums=('4f7e6199f8b2eae8d4b7f0f65afebac0835331f571605ec70172067bbbd004ca') build() { - cd $pkgname-$pkgver + cd "$srcdir/$pkgname-$pkgver" make } package () { - cd $pkgname-$pkgver + cd "$srcdir/$pkgname-$pkgver" install -d "$pkgdir"/usr/{bin,share/{doc/gdisk,man/man8}} install -t "$pkgdir/usr/bin" {,c,s}gdisk fixparts install -m644 -t "$pkgdir/usr/share/man/man8" {{,c,s}gdisk,fixparts}.8 install -m644 -t "$pkgdir/usr/share/doc/gdisk" README NEWS } -md5sums=('bd47d03ec27bab5613254b5a20f72143') diff --git a/extra/mercurial/PKGBUILD b/extra/mercurial/PKGBUILD index 69a8b20d6..8c9d82e51 100644 --- a/extra/mercurial/PKGBUILD +++ b/extra/mercurial/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 204972 2014-02-02 16:54:39Z giovanni $ +# $Id: PKGBUILD 206155 2014-02-20 12:01:46Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Douglas Soares de Andrade pkgname=mercurial pkgver=2.9 -pkgrel=1 +pkgrel=2 pkgdesc="A scalable distributed SCM tool" arch=('i686' 'x86_64') url="http://mercurial.selenic.com/" @@ -44,4 +44,7 @@ package() { # install configuration file install -m755 -d ${pkgdir}/etc/mercurial install -m644 contrib/sample.hgrc "${pkgdir}/etc/mercurial/hgrc" + + # FS#38825 - Add certs config to package + echo -e "\n[web]\ncacerts = /etc/ssl/certs/ca-certificates.crt" >> "${pkgdir}/etc/mercurial/hgrc" } diff --git a/extra/mutter-wayland/PKGBUILD b/extra/mutter-wayland/PKGBUILD index cb61970d4..1ef8bbb86 100644 --- a/extra/mutter-wayland/PKGBUILD +++ b/extra/mutter-wayland/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 199788 2013-11-16 12:17:37Z heftig $ +# $Id: PKGBUILD 206148 2014-02-20 08:59:56Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) pkgname=mutter-wayland -pkgver=3.10.1 -pkgrel=2 +pkgver=3.10.4 +pkgrel=1 pkgdesc="A Wayland compositor for GNOME" arch=(i686 x86_64) license=(GPL) @@ -15,7 +15,7 @@ install=mutter-wayland.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz mutter-wayland-3.10.0.1-logfile.patch 0001-monitor-expose-min-backlight-step.patch) -sha256sums=('bdb6bcc25791309256b09ec9aa7e0be311ef311778450aafccb86caf2753b6b4' +sha256sums=('2dd625a0e0429a4852ec52ca9a40890d57537d947cc6269a9d85c52987d87828' 'b79866b6b3fa6029b35ef2b5c5d0cb92886ec2ed0173f780c4d46a5b8d9a1644' 'f1ef173d96ac27abdcf765972d2ac434f63bf4629b8bd51c177e8963d07f5eb7') diff --git a/extra/mutter/PKGBUILD b/extra/mutter/PKGBUILD index 2ce5ac7ac..a6aa4f384 100644 --- a/extra/mutter/PKGBUILD +++ b/extra/mutter/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 204298 2014-01-16 20:59:19Z heftig $ +# $Id: PKGBUILD 206147 2014-02-20 08:59:41Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) # Maintainer: Ionut Biru # Contributor: Michael Kanis pkgname=mutter -pkgver=3.10.3 +pkgver=3.10.4 pkgrel=1 pkgdesc="A window manager for GNOME" arch=(i686 x86_64) @@ -17,7 +17,7 @@ options=('!emptydirs') install=mutter.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz 0001-monitor-expose-min-backlight-step.patch) -sha256sums=('7b19eda620d11e0638e3be33455998d65bdee3ff6556b562df937978efb8830c' +sha256sums=('9159c40ea9f5c5e3d1e67cc12ebcbd6328a7b732274195b4e5bdacb3cb1771e6' 'f1ef173d96ac27abdcf765972d2ac434f63bf4629b8bd51c177e8963d07f5eb7') prepare() { diff --git a/extra/nasm/PKGBUILD b/extra/nasm/PKGBUILD index 9d653f380..768338423 100644 --- a/extra/nasm/PKGBUILD +++ b/extra/nasm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 203305 2014-01-07 23:23:24Z eric $ +# $Id: PKGBUILD 206134 2014-02-20 01:03:22Z eric $ # Maintainer: Stéphane Gaudreault # Contributor: Aaron Griffin pkgname=nasm -pkgver=2.11 +pkgver=2.11.01 pkgrel=1 pkgdesc="An 80x86 assembler designed for portability and modularity" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('BSD') depends=('glibc') install=nasm.install source=(http://www.nasm.us/pub/nasm/releasebuilds/${pkgver}/${pkgname}-${pkgver}.tar.xz) -sha1sums=('7cc2568ce804fa17d972d159f161adc3f6d25750') +sha1sums=('e9414964de552cfe8ebc5d7645122d94d014702c') build() { cd ${pkgname}-${pkgver} diff --git a/extra/postgresql-old-upgrade/PKGBUILD b/extra/postgresql-old-upgrade/PKGBUILD index 24a7cc481..7bb0583dd 100644 --- a/extra/postgresql-old-upgrade/PKGBUILD +++ b/extra/postgresql-old-upgrade/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 201242 2013-12-06 15:41:36Z dan $ +# $Id: PKGBUILD 206163 2014-02-20 15:36:20Z dan $ # Maintainer: Dan McGee pkgname=postgresql-old-upgrade -pkgver=9.2.6 +pkgver=9.2.7 _majorver=${pkgver%.*} pkgrel=1 pkgdesc="PostgreSQL build for migrating between major versions with pg_upgrade" @@ -47,5 +47,5 @@ package() { rm -rf "${pkgdir}/opt/pgsql-${_majorver}/include/" } -md5sums=('3e68c0c7468c56f73060a88a377dbde8') -sha256sums=('4ba98053a66e5678af93dbc2956e8b04623f759e174f48940c41f4251cf0f886') +md5sums=('610354e939d3b6d8d1a620504bc25fb2') +sha256sums=('83c042c3f61c69b176d3e4344e59104f844bc8b8628dad2bb9022a64cf5afe86') diff --git a/extra/postgresql/PKGBUILD b/extra/postgresql/PKGBUILD index bd162e313..16e347939 100644 --- a/extra/postgresql/PKGBUILD +++ b/extra/postgresql/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 201244 2013-12-06 16:00:26Z dan $ +# $Id: PKGBUILD 206165 2014-02-20 15:36:54Z dan $ # Maintainer: Dan McGee pkgbase=postgresql pkgname=('postgresql-libs' 'postgresql-docs' 'postgresql') -pkgver=9.3.2 +pkgver=9.3.3 _majorver=${pkgver%.*} -pkgrel=4 +pkgrel=1 arch=('i686' 'x86_64') url="http://www.postgresql.org/" license=('custom:PostgreSQL') @@ -14,14 +14,14 @@ source=(http://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar postgresql-run-socket.patch postgresql.pam postgresql.logrotate postgresql.service postgresql.tmpfiles.conf postgresql-check-db-dir) -md5sums=('8c905155e3e9f9367b4299a9acb41d2a' +md5sums=('0247b0a24e76a3f20cc50c06d0aa2412' '75c579eed03ffb2312631f0b649175b4' '96f82c38f3f540b53f3e5144900acf17' 'd28e443f9f65a5712c52018b84e27137' '89b48774b0dae7c37fbb0e907c3c1db8' '1c5a1f99e8e93776c593c468e2612985' 'ea7f9f914900e60835d20cb95010e63c') -sha256sums=('700da51a71857e092f6af1c85fcd86b46d7d5cd2f2ba343cafb1f206c20232d7' +sha256sums=('e925d8abe7157bd8bece6b7c0dd0c343d87a2b4336f85f4681ce596af99c3879' '8538619cb8bea51078b605ad64fe22abd6050373c7ae3ad6595178da52f6a7d9' '57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5' '6abb842764bbed74ea4a269d24f1e73d1c0b1d8ecd6e2e6fb5fb10590298605e' diff --git a/extra/python-zope-interface/PKGBUILD b/extra/python-zope-interface/PKGBUILD new file mode 100644 index 000000000..f83ae12eb --- /dev/null +++ b/extra/python-zope-interface/PKGBUILD @@ -0,0 +1,55 @@ +# $Id: PKGBUILD 206137 2014-02-20 04:37:49Z fyan $ +# Maintainer : Felix Yan +# Contributor: Ionut Biru +# Contributor: Douglas Soares de Andrade + +pkgbase=python-zope-interface +pkgname=('python-zope-interface' 'python2-zope-interface') +pkgver=4.1.0 +pkgrel=1 +license=('ZPL') +arch=('i686' 'x86_64') +url="http://pypi.python.org/pypi/zope.interface" +makedepends=('python-setuptools' 'python2-setuptools') +source=("http://pypi.python.org/packages/source/z/zope.interface/zope.interface-${pkgver}.tar.gz") +md5sums=('ac63de1784ea0327db876c908af07a94') + +prepare() { + cp -a zope.interface-${pkgver}{,-python2} +} + +build() { + #build python3 module + cd "${srcdir}/zope.interface-${pkgver}" + python setup.py build + + #build python2 module + cd "${srcdir}/zope.interface-${pkgver}-python2" + python2 setup.py build +} + +check() { + cd "${srcdir}/zope.interface-${pkgver}" + python setup.py test + + cd "${srcdir}/zope.interface-${pkgver}-python2" + python2 setup.py test +} + +package_python-zope-interface() { + pkgdesc=('Zope Interfaces for Python3') + depends=('python') + cd "${srcdir}/zope.interface-${pkgver}" + python setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 + cp src/zope/__init__.py "${pkgdir}/usr/lib/python3.3/site-packages/zope/" +} + +package_python2-zope-interface(){ + pkgdesc=('Zope Interfaces for Python2') + depends=('python2') + replaces=('zope-interface') + provides=('zope-interface') + cd "${srcdir}/zope.interface-${pkgver}-python2" + python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 + cp src/zope/__init__.py "${pkgdir}/usr/lib/python2.7/site-packages/zope/" +} diff --git a/extra/xfburn/PKGBUILD b/extra/xfburn/PKGBUILD index ec80b00ac..b7ae00193 100755 --- a/extra/xfburn/PKGBUILD +++ b/extra/xfburn/PKGBUILD @@ -1,46 +1,28 @@ -# $Id: PKGBUILD 157835 2012-04-30 04:19:58Z foutrelis $ +# $Id: PKGBUILD 206175 2014-02-20 21:33:41Z eric $ # Maintainer: Tobias Kieslich # Contributor: Alois Nespor alois.nespor@gmail.com pkgname=xfburn -pkgver=0.4.3 -pkgrel=6 -arch=('i686' 'x86_64') +pkgver=0.5.0 +pkgrel=1 pkgdesc="A simple CD/DVD burning tool based on libburnia libraries" +arch=('i686' 'x86_64') url="http://goodies.xfce.org/projects/applications/xfburn" -license=('GPL2') -groups=('xfce4-goodies') -install=${pkgname}.install -depends=('libburn' 'libisofs' 'libxfcegui4' 'exo' 'gstreamer0.10-base' - 'hicolor-icon-theme' 'desktop-file-utils' 'librsvg') +license=('GPL') +depends=('libburn' 'libisofs' 'exo' 'gstreamer0.10-base' 'desktop-file-utils') makedepends=('intltool') -source=(http://archive.xfce.org/src/apps/xfburn/0.4/$pkgname-$pkgver.tar.bz2 - fix_empty_dir_segfault.diff) -sha1sums=('52d33e56b7ce9774fba680f50723eaf1a7215091' - 'e374dd4942a49b52166fa9f2aa40e9aefb3aa3ec') +groups=('xfce4-goodies') +install=xfburn.install +source=(http://archive.xfce.org/src/apps/xfburn/${pkgver%.*}/$pkgname-$pkgver.tar.bz2) +sha1sums=('def2ced9a74b5112e992149ce901f3a5a73f20d9') build() { - cd "$srcdir/$pkgname-$pkgver" - - # fix https://bugs.archlinux.org/task/26121 - patch -Np0 -i "$srcdir/fix_empty_dir_segfault.diff" - - # fix build issue - sed -i '1 i\ - #include ' \ - xfburn/xfburn-settings.h - - ./configure \ - --prefix=/usr \ - --enable-gstreamer \ - --enable-dbus \ - --disable-hal + cd $pkgname-$pkgver + ./configure --prefix=/usr --enable-gstreamer make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } - -# vim:set ts=2 sw=2 et: diff --git a/extra/xfburn/fix_empty_dir_segfault.diff b/extra/xfburn/fix_empty_dir_segfault.diff deleted file mode 100644 index af3fe07c8..000000000 --- a/extra/xfburn/fix_empty_dir_segfault.diff +++ /dev/null @@ -1,48 +0,0 @@ ---- xfburn/xfburn-data-composition.c 2011-02-17 16:37:03.000000000 +0100 -+++ xfburn/xfburn-data-composition_patched.c 2011-02-17 16:40:40.000000000 +0100 -@@ -1874,26 +1874,29 @@ - g_error ("Failed adding %s as a node to the image: code %X!", src, r); - } - -- basename = g_path_get_basename (src); -+ /* Check names only for items not manually created (#613563) */ -+ if (type != DATA_COMPOSITION_TYPE_DIRECTORY || src != NULL) { -+ basename = g_path_get_basename (src); -+ -+ /* check if the file has been renamed */ -+ if (strcmp (basename, name) != 0) { -+ /* rename the iso_node */ -+ r = iso_node_set_name (node, name); -+ -+ if (r == 0) { -+ /* The first string is the renamed name, the second one the original name */ -+ xfce_warn (_("Duplicate filename '%s' for '%s'"), name, src); -+ -+ g_free (basename); -+ g_free (name); -+ g_free (src); - -- /* check if the file has been renamed */ -- if (strcmp (basename, name) != 0) { -- /* rename the iso_node */ -- r = iso_node_set_name (node, name); -- -- if (r == 0) { -- /* The first string is the renamed name, the second one the original name */ -- xfce_warn (_("Duplicate filename '%s' for '%s'"), name, src); -- -- g_free (basename); -- g_free (name); -- g_free (src); -- -- continue; -+ continue; -+ } - } -+ g_free (basename); - } - -- g_free (basename); - g_free (name); - g_free (src); - diff --git a/extra/xmlto/PKGBUILD b/extra/xmlto/PKGBUILD index bf169f4e3..b5e476228 100644 --- a/extra/xmlto/PKGBUILD +++ b/extra/xmlto/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 206130 2014-02-19 17:21:53Z giovanni $ +# $Id: PKGBUILD 206151 2014-02-20 11:17:14Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Jan de Groot # Contributor: Sergej Pupykin @@ -6,7 +6,7 @@ pkgname=xmlto pkgver=0.0.25 -pkgrel=4 +pkgrel=5 pkgdesc="Convert xml to many other formats" arch=('i686' 'x86_64') url="http://cyberelk.net/tim/software/xmlto/" @@ -19,7 +19,7 @@ md5sums=('6b6267b1470f8571fe5f63a128970364') build() { cd "$srcdir/${pkgname}-${pkgver}" - BASH=/bin/bash ./configure --prefix=/usr \ + ./configure BASH=/bin/bash --prefix=/usr \ --mandir=/usr/share/man make } diff --git a/libre-multilib/pcsx2-libre/PKGBUILD b/libre-multilib/pcsx2-libre/PKGBUILD index 1be2e2cb6..e059ce259 100644 --- a/libre-multilib/pcsx2-libre/PKGBUILD +++ b/libre-multilib/pcsx2-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 105845 2014-02-16 10:30:11Z alucryd $ +# $Id: PKGBUILD 105941 2014-02-19 17:17:38Z alucryd $ # Maintainer: Maxime Gauduin # Contributor: josephgbr # Contributor: vEX @@ -6,16 +6,16 @@ _pkgname=pcsx2 pkgname=$_pkgname-libre pkgver=1.2.2 -pkgrel=1 +pkgrel=2 pkgdesc='A Sony PlayStation 2 emulator, without nonfree nvidia-cg-toolkit support' arch=('i686' 'x86_64') url='http://www.pcsx2.net' license=('GPL2' 'GPL3' 'LGPL2.1' 'LGPL3') makedepends=('cmake' 'sparsehash') if [[ $CARCH == "i686" ]]; then - depends=('glew' 'libaio' 'libcanberra' 'libjpeg-turbo' 'portaudio' 'sdl2' 'soundtouch' 'wxgtk2.8') + depends=('glew' 'libaio' 'libcanberra' 'libjpeg-turbo' 'portaudio' 'soundtouch' 'wxgtk2.8') elif [[ $CARCH == "x86_64" ]]; then - makedepends+=('gcc-multilib' 'lib32-glew' 'lib32-libaio' 'lib32-libcanberra' 'lib32-libjpeg-turbo' 'lib32-mesa-libgl' 'lib32-portaudio' 'lib32-sdl2' 'lib32-soundtouch' 'lib32-wxgtk2.8') + makedepends+=('gcc-multilib' 'lib32-glew' 'lib32-libaio' 'lib32-libcanberra' 'lib32-libjpeg-turbo' 'lib32-mesa-libgl' 'lib32-portaudio' 'lib32-soundtouch' 'lib32-wxgtk2.8') fi provides=("$_pkgname=$pkgver") conflicts=("$_pkgname") @@ -39,12 +39,12 @@ build() { mkdir build && cd build if [[ $CARCH == "i686" ]]; then - cmake .. -DCMAKE_INSTALL_PREFIX='/usr' -DCMAKE_BUILD_TYPE='Release' -D{GLSL_API,PACKAGE_MODE,REBUILD_SHADER,SDL2_API,XDG_STD}=TRUE -DPLUGIN_DIR='/usr/lib/pcsx2' -DGAMEINDEX_DIR='/usr/share/pcsx2' -DwxWidgets_CONFIG_EXECUTABLE='/usr/bin/wx-config-2.8' -DwxWidgets_wxrc_EXECUTABLE='/usr/bin/wxrc-2.8' + cmake .. -DCMAKE_INSTALL_PREFIX='/usr' -DCMAKE_BUILD_TYPE='Release' -D{GLSL_API,PACKAGE_MODE,REBUILD_SHADER,XDG_STD}='ON' -DPLUGIN_DIR='/usr/lib/pcsx2' -DGAMEINDEX_DIR='/usr/share/pcsx2' -DwxWidgets_CONFIG_EXECUTABLE='/usr/bin/wx-config-2.8' -DwxWidgets_wxrc_EXECUTABLE='/usr/bin/wxrc-2.8' elif [[ $CARCH == "x86_64" ]]; then export CC='gcc -m32' export CXX='g++ -m32' export PKG_CONFIG_PATH='/usr/lib32/pkgconfig' - cmake .. -DCMAKE_INSTALL_PREFIX='/usr' -DCMAKE_BUILD_TYPE='Release' -D{GLSL_API,PACKAGE_MODE,REBUILD_SHADER,SDL2_API,XDG_STD}=TRUE -DPLUGIN_DIR='/usr/lib32/pcsx2' -DGAMEINDEX_DIR='/usr/share/pcsx2' -DwxWidgets_CONFIG_EXECUTABLE='/usr/bin/wx-config32-2.8' -DwxWidgets_wxrc_EXECUTABLE='/usr/bin/wxrc32-2.8' -DCMAKE_LIBRARY_PATH='/usr/lib32' + cmake .. -DCMAKE_INSTALL_PREFIX='/usr' -DCMAKE_BUILD_TYPE='Release' -D{GLSL_API,PACKAGE_MODE,REBUILD_SHADER,XDG_STD}='ON' -DPLUGIN_DIR='/usr/lib32/pcsx2' -DGAMEINDEX_DIR='/usr/share/pcsx2' -DwxWidgets_CONFIG_EXECUTABLE='/usr/bin/wx-config32-2.8' -DwxWidgets_wxrc_EXECUTABLE='/usr/bin/wxrc32-2.8' -DCMAKE_LIBRARY_PATH='/usr/lib32' fi make @@ -54,7 +54,7 @@ package() { cd ${_pkgname}-${pkgver}/build if [[ $CARCH == "x86_64" ]]; then - depends=('lib32-glew' 'lib32-libaio' 'lib32-libcanberra' 'lib32-libjpeg-turbo' 'lib32-portaudio' 'lib32-sdl2' 'lib32-soundtouch' 'lib32-wxgtk2.8') + depends=('lib32-glew' 'lib32-libaio' 'lib32-libcanberra' 'lib32-libjpeg-turbo' 'lib32-portaudio' 'lib32-soundtouch' 'lib32-wxgtk2.8') fi make DESTDIR="${pkgdir}" install diff --git a/libre/ath9k-htc-firmware/PKGBUILD b/libre/ath9k-htc-firmware/PKGBUILD index b47b95e0e..9b6c417f8 100644 --- a/libre/ath9k-htc-firmware/PKGBUILD +++ b/libre/ath9k-htc-firmware/PKGBUILD @@ -1,10 +1,9 @@ # Maintainer: André Silva # Maintainer: Márcio Silva -# Contributor: Taro pkgname=ath9k-htc-firmware pkgver=1.3.2 -pkgrel=4 +pkgrel=5 pkgdesc='Free firmware files for the Qualcomm Atheros AR7010 and AR9271 USB 802.11n NICs' arch=('any') url=('http://wireless.kernel.org/en/users/Drivers/ath9k_htc') @@ -17,9 +16,6 @@ md5sums=('73c66751151dd47535cb4142477da480' prepare() { - mkdir -p $srcdir/bin - ln -s /usr/bin/xtensa-unknown-elf-as $srcdir/bin/as - export PATH=$srcdir/bin:$PATH cd $srcdir/open-ath9k-htc-firmware-$pkgver/target_firmware mkdir -p build/{k2,magpie} @@ -39,7 +35,6 @@ INCLUDE(CMakeForceCompiler) SET(CMAKE_SYSTEM_PROCESSOR xtensa) SET(COMPILER_PREFIX "xtensa-unknown-elf") SET(CMAKE_FIND_ROOT_PATH /usr/xtensa-unknown-elf) -SET(CMAKE_OBJCOPY /usr/bin/xtensa-unknown-elf-objcopy) CMAKE_FORCE_C_COMPILER(/usr/bin/xtensa-unknown-elf-gcc GNU) EOF diff --git a/libre/qupzilla-libre/PKGBUILD b/libre/qupzilla-libre/PKGBUILD index 3d23a89f8..7a526cd5f 100644 --- a/libre/qupzilla-libre/PKGBUILD +++ b/libre/qupzilla-libre/PKGBUILD @@ -1,24 +1,24 @@ -# $Id: PKGBUILD 104845 2014-01-27 14:16:51Z speps $ +# $Id: PKGBUILD 105935 2014-02-19 15:37:19Z speps $ # Maintainer: speps # Maintainer (Parabola): André Silva _pkgbase=qupzilla pkgbase=qupzilla-libre pkgname=(qupzilla-libre qupzilla-libre-qt5) -pkgver=1.6.1 +pkgver=1.6.3 pkgrel=1 arch=(i686 x86_64 mips64el) url="http://www.qupzilla.com/" license=('GPL3') -makedepends=('qtwebkit' 'qt5-webkit' 'qt5-script' 'hunspell') +makedepends=('qtwebkit' 'qt5-webkit' 'qt5-script' 'hunspell' 'kdelibs' 'libgnome-keyring') optdepends=('bash-completion: bash completion support') +install="$_pkgbase.install" source=("$_pkgbase-$pkgver.tar.gz::https://github.com/QupZilla/qupzilla/archive/v$pkgver.tar.gz" 'searchenginesmanager.cpp.sed' 'speeddial.cpp.sed' 'start.html.sed') noextract=("$_pkgbase-$pkgver.tar.gz") -install="$_pkgbase.install" -md5sums=('ca6fee487c9871d37d2dd09b3617b88f' +md5sums=('37d962c924a58c616104d0cc732bf69f' '1d926e97a5b287d40fb695f6516f2a06' '0f166fa102af975b3b8ac030d477e9b8' '77120a0c39ba8254e5b2c273910f029a') @@ -31,7 +31,9 @@ prepare() { # configure export USE_WEBGL=true \ - QUPZILLA_PREFIX=/usr/ + QUPZILLA_PREFIX=/usr/ \ + KDE_INTEGRATION=true \ + GNOME_INTEGRATION=true # remove Google and Youtube support, replaces it to DDG HTML cd qt4 @@ -58,7 +60,9 @@ build() { package_qupzilla-libre() { pkgdesc="Cross-platform QtWebKit browser, without non-privacy search providers" depends=('qtwebkit' 'hunspell') - provides=qupzilla=$pkgver + optdepends=('kdelibs: kwallet integration' + 'libgnome-keyring: gnome keyring integration') + provides=(qupzilla=$pkgver) conflicts=qupzilla replaces=qupzilla @@ -73,6 +77,7 @@ package_qupzilla-libre() { package_qupzilla-libre-qt5() { pkgdesc="Cross-platform QtWebKit browser (Qt5), without non-privacy search providers" depends=('qt5-webkit' 'qt5-script' 'hunspell' 'desktop-file-utils' 'hicolor-icon-theme') + optdepends=('libgnome-keyring: gnome keyring integration') provides=('qupzilla-libre' "qupzilla-qt5=$pkgver") conflicts=('qupzilla-libre' 'qupzilla-qt5') replaces=qupzilla-qt5 diff --git a/libre/xarchiver-libre/PKGBUILD b/libre/xarchiver-libre/PKGBUILD index e606e65f4..a718b8252 100644 --- a/libre/xarchiver-libre/PKGBUILD +++ b/libre/xarchiver-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 104651 2014-01-24 08:23:36Z bgyorgy $ +# $Id: PKGBUILD 105928 2014-02-19 11:27:15Z bgyorgy $ # Maintainer: Balló György # Contributor: Alexander Fehr # Contributor: Andrew Simmons @@ -6,8 +6,8 @@ _pkgname=xarchiver pkgname=xarchiver-libre -pkgver=0.5.2 -pkgrel=6 +pkgver=0.5.3 +pkgrel=1 pkgdesc="GTK+ frontend to various command line archivers, with unar support" arch=('i686' 'x86_64' 'mips64el') url="http://xarchiver.sourceforge.net/" @@ -19,78 +19,42 @@ depends=('gtk2' 'desktop-file-utils') makedepends=('intltool') optdepends=('zip: ZIP support' 'unzip: ZIP support' - 'unar: RAR support' 'p7zip: 7z support' 'arj: ARJ support' 'lzop: LZOP support' - 'cpio: RPM support') + 'cpio: RPM support' + 'unar: RAR support') install=xarchiver.install source=(http://downloads.sourceforge.net/xarchiver/xarchiver-$pkgver.tar.bz2 - xarchiver-0.5.2-no-donators-menu.patch - xarchiver-0.5.2-add_xz_support.patch - xarchiver-0.5.2-segfault-open-with.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' - '7ef9fe9aee9f0fbc141ed9683e91ea1c' - '5d5ef8dd1b8b7790af4ece5fcedcd370' - 'f9036a44157b318cbc59ed012b04974b' - '782f55c1f1021dc02c7739bf8a47336e' - 'fcd9e04222c5e0ef459977bd7cd0ae4e' + 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-add-unar-support.patch) +md5sums=('fd390bbd2df76a5f8a007bdeae82d4aa' + '812b93339f5e3332621f3c5abebfe277' '6178d7ab679b761469c880a8db991907' - '22ed2783e72684a102243c5834bf5ca3' - 'e518b1e0bc4407383aae2783c0c19a04' - 'c46daf2ee9fce7ece608eca33174db6b' - '1bfed3e1a9f8f4858ec90f0d66cfc5ba' - '36a4c3181230aab1e0ce1596acc5ef88') + '35ab96d98521a0a36f3e9e9ec0969107' + 'f9119f5290caa195a56b7d3c63d9137d' + '5f0b21efd0159d41f207e664b72210b8') 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 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.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 + patch -Np1 -i ../xarchiver-0.5.3-fix-double-escaping.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 + patch -Np1 -i ../xarchiver-0.5.3-fix-password-protected.patch # Add more MIME types in the desktop file - patch -Np1 -i ../xarchiver-0.5.2-add_mime_types.patch + patch -Np1 -i ../xarchiver-0.5.3-add-mime-types.patch - # Update upstream URL - find -type f | xargs sed -i 's|http://xarchiver.xfce.org|http://xarchiver.sf.net|' + # Add unar support + patch -Np1 -i ../xarchiver-0.5.3-add-unar-support.patch } build() { 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 deleted file mode 100644 index 3b510fcb8..000000000 --- a/libre/xarchiver-libre/xarchiver-0.5.2-add_mime_types.patch +++ /dev/null @@ -1,9 +0,0 @@ -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 deleted file mode 100644 index 0168f4e63..000000000 --- a/libre/xarchiver-libre/xarchiver-0.5.2-add_unar_support.patch +++ /dev/null @@ -1,380 +0,0 @@ -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 deleted file mode 100644 index d246a8e19..000000000 --- a/libre/xarchiver-libre/xarchiver-0.5.2-add_xz_support.patch +++ /dev/null @@ -1,397 +0,0 @@ -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 deleted file mode 100644 index 10def7d21..000000000 --- a/libre/xarchiver-libre/xarchiver-0.5.2-drag-n-drop_escaped_path.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 deleted file mode 100644 index 8b44d91a0..000000000 --- a/libre/xarchiver-libre/xarchiver-0.5.2-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-libre/xarchiver-0.5.2-fix-non-existent-archive.patch b/libre/xarchiver-libre/xarchiver-0.5.2-fix-non-existent-archive.patch deleted file mode 100644 index e63687579..000000000 --- a/libre/xarchiver-libre/xarchiver-0.5.2-fix-non-existent-archive.patch +++ /dev/null @@ -1,26 +0,0 @@ -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-fix_7z_support.patch b/libre/xarchiver-libre/xarchiver-0.5.2-fix_7z_support.patch deleted file mode 100644 index f7ff098c0..000000000 --- a/libre/xarchiver-libre/xarchiver-0.5.2-fix_7z_support.patch +++ /dev/null @@ -1,110 +0,0 @@ -diff -Nur xarchiver-0.5.2.orig/src/7zip.c xarchiver-0.5.2/src/7zip.c ---- xarchiver-0.5.2.orig/src/7zip.c 2008-10-25 00:41:17.000000000 +1300 -+++ xarchiver-0.5.2/src/7zip.c 2010-12-15 11:24:26.000000000 +1300 -@@ -64,15 +64,14 @@ - XEntry *entry; - gchar *filename; - gpointer item[5]; -- gint linesize = 0,n = 0,a = 0; -- gboolean dir = FALSE; -+ gint linesize = 0,a = 0; - - if (last_line) - return; - - if (jump_header == FALSE) - { -- if (line[0] == '-') -+ if ((line[0] == '-') && (line[3] != NULL)) - { - jump_header = TRUE; - return; -@@ -93,71 +92,42 @@ - item[4] = line; - - /* Time */ -- for(n=13; n < linesize; ++n) -- if(line[n] == ' ') -- break; -- line[n] = '\0'; -+ line[19] = '\0'; - item[3] = line + 11; -- a = ++n; - - /* Permissions */ -- for(; n < linesize; n++) -- if(line[n] == ' ') -- break; -- line[n] = '\0'; -- if ((line+a)[0] == 'D') -- dir = TRUE; -- item[2] = line + a; -+ line[25] = '\0'; -+ item[2] = line + 20; - - /* Size */ -- for(++n; n < linesize; ++n) -- if(line[n] >= '0' && line[n] <= '9') -+ for(a=26; a < linesize; ++a) -+ if(line[a] >= '0' && line[a] <= '9') - break; -- a = n; - -- for(; n < linesize; ++n) -- if(line[n] == ' ') -- break; -- -- line[n] = '\0'; -+ line[38] = '\0'; - item[0] = line + a; - archive->dummy_size += g_ascii_strtoull(item[0],NULL,0); - - /* Compressed */ -- for(++n; n < linesize; ++n) -- if(line[n] >= '0' && line[n] <= '9') -- break; -- a = n; -- -- for(; n < linesize; ++n) -- if(line[n] == ' ') -- break; -- -- line[n] = '\0'; -- -- if (line[50] != ' ') -+ /* Is this item solid? */ -+ if (line[50] == ' ') - { -- n+=2; -- item[1] = line + a; - line[linesize-1] = '\0'; -- filename = g_strdup(line + n); -+ filename = g_strdup(line + 53); - } -- /* Is this a solid archive? */ -+ - else - { -- item[1] = "0"; -- line[n-1] = '\0'; -+ for(a=39; a < linesize; ++a) -+ if(line[a] >= '0' && line[a] <= '9') -+ break; -+ -+ line[51] = '\0'; -+ item[1] = line + a; -+ line[linesize-1] = '\0'; - filename = g_strdup(line + 53); - } - -- /* Work around for 7za which doesn't -- * output / with directories */ -- if (dir) -- { -- gchar *filename_with_slash = g_strconcat (filename,"/",NULL); -- g_free (filename); -- filename = filename_with_slash; -- } - entry = xa_set_archive_entries_for_each_row (archive,filename,item); - g_free(filename); - } 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 deleted file mode 100644 index aa2283a7e..000000000 --- a/libre/xarchiver-libre/xarchiver-0.5.2-no-donators-menu.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- 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-rpm2cpio.patch b/libre/xarchiver-libre/xarchiver-0.5.2-rpm2cpio.patch deleted file mode 100644 index d962a44af..000000000 --- a/libre/xarchiver-libre/xarchiver-0.5.2-rpm2cpio.patch +++ /dev/null @@ -1,84 +0,0 @@ -diff -up ./src/rpm.c.rpm2cpio ./src/rpm.c ---- ./src/rpm.c.rpm2cpio 2008-10-24 13:43:04.000000000 +0200 -+++ ./src/rpm.c 2011-03-27 03:14:20.225742237 +0200 -@@ -23,11 +23,8 @@ extern gboolean batch_mode; - - void xa_open_rpm (XArchive *archive) - { -- unsigned char bytes[8]; - unsigned short int i; -- int dl,il,sigsize,offset,response; -- gchar *ibs,*executable; -- gchar *gzip_tmp = NULL; -+ int response; - GSList *list = NULL; - FILE *stream; - gboolean result; -@@ -56,66 +53,14 @@ void xa_open_rpm (XArchive *archive) - 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 ( "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 -- executable = "bzip2 -dc "; -- -- command = g_strconcat("sh -c \"",executable,gzip_tmp," > ",archive->tmp,"/file.cpio\"",NULL); -- g_free(gzip_tmp); -+ gchar *command = g_strconcat ( "sh -c \"rpm2cpio ",archive->escaped_path," > ",archive->tmp, "/file.cpio\"",NULL); - list = NULL; - list = g_slist_append(list,command); - result = xa_run_command (archive,list); 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 deleted file mode 100644 index b8052544b..000000000 --- a/libre/xarchiver-libre/xarchiver-0.5.2-segfault-delete-file.patch +++ /dev/null @@ -1,21 +0,0 @@ -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-open-with.patch b/libre/xarchiver-libre/xarchiver-0.5.2-segfault-open-with.patch deleted file mode 100644 index e29d40c41..000000000 --- a/libre/xarchiver-libre/xarchiver-0.5.2-segfault-open-with.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -pur xarchiver-0.5.2/src/open-with-dlg.c xarchiver-0.5.2.new/src/open-with-dlg.c ---- xarchiver-0.5.2/src/open-with-dlg.c 2008-10-17 14:06:03.000000000 +0200 -+++ xarchiver-0.5.2.new/src/open-with-dlg.c 2011-05-16 21:48:49.042839556 +0200 -@@ -289,7 +289,10 @@ static void xa_open_with_dialog_selectio - GtkTreeIter iter; - GtkTreeModel *model; - -- gtk_tree_selection_get_selected(selection,&model,&iter); -+ if (!gtk_tree_selection_get_selected(selection,&model,&iter)) { -+ return; -+ } -+ - gtk_tree_model_get(model,&iter,2,&exec,-1); - - gtk_entry_set_text(GTK_ENTRY(data->custom_command_entry),exec); 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 deleted file mode 100644 index a1fa1f2ca..000000000 --- a/libre/xarchiver-libre/xarchiver-0.5.2-segfault-password-protected.patch +++ /dev/null @@ -1,43 +0,0 @@ -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/libre/xarchiver-libre/xarchiver-0.5.3-add-mime-types.patch b/libre/xarchiver-libre/xarchiver-0.5.3-add-mime-types.patch new file mode 100644 index 000000000..4552e5b96 --- /dev/null +++ b/libre/xarchiver-libre/xarchiver-0.5.3-add-mime-types.patch @@ -0,0 +1,9 @@ +diff -Naur xarchiver-0.5.3.orig/xarchiver.desktop.in xarchiver-0.5.2/xarchiver.desktop.in +--- xarchiver-0.5.3.orig/xarchiver.desktop.in 2014-01-24 04:05:33.438561000 +0100 ++++ xarchiver-0.5.3/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-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-debian-package;application/x-rpm; diff --git a/libre/xarchiver-libre/xarchiver-0.5.3-add-unar-support.patch b/libre/xarchiver-libre/xarchiver-0.5.3-add-unar-support.patch new file mode 100644 index 000000000..0b54cacc1 --- /dev/null +++ b/libre/xarchiver-libre/xarchiver-0.5.3-add-unar-support.patch @@ -0,0 +1,545 @@ +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-02-20 04:35:34.820373529 -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.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-02-20 04:35:34.820373529 -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.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-02-20 04:58:54.470139199 -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); +@@ -623,7 +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) ++ 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.3.orig/src/main.c xarchiver-0.5.3/src/main.c +--- xarchiver-0.5.3.orig/src/main.c 2014-02-20 03:24:20.406301116 -0200 ++++ xarchiver-0.5.3/src/main.c 2014-02-20 04:43:27.247666292 -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; + static gboolean show_version = FALSE; + int response; +@@ -330,7 +330,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 +342,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; +@@ -364,7 +362,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,38 +432,14 @@ + //ArchiveSuffix = g_list_append(ArchiveSuffix, ""); + } + +- absolute_path = g_find_program_in_path ("rar"); ++ 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"); +- // 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/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-02-20 05:13:00.058263839 -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; +@@ -101,7 +101,7 @@ + + while (Name) + { +- if (!(strncmp(Name->data, "rar", 3) == 0 && unrar)) ++ if (!(strncmp(Name->data, "rar", 3) == 0 && unar)) + gtk_combo_box_append_text(GTK_COMBO_BOX(combo_box),Name->data); + Name = g_list_next (Name); + } +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-02-20 04:44:40.225947167 -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 || +- (strncmp(archive_type->data, "rar", 3) == 0 && unrar) ) ++ (strncmp(archive_type->data, "rar", 3) == 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.3.orig/src/rar.c xarchiver-0.5.3/src/rar.c +--- xarchiver-0.5.3.orig/src/rar.c 2014-02-09 13:26:24.000000000 -0200 ++++ xarchiver-0.5.3/src/rar.c 2014-02-20 05:11:19.611884642 -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[]); + extern int rar_version; +@@ -36,44 +36,15 @@ + gchar *command = NULL; + gchar *rar = NULL; + jump_header = read_filename = last_line = encrypted = FALSE; +- +- if (unrar) +- { +- rar = "unrar"; +- archive->can_add = archive->has_sfx = FALSE; +- } +- else +- { +- rar = "rar"; +- archive->can_add = archive->has_sfx = TRUE; +- } ++ rar = "unar"; ++ archive->can_add = archive->has_sfx = FALSE; + +- command = g_strconcat ( rar," v " , archive->escaped_path, NULL ); ++ command = g_strconcat ( rar, archive->escaped_path, NULL ); + archive->has_sfx = archive->has_properties = archive->can_extract = archive->has_test = TRUE; + archive->dummy_size = 0; + archive->nr_of_files = 0; + +- if (archive->type == XARCHIVETYPE_RAR5) +- archive->format = "RAR5"; +- else +- archive->format = "RAR"; +- +- +- if (rar_version == 5) +- { +- archive->nc = 8; +- archive->parse_output = xa_get_rar5_line_content; +- xa_spawn_async_process (archive,command); +- g_free ( command ); +- if ( archive->child_pid == 0 ) +- return; +- archive->column_types = g_malloc0(sizeof(types5)); +- for (i = 0; i < archive->nc+2; i++) +- archive->column_types[i] = types5[i]; +- +- xa_create_liststore (archive, names5); +- } +- else ++ archive->format = "RAR"; + { + archive->nc = 10; + archive->parse_output = xa_get_rar_line_content; +@@ -247,32 +218,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); +-} +- + gboolean xa_rar_extract(XArchive *archive,GSList *files) + { + gchar *rar, *command, *e_filename = NULL; +@@ -281,10 +226,7 @@ + gboolean result = FALSE; + + _files = files; +- if (unrar) +- rar = "unrar"; +- else +- rar = "rar"; ++ rar = "unar"; + + while (_files) + { +@@ -315,230 +257,3 @@ + 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); +- } +- +-void xa_get_rar5_line_content (gchar *line, gpointer data) +-{ +- XArchive *archive = data; +- XEntry *entry; +- gpointer item[7]; +- unsigned short int i = 0; +- unsigned int linesize,n,a; +- gboolean dir = FALSE; +- static gchar *filename; +- +- if (last_line) +- return; +- +- if (jump_header == FALSE) +- { +- if (strncmp(line,"Comment:",8) == 0) +- { +- jump_comment = archive->has_comment = TRUE; +- archive->comment = g_string_new(""); +- archive->comment = g_string_append(archive->comment,&line[9]); +- return; +- } +- if (jump_comment == TRUE) +- { +- if (strncmp(line,"Name",4) != 0) +- { archive->comment = g_string_append(archive->comment,line); +- return; +- } +- jump_comment = FALSE; +- } +- if (line[0] == '-') +- { +- jump_header = TRUE; +- return; +- } +- return; +- } +- +- linesize = strlen(line); +- line[linesize - 1] = '\0'; +- +- if(line[0] == '*') +- { +- archive->has_passwd = TRUE; +- encrypted = TRUE; +- } +- else if (line[0] == '-') +- { +- last_line = TRUE; +- return; +- } +- +- archive->nr_of_files++; +- +- /* Permissions */ +- for(n=0; n < linesize && line[n] == ' '; n++); +- a = n; +- for(; n < linesize && line[n] != ' '; n++); +- line[n] = '\0'; +- if ((line+a)[0] == 'd') +- dir = TRUE; +- item[5] = line + a; +- n++; +- +- /* Size */ +- for(; n < linesize && line[n] == ' '; n++); +- a = n; +- for(; n < linesize && line[n] != ' '; n++); +- line[n]='\0'; +- item[i] = line + a; +- archive->dummy_size += g_ascii_strtoull(item[i],NULL,0); +- i++; +- n++; +- +- /* Compressed */ +- for(; n < linesize && line[n] == ' '; n++); +- a = n; +- for(; n < linesize && line[n] != ' '; n++); +- line[n]='\0'; +- item[i] = line + a; +- i++; +- n++; +- +- /* Ratio */ +- for(; n < linesize && line[n] == ' '; n++); +- a = n; +- for(; n < linesize && line[n] != ' '; n++); +- line[n] = '\0'; +- item[i] = line + a; +- i++; +- n++; +- +- /* Date */ +- for(; n < linesize && line[n] == ' '; n++); +- a = n; +- for(; n < linesize && line[n] != ' '; n++); +- line[n] = '\0'; +- item[i] = line + a; +- i++; +- n++; +- +- /* Time */ +- for(; n < linesize && line[n] == ' '; n++); +- a = n; +- for(; n < linesize && line[n] != ' '; n++); +- line[n] = '\0'; +- item[i] = line + a; +- i+=2; +- n++; +- +- /* CRC */ +- for(; n < linesize && line[n] == ' '; n++); +- a = n; +- for(; n < linesize && line[n] != ' '; n++); +- line[n] = '\0'; +- item[i] = line + a; +- i++; +- n++; +- +- /* fileName */ +- for(n=64; n < linesize && line[n] == ' '; n++); +- a = n; +- for(; n < linesize && line[n] != ' ' && line[n] != '\n'; n++); +- line[n]='\0'; +- filename = g_strdup(line + a); +- +- /* Work around for rar which doesn't +- * output / with directories */ +- if (dir) +- { +- gchar *filename_with_slash = g_strconcat (filename,"/",NULL); +- g_free (filename); +- filename = filename_with_slash; +- } +- +- entry = xa_set_archive_entries_for_each_row (archive,filename,item); +- if (entry != NULL) +- entry->is_encrypted = encrypted; +- g_free(filename); +- encrypted = FALSE; +-} +- +-void xa_rar_add (XArchive *archive,GString *files,gchar *compression_string) +-{ +- GSList *list = NULL; +- gchar *command, *rar_version = NULL; +- +- +- if (archive->location_entry_path != NULL) +- archive->working_dir = g_strdup(archive->tmp); +- +- if (archive->type == XARCHIVETYPE_RAR5) +- rar_version = "5"; +- else +- rar_version = "4"; +- +- if (compression_string == NULL) +- compression_string = "3"; +- +- if (archive->passwd != NULL) +- command = g_strconcat ( "rar a -ma", rar_version, " ", +- 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 -ma", rar_version, " ", +- 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); +-} +- +-int xa_rar_checkversion (gchar *absolute_path) +-{ +- //gchar *command; +- gchar *output = NULL; +- +- rar_version = 4; // Default version +- +- //command = g_strconcat (absolute_path, "" , NULL); +- g_spawn_command_line_sync (absolute_path, &output, NULL, NULL, NULL); +- +- if (g_ascii_strncasecmp ("\nRAR 5", output, 6) == 0 || g_ascii_strncasecmp ("\nUNRAR 5", output, 8) == 0) +- rar_version = 5; +- +- g_free(output); +- //g_free(command); +- return rar_version; +-} +diff -Nur xarchiver-0.5.3.orig/src/rar.h xarchiver-0.5.3/src/rar.h +--- xarchiver-0.5.3.orig/src/rar.h 2014-02-09 13:26:24.000000000 -0200 ++++ xarchiver-0.5.3/src/rar.h 2014-02-20 04:35:34.823706631 -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.3.orig/src/window.c xarchiver-0.5.3/src/window.c +--- xarchiver-0.5.3.orig/src/window.c 2014-02-20 03:24:30.795581843 -0200 ++++ xarchiver-0.5.3/src/window.c 2014-02-20 05:08:49.982243849 -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; +@@ -1584,7 +1584,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_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); +@@ -1801,7 +1801,7 @@ + else + idx = xa_find_archive_index (current_page); + +- if ((archive[idx]->type == XARCHIVETYPE_RAR || archive[idx]->type == XARCHIVETYPE_RAR5) && 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.3-fix-double-escaping.patch b/libre/xarchiver-libre/xarchiver-0.5.3-fix-double-escaping.patch new file mode 100644 index 000000000..8b44d91a0 --- /dev/null +++ b/libre/xarchiver-libre/xarchiver-0.5.3-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.3-fix-password-protected.patch b/libre/xarchiver-libre/xarchiver-0.5.3-fix-password-protected.patch new file mode 100644 index 000000000..00969349d --- /dev/null +++ b/libre/xarchiver-libre/xarchiver-0.5.3-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-libre/xarchiver-0.5.3-fix-rpm-support.patch b/libre/xarchiver-libre/xarchiver-0.5.3-fix-rpm-support.patch new file mode 100644 index 000000000..cf17ff738 --- /dev/null +++ b/libre/xarchiver-libre/xarchiver-0.5.3-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); -- cgit v1.2.3-54-g00ecf