diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-11-15 11:17:39 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-11-15 11:17:39 +0100 |
| commit | 909d51774dfc3c94aeaaeb799daaa546c566a492 (patch) | |
| tree | 9d19f46f986fe91b8598b617a8dc0a66bf349e7f /libre/file-roller-libre | |
| parent | dc7c61e8e22503f4f45bc2f57dc0542a8bc1ea30 (diff) | |
| parent | 2264379d37a6a00a3ecec1fd03c5dd4796078d49 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/esdl/PKGBUILD
community/gpg-crypter/PKGBUILD
extra/claws-mail-extra-plugins/PKGBUILD
extra/maxima/PKGBUILD
social/tokyocabinet/PKGBUILD
Diffstat (limited to 'libre/file-roller-libre')
| -rw-r--r-- | libre/file-roller-libre/PKGBUILD | 14 | ||||
| -rw-r--r-- | libre/file-roller-libre/extract-to-fix.patch | 13 |
2 files changed, 23 insertions, 4 deletions
diff --git a/libre/file-roller-libre/PKGBUILD b/libre/file-roller-libre/PKGBUILD index c2fb379b4..d4685fbd9 100644 --- a/libre/file-roller-libre/PKGBUILD +++ b/libre/file-roller-libre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 170863 2012-11-12 20:12:03Z heftig $ +# $Id: PKGBUILD 170951 2012-11-14 01:36:00Z foutrelis $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> _pkgname=file-roller pkgname=file-roller-libre pkgver=3.6.2 -pkgrel=1 +pkgrel=2 pkgdesc="Archive manipulator for GNOME" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -22,11 +22,17 @@ conflicts=("$_pkgname") options=('!libtool' '!emptydirs') install=file-roller.install url="http://www.gnome.org" -source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver::3}/$_pkgname-$pkgver.tar.xz) -sha256sums=('47b026c827fcb0db4df51bf81c1e90f829f287fe2c9b9e65f167a2ef5bfec5f1') +source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver::3}/$_pkgname-$pkgver.tar.xz + extract-to-fix.patch) +sha256sums=('47b026c827fcb0db4df51bf81c1e90f829f287fe2c9b9e65f167a2ef5bfec5f1' + 'fc23e122b2d95df9eafe5bdf2a55beb1339a2b1b077973a1b45f881d9bb8427e') build() { cd $_pkgname-$pkgver + + # https://bugzilla.gnome.org/show_bug.cgi?id=686321 + patch -Np1 -i "$srcdir/extract-to-fix.patch" + ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/file-roller \ --localstatedir=/var --disable-static \ diff --git a/libre/file-roller-libre/extract-to-fix.patch b/libre/file-roller-libre/extract-to-fix.patch new file mode 100644 index 000000000..2ec4c8336 --- /dev/null +++ b/libre/file-roller-libre/extract-to-fix.patch @@ -0,0 +1,13 @@ +diff --git a/src/main.c~ b/src/main.c +index 1eb2e65..539ddfa 100644 +--- a/src/main.c~ ++++ b/src/main.c +@@ -850,7 +850,7 @@ fr_application_command_line (GApplication *application, + + _g_object_unref (default_directory); + _g_object_unref (add_to_archive); +- g_free (extraction_destination); ++ _g_object_unref (extraction_destination); + + return fr_application_command_line_finished (application, EXIT_SUCCESS); + } |