[arch-commits] Commit in dleyna-core/repos (6 files)
Jan Steffens
heftig at archlinux.org
Tue Jun 30 04:08:03 UTC 2015
Date: Tuesday, June 30, 2015 @ 06:08:03
Author: heftig
Revision: 241412
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
dleyna-core/repos/extra-i686/PKGBUILD
(from rev 241411, dleyna-core/trunk/PKGBUILD)
dleyna-core/repos/extra-i686/crash.patch
(from rev 241411, dleyna-core/trunk/crash.patch)
dleyna-core/repos/extra-x86_64/PKGBUILD
(from rev 241411, dleyna-core/trunk/PKGBUILD)
dleyna-core/repos/extra-x86_64/crash.patch
(from rev 241411, dleyna-core/trunk/crash.patch)
Deleted:
dleyna-core/repos/extra-i686/PKGBUILD
dleyna-core/repos/extra-x86_64/PKGBUILD
--------------------------+
/PKGBUILD | 74 +++++++++++++++++++++++++++++++++++++++++++++
extra-i686/PKGBUILD | 30 ------------------
extra-i686/crash.patch | 27 ++++++++++++++++
extra-x86_64/PKGBUILD | 30 ------------------
extra-x86_64/crash.patch | 27 ++++++++++++++++
5 files changed, 128 insertions(+), 60 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2015-06-30 04:07:08 UTC (rev 241411)
+++ extra-i686/PKGBUILD 2015-06-30 04:08:03 UTC (rev 241412)
@@ -1,30 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-
-pkgname=dleyna-core
-pkgver=0.4.0
-pkgrel=1
-pkgdesc="Library of utility functions that are used by the higher level dLeyna"
-arch=(i686 x86_64)
-url="http://01.org/dleyna"
-license=(LGPL2.1)
-depends=(gupnp)
-source=(https://01.org/sites/default/files/downloads/dleyna/$pkgname-$pkgver.tar.gz)
-sha256sums=('b39d98a79dcce82d4d4b7f932ffed98e97c46a361a43985c2eb1ad54db84c183')
-
-build() {
- cd $pkgname-$pkgver
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
- --disable-static
- make
-}
-
-check() {
- cd $pkgname-$pkgver
- make check
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
-}
Copied: dleyna-core/repos/extra-i686/PKGBUILD (from rev 241411, dleyna-core/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2015-06-30 04:08:03 UTC (rev 241412)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+
+pkgname=dleyna-core
+pkgver=0.5.0
+pkgrel=1
+pkgdesc="Library of utility functions that are used by the higher level dLeyna"
+arch=(i686 x86_64)
+url="http://01.org/dleyna"
+license=(LGPL2.1)
+depends=(gupnp)
+source=(https://01.org/sites/default/files/downloads/dleyna/$pkgname-$pkgver.tar.gz
+ crash.patch)
+sha256sums=('de3027acf5718eae837b5f126bd49b8111189fb075e040d43b480d2b9b114aae'
+ '28f8fa43476e4c71b8b1f16b7ab47df045db3c8490a97c19c7354ce56094bffe')
+
+prepare() {
+ cd $pkgname-$pkgver
+ patch -Np1 -i ../crash.patch
+}
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+ --disable-static
+ make
+}
+
+check() {
+ cd $pkgname-$pkgver
+ make check
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+}
Copied: dleyna-core/repos/extra-i686/crash.patch (from rev 241411, dleyna-core/trunk/crash.patch)
===================================================================
--- extra-i686/crash.patch (rev 0)
+++ extra-i686/crash.patch 2015-06-30 04:08:03 UTC (rev 241412)
@@ -0,0 +1,27 @@
+From 52d2ccdaac182b2fa2b36dfb21e4a7a41fac4c8d Mon Sep 17 00:00:00 2001
+From: Cornel Spinu <cornel.spinu at windriver.com>
+Date: Thu, 3 Jul 2014 16:28:22 +0300
+Subject: [PATCH] Gracefully exit in case of dbus session crash
+
+---
+ libdleyna/core/main-loop.c | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/libdleyna/core/main-loop.c b/libdleyna/core/main-loop.c
+index 3d80402..dfb3b2b 100644
+--- a/libdleyna/core/main-loop.c
++++ b/libdleyna/core/main-loop.c
+@@ -57,8 +57,11 @@ static gboolean prv_context_quit_cb(gpointer user_data)
+ {
+ DLEYNA_LOG_DEBUG("Quitting");
+
+- g_context.connector->disconnect();
+- g_context.control_point->stop_service();
++ if (g_context.connection != NULL)
++ {
++ g_context.connector->disconnect();
++ g_context.control_point->stop_service();
++ }
+
+ g_timeout_add_seconds(1, prv_context_mainloop_quit_cb, NULL);
+
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2015-06-30 04:07:08 UTC (rev 241411)
+++ extra-x86_64/PKGBUILD 2015-06-30 04:08:03 UTC (rev 241412)
@@ -1,30 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-
-pkgname=dleyna-core
-pkgver=0.4.0
-pkgrel=1
-pkgdesc="Library of utility functions that are used by the higher level dLeyna"
-arch=(i686 x86_64)
-url="http://01.org/dleyna"
-license=(LGPL2.1)
-depends=(gupnp)
-source=(https://01.org/sites/default/files/downloads/dleyna/$pkgname-$pkgver.tar.gz)
-sha256sums=('b39d98a79dcce82d4d4b7f932ffed98e97c46a361a43985c2eb1ad54db84c183')
-
-build() {
- cd $pkgname-$pkgver
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
- --disable-static
- make
-}
-
-check() {
- cd $pkgname-$pkgver
- make check
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
-}
Copied: dleyna-core/repos/extra-x86_64/PKGBUILD (from rev 241411, dleyna-core/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2015-06-30 04:08:03 UTC (rev 241412)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+
+pkgname=dleyna-core
+pkgver=0.5.0
+pkgrel=1
+pkgdesc="Library of utility functions that are used by the higher level dLeyna"
+arch=(i686 x86_64)
+url="http://01.org/dleyna"
+license=(LGPL2.1)
+depends=(gupnp)
+source=(https://01.org/sites/default/files/downloads/dleyna/$pkgname-$pkgver.tar.gz
+ crash.patch)
+sha256sums=('de3027acf5718eae837b5f126bd49b8111189fb075e040d43b480d2b9b114aae'
+ '28f8fa43476e4c71b8b1f16b7ab47df045db3c8490a97c19c7354ce56094bffe')
+
+prepare() {
+ cd $pkgname-$pkgver
+ patch -Np1 -i ../crash.patch
+}
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+ --disable-static
+ make
+}
+
+check() {
+ cd $pkgname-$pkgver
+ make check
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+}
Copied: dleyna-core/repos/extra-x86_64/crash.patch (from rev 241411, dleyna-core/trunk/crash.patch)
===================================================================
--- extra-x86_64/crash.patch (rev 0)
+++ extra-x86_64/crash.patch 2015-06-30 04:08:03 UTC (rev 241412)
@@ -0,0 +1,27 @@
+From 52d2ccdaac182b2fa2b36dfb21e4a7a41fac4c8d Mon Sep 17 00:00:00 2001
+From: Cornel Spinu <cornel.spinu at windriver.com>
+Date: Thu, 3 Jul 2014 16:28:22 +0300
+Subject: [PATCH] Gracefully exit in case of dbus session crash
+
+---
+ libdleyna/core/main-loop.c | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/libdleyna/core/main-loop.c b/libdleyna/core/main-loop.c
+index 3d80402..dfb3b2b 100644
+--- a/libdleyna/core/main-loop.c
++++ b/libdleyna/core/main-loop.c
+@@ -57,8 +57,11 @@ static gboolean prv_context_quit_cb(gpointer user_data)
+ {
+ DLEYNA_LOG_DEBUG("Quitting");
+
+- g_context.connector->disconnect();
+- g_context.control_point->stop_service();
++ if (g_context.connection != NULL)
++ {
++ g_context.connector->disconnect();
++ g_context.control_point->stop_service();
++ }
+
+ g_timeout_add_seconds(1, prv_context_mainloop_quit_cb, NULL);
+
More information about the arch-commits
mailing list