diff options
| author | root <root@rshg054.dnsready.net> | 2013-10-08 02:34:09 -0700 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2013-10-08 02:34:09 -0700 |
| commit | 3a0ad5dc35d5cff379cdfc736b9cae856416fe6a (patch) | |
| tree | a6af20a38d47d7a7ae8e1b98f70005c54644bbdd /extra/brasero | |
| parent | 9159b8ca1c97a398204d7a7d4d78c3394639bd02 (diff) | |
Tue Oct 8 02:32:53 PDT 2013
Diffstat (limited to 'extra/brasero')
| -rw-r--r-- | extra/brasero/PKGBUILD | 19 | ||||
| -rw-r--r-- | extra/brasero/bug655513.patch | 37 |
2 files changed, 51 insertions, 5 deletions
diff --git a/extra/brasero/PKGBUILD b/extra/brasero/PKGBUILD index b96d207bc..9401392ed 100644 --- a/extra/brasero/PKGBUILD +++ b/extra/brasero/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 183335 2013-04-21 22:08:35Z heftig $ +# $Id: PKGBUILD 196019 2013-10-07 11:50:33Z jgc $ # Maintainer: Allan McRae <allan@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> pkgname=brasero pkgver=3.8.0 -pkgrel=2 +pkgrel=3 pkgdesc="A disc burning application for Gnome" arch=('i686' 'x86_64') url="http://www.gnome.org/projects/brasero" @@ -20,14 +20,23 @@ optdepends=('libburn: alternative back-end' replaces=('nautilus-cd-burner') install=brasero.install groups=('gnome-extra') -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('d98a368a6129e50681e8243c5e0833c32cca699bd50b839c6a551d52b396bce4') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz + bug655513.patch) +sha256sums=('d98a368a6129e50681e8243c5e0833c32cca699bd50b839c6a551d52b396bce4' + '3e774040c570881fe120af7c250a91e8a69331289490c823feed87c4d00f98fb') -build() { +prepare() { cd "$pkgname-$pkgver" # Update tracker dep sed -i '/tracker/s/0\.14/0.16/' configure.ac + + # Fix infinite loop after cancelling the burn image dialog + patch -Np1 -i ../bug655513.patch +} + +build() { + cd "$pkgname-$pkgver" autoreconf -f -v -i ./configure --prefix=/usr --sysconfdir=/etc \ diff --git a/extra/brasero/bug655513.patch b/extra/brasero/bug655513.patch new file mode 100644 index 000000000..c5841d3f7 --- /dev/null +++ b/extra/brasero/bug655513.patch @@ -0,0 +1,37 @@ +From f122ee0620380b7c21edce722cfe347f10c8c827 Mon Sep 17 00:00:00 2001 +From: Joshua Lock <joshua.lock@intel.com> +Date: Tue, 03 Sep 2013 10:01:26 +0000 +Subject: brasero-app: don't try and show the main window if it hasn't been created + +It's possible to open brasero without creating the main window, such as +when opening an image file directly triggering the image burning dialogue. +In these cases trying to show the main window when the dialogue is +dismissed is an error, brasero should just exit. + +https://bugzilla.gnome.org/show_bug.cgi?id=655513 +--- +diff --git a/src/brasero-app.c b/src/brasero-app.c +index d345941..8d10781 100644 +--- a/src/brasero-app.c ++++ b/src/brasero-app.c +@@ -2013,6 +2013,9 @@ brasero_app_run_mainwin (BraseroApp *app) + + priv = BRASERO_APP_PRIVATE (app); + ++ if (!priv->mainwin) ++ return FALSE; ++ + if (priv->mainwin_running) + return TRUE; + +@@ -2055,6 +2058,8 @@ brasero_app_init (BraseroApp *object) + + priv = BRASERO_APP_PRIVATE (object); + ++ priv->mainwin = NULL; ++ + /* Load settings */ + priv->setting = brasero_setting_get_default (); + brasero_setting_load (priv->setting); +-- +cgit v0.9.2 |