Date: Monday, November 25, 2013 @ 17:53:14 Author: heftig Revision: 200316
3.10.0 Modified: brasero/trunk/PKGBUILD Deleted: brasero/trunk/bug655513.patch -----------------+ PKGBUILD | 22 ++++------------------ bug655513.patch | 37 ------------------------------------- 2 files changed, 4 insertions(+), 55 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-11-25 16:15:38 UTC (rev 200315) +++ PKGBUILD 2013-11-25 16:53:14 UTC (rev 200316) @@ -4,8 +4,8 @@ # Contributor: William Rea <[email protected]> pkgname=brasero -pkgver=3.8.0 -pkgrel=4 +pkgver=3.10.0 +pkgrel=1 pkgdesc="A disc burning application for Gnome" arch=('i686' 'x86_64') url="http://www.gnome.org/projects/brasero"; @@ -20,25 +20,11 @@ replaces=('nautilus-cd-burner') install=brasero.install groups=('gnome-extra') -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz - bug655513.patch) -sha256sums=('d98a368a6129e50681e8243c5e0833c32cca699bd50b839c6a551d52b396bce4' - '3e774040c570881fe120af7c250a91e8a69331289490c823feed87c4d00f98fb') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('88fd9135e796f58caeb484d00f5d95916c67f97505e68d2027ab84d3f9245f37') -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 \ --localstatedir=/var --disable-caches \ --disable-schemas-compile Deleted: bug655513.patch =================================================================== --- bug655513.patch 2013-11-25 16:15:38 UTC (rev 200315) +++ bug655513.patch 2013-11-25 16:53:14 UTC (rev 200316) @@ -1,37 +0,0 @@ -From f122ee0620380b7c21edce722cfe347f10c8c827 Mon Sep 17 00:00:00 2001 -From: Joshua Lock <[email protected]> -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
