[arch-commits] Commit in brasero/repos (8 files)
Jan de Groot
jgc at nymeria.archlinux.org
Mon Sep 23 20:05:00 UTC 2013
Date: Monday, September 23, 2013 @ 22:04:59
Author: jgc
Revision: 194858
archrelease: copy trunk to gnome-unstable-i686, gnome-unstable-x86_64
Added:
brasero/repos/gnome-unstable-i686/
brasero/repos/gnome-unstable-i686/PKGBUILD
(from rev 194857, brasero/trunk/PKGBUILD)
brasero/repos/gnome-unstable-i686/brasero.install
(from rev 194857, brasero/trunk/brasero.install)
brasero/repos/gnome-unstable-i686/bug655513.patch
(from rev 194857, brasero/trunk/bug655513.patch)
brasero/repos/gnome-unstable-x86_64/
brasero/repos/gnome-unstable-x86_64/PKGBUILD
(from rev 194857, brasero/trunk/PKGBUILD)
brasero/repos/gnome-unstable-x86_64/brasero.install
(from rev 194857, brasero/trunk/brasero.install)
brasero/repos/gnome-unstable-x86_64/bug655513.patch
(from rev 194857, brasero/trunk/bug655513.patch)
---------------------------------------+
gnome-unstable-i686/PKGBUILD | 52 ++++++++++++++++++++++++++++++++
gnome-unstable-i686/brasero.install | 14 ++++++++
gnome-unstable-i686/bug655513.patch | 37 ++++++++++++++++++++++
gnome-unstable-x86_64/PKGBUILD | 52 ++++++++++++++++++++++++++++++++
gnome-unstable-x86_64/brasero.install | 14 ++++++++
gnome-unstable-x86_64/bug655513.patch | 37 ++++++++++++++++++++++
6 files changed, 206 insertions(+)
Copied: brasero/repos/gnome-unstable-i686/PKGBUILD (from rev 194857, brasero/trunk/PKGBUILD)
===================================================================
--- gnome-unstable-i686/PKGBUILD (rev 0)
+++ gnome-unstable-i686/PKGBUILD 2013-09-23 20:04:59 UTC (rev 194858)
@@ -0,0 +1,52 @@
+# $Id$
+# Maintainer: Allan McRae <allan at archlinux.org>
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Contributor: William Rea <sillywilly at gmail.com>
+
+pkgname=brasero
+pkgver=3.8.0
+pkgrel=3
+pkgdesc="A disc burning application for Gnome"
+arch=('i686' 'x86_64')
+url="http://www.gnome.org/projects/brasero"
+license=('GPL')
+options=('!libtool' '!emptydirs')
+depends=('gtk3' 'gst-plugins-good' 'totem-plparser' 'cdrkit' 'cdrdao' 'desktop-file-utils' 'hicolor-icon-theme' 'shared-mime-info' 'libcanberra' 'dvd+rw-tools' 'dconf' 'libsm' 'libtracker-sparql' 'libnotify')
+makedepends=('gtk-doc' 'yelp-tools' 'gnome-common' 'intltool' 'libburn' 'libisofs' 'libnautilus-extension' 'gobject-introspection' 'gconf' 'itstool' 'docbook-xsl')
+optdepends=('libburn: alternative back-end'
+ 'libisofs: libburn back-end'
+ 'dvdauthor: video project'
+ 'vcdimager: video project')
+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')
+
+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
+ make
+}
+
+package() {
+ cd "$pkgname-$pkgver"
+ make DESTDIR=$pkgdir install
+}
+
Copied: brasero/repos/gnome-unstable-i686/brasero.install (from rev 194857, brasero/trunk/brasero.install)
===================================================================
--- gnome-unstable-i686/brasero.install (rev 0)
+++ gnome-unstable-i686/brasero.install 2013-09-23 20:04:59 UTC (rev 194858)
@@ -0,0 +1,14 @@
+post_install() {
+ glib-compile-schemas /usr/share/glib-2.0/schemas
+ gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+ update-desktop-database -q
+ update-mime-database /usr/share/mime > /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: brasero/repos/gnome-unstable-i686/bug655513.patch (from rev 194857, brasero/trunk/bug655513.patch)
===================================================================
--- gnome-unstable-i686/bug655513.patch (rev 0)
+++ gnome-unstable-i686/bug655513.patch 2013-09-23 20:04:59 UTC (rev 194858)
@@ -0,0 +1,37 @@
+From f122ee0620380b7c21edce722cfe347f10c8c827 Mon Sep 17 00:00:00 2001
+From: Joshua Lock <joshua.lock at 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
Copied: brasero/repos/gnome-unstable-x86_64/PKGBUILD (from rev 194857, brasero/trunk/PKGBUILD)
===================================================================
--- gnome-unstable-x86_64/PKGBUILD (rev 0)
+++ gnome-unstable-x86_64/PKGBUILD 2013-09-23 20:04:59 UTC (rev 194858)
@@ -0,0 +1,52 @@
+# $Id$
+# Maintainer: Allan McRae <allan at archlinux.org>
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Contributor: William Rea <sillywilly at gmail.com>
+
+pkgname=brasero
+pkgver=3.8.0
+pkgrel=3
+pkgdesc="A disc burning application for Gnome"
+arch=('i686' 'x86_64')
+url="http://www.gnome.org/projects/brasero"
+license=('GPL')
+options=('!libtool' '!emptydirs')
+depends=('gtk3' 'gst-plugins-good' 'totem-plparser' 'cdrkit' 'cdrdao' 'desktop-file-utils' 'hicolor-icon-theme' 'shared-mime-info' 'libcanberra' 'dvd+rw-tools' 'dconf' 'libsm' 'libtracker-sparql' 'libnotify')
+makedepends=('gtk-doc' 'yelp-tools' 'gnome-common' 'intltool' 'libburn' 'libisofs' 'libnautilus-extension' 'gobject-introspection' 'gconf' 'itstool' 'docbook-xsl')
+optdepends=('libburn: alternative back-end'
+ 'libisofs: libburn back-end'
+ 'dvdauthor: video project'
+ 'vcdimager: video project')
+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')
+
+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
+ make
+}
+
+package() {
+ cd "$pkgname-$pkgver"
+ make DESTDIR=$pkgdir install
+}
+
Copied: brasero/repos/gnome-unstable-x86_64/brasero.install (from rev 194857, brasero/trunk/brasero.install)
===================================================================
--- gnome-unstable-x86_64/brasero.install (rev 0)
+++ gnome-unstable-x86_64/brasero.install 2013-09-23 20:04:59 UTC (rev 194858)
@@ -0,0 +1,14 @@
+post_install() {
+ glib-compile-schemas /usr/share/glib-2.0/schemas
+ gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+ update-desktop-database -q
+ update-mime-database /usr/share/mime > /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: brasero/repos/gnome-unstable-x86_64/bug655513.patch (from rev 194857, brasero/trunk/bug655513.patch)
===================================================================
--- gnome-unstable-x86_64/bug655513.patch (rev 0)
+++ gnome-unstable-x86_64/bug655513.patch 2013-09-23 20:04:59 UTC (rev 194858)
@@ -0,0 +1,37 @@
+From f122ee0620380b7c21edce722cfe347f10c8c827 Mon Sep 17 00:00:00 2001
+From: Joshua Lock <joshua.lock at 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
More information about the arch-commits
mailing list