From 592467bdc53f5d59d855bb5e585abe60147d799c Mon Sep 17 00:00:00 2001 From: Johannes Huber Date: Thu, 12 Jan 2012 00:10:53 +0000 Subject: [PATCH] Revision bump. Add patch to fix compatibility with >=app-cdr/cdemud-1.4.0. Thanks Alexandre Rostovtsev for the patch. Fixes bug #393121. Package-Manager: portage-2.2.0_alpha84/cvs/Linux i686 --- app-cdr/kcdemu/ChangeLog | 13 +++- app-cdr/kcdemu/Manifest | 19 ++++-- .../files/kcdemu-0.3.1-start-cdemud.patch | 68 +++++++++++++++++++ ...mu-0.3.1.ebuild => kcdemu-0.3.1-r1.ebuild} | 10 ++- 4 files changed, 98 insertions(+), 12 deletions(-) create mode 100644 app-cdr/kcdemu/files/kcdemu-0.3.1-start-cdemud.patch rename app-cdr/kcdemu/{kcdemu-0.3.1.ebuild => kcdemu-0.3.1-r1.ebuild} (70%) diff --git a/app-cdr/kcdemu/ChangeLog b/app-cdr/kcdemu/ChangeLog index b176291dd21a..831b303991ed 100644 --- a/app-cdr/kcdemu/ChangeLog +++ b/app-cdr/kcdemu/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for app-cdr/kcdemu -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-cdr/kcdemu/ChangeLog,v 1.4 2010/10/09 19:15:52 fauli Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-cdr/kcdemu/ChangeLog,v 1.5 2012/01/12 00:10:53 johu Exp $ + +*kcdemu-0.3.1-r1 (12 Jan 2012) + + 12 Jan 2012; Johannes Huber + +files/kcdemu-0.3.1-start-cdemud.patch, +kcdemu-0.3.1-r1.ebuild, + -kcdemu-0.3.1.ebuild: + Revision bump. Add patch to fix compatibility with >=app-cdr/cdemud-1.4.0. + Thanks Alexandre Rostovtsev for the patch. Fixes bug + #393121. 09 Oct 2010; Christian Faulhammer kcdemu-0.3.ebuild: stable x86, bug 328699 diff --git a/app-cdr/kcdemu/Manifest b/app-cdr/kcdemu/Manifest index 959b517b0f10..20df3086edae 100644 --- a/app-cdr/kcdemu/Manifest +++ b/app-cdr/kcdemu/Manifest @@ -1,16 +1,21 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA512 +AUX kcdemu-0.3.1-start-cdemud.patch 2158 RMD160 38d5cdda076114ee6cf2fa8ec84819eecbd5ceea SHA1 57fec04276dc317497e5755992de5462169e0e51 SHA256 dfd311409cf031386c1a936661aca4e31dae3a18aa621ac7322d4d237ef0c44f DIST 99752-kde_cdemu-0.3.1.tar.bz2 11921 RMD160 4ba01b46bda473565715eb07b84aeccdc83c0809 SHA1 b7b0ad93a8f6fe719cd77cdee4acfe635509a778 SHA256 4489d99f373a35bc1ef8b5ad94402e28bace5e40bc65c45b39e48598d77cd468 DIST 99752-kde_cdemu-0.3.tar.gz 10397 RMD160 39ff9b2f3a10b89ed26591ae4ea939e997ddf6f5 SHA1 d276b67d7154fbbf3642dd75c40c1e18ae392be3 SHA256 c679fe2593d7d286b794ac377006ceb670a5053f252c6ad5e508fa50aeb13e8c -EBUILD kcdemu-0.3.1.ebuild 648 RMD160 fcf8919da0c4a4f4df62946656148fcf62a151ee SHA1 9ef337c96fa06eba23d178442115610892306f2b SHA256 6cc23d8a9a637058d154b1a3413ca75caa4c5922127151f1ff6a0072da109b26 +EBUILD kcdemu-0.3.1-r1.ebuild 698 RMD160 6f013870906cc9958e8f9b1cc644c4aa2980794b SHA1 b68152d0af7f55efa6f9c8104fffcaf5c16c4549 SHA256 c4a56dfe6420c5e237ff0f642020fbe4270c57321c6c958b831c12432b5f8d2f EBUILD kcdemu-0.3.ebuild 628 RMD160 10154b00637c22e4abea1316ee3f7f8b914bc85c SHA1 8101091cc005a581f7b29f1e664068834cab3766 SHA256 c9a02c5302301e4269aa5846f6a97fec550f97c891bd91922bf63763abad9e53 -MISC ChangeLog 731 RMD160 5b2f5f52dfacea8a340813432e3f92a96db99435 SHA1 eb931d7afdeed3d10aa4c12ee2ab5dc714d5c2a3 SHA256 54b49b2f52c45cb8278b0f72e51438847a361f96fb19133048aa4dd5fb60a28c +MISC ChangeLog 1068 RMD160 53e82bfee220a2c9f45e30834a6314b9538a9e6b SHA1 8859e7cb0e5d2085d7ec4c1e17d13f82c451367c SHA256 b9cfc455c57f0207c3081abf7859c1173469956a21919453e6776d5bc540cf8b MISC metadata.xml 187 RMD160 16d2d27ffa7efe3dd118d140bce34177b08ebb92 SHA1 505b8398d35ed05d69f6fa649b631b9d0443da9b SHA256 ae372c79824a2096579aaef2cd5d557ebca1c9dd4a86e399bafde36ce073b179 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.16 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAkywv9cACgkQNQqtfCuFneP/UgCfTP+6tnUfKcNqZ9a2twOIakD9 -b50AnR1npuqMK2EJbkNu3zZrmCUfmX6S -=C0qF +iQEcBAEBCgAGBQJPDiXNAAoJEO+t9ga+3I3a1vMH+gL9rIPn19NdJCOiZZU+XnLV +KF3IhXd1miD56DhIc8/3Ikt9z/3DsGTR172H+4LgdtPT3wv81IHFzfdQJ+M4Iaoi +Cm6PeRYr1AouUxnEKIJY9ybzDTcl/gZ6pna50sqWlEKjPfPyG1dE3t1OFGPyvGXj +dfqEaefseucYCxeIKc8ChIoPA4dMhcI6wWSQATdP6YnWuR8iXD8mAIEz7X6jJwsE +hvdQnhXKFQd3zmamhUGSGUaSmvLQjfR4bXX8Zqn0R0KofuDTPM3pgjq0tyv66uRw +URzxwBtx84EzimXMZdTXhoMhUBMX6jS3bNmeP4G6I5DXDn0qyh+WFY/4I/LegJI= +=GF4a -----END PGP SIGNATURE----- diff --git a/app-cdr/kcdemu/files/kcdemu-0.3.1-start-cdemud.patch b/app-cdr/kcdemu/files/kcdemu-0.3.1-start-cdemud.patch new file mode 100644 index 000000000000..d6edfae54470 --- /dev/null +++ b/app-cdr/kcdemu/files/kcdemu-0.3.1-start-cdemud.patch @@ -0,0 +1,68 @@ +From 9486c351315373e7f3be0ca8ab3c84e3295eccfb Mon Sep 17 00:00:00 2001 +From: Alexandre Rostovtsev +Date: Tue, 10 Jan 2012 23:29:23 -0500 +Subject: [PATCH] Try to start the daemon if it's not already running + +Fixes compatibility with cdemud-1.4.0, see +https://bugs.gentoo.org/show_bug.cgi?id=393121 +--- + src/cdemu.cpp | 9 ++++++++- + src/cdemu.h | 2 +- + 2 files changed, 9 insertions(+), 2 deletions(-) + +diff --git a/src/cdemu.cpp b/src/cdemu.cpp +index 3fe18c2..75f91dc 100644 +--- a/src/cdemu.cpp ++++ b/src/cdemu.cpp +@@ -32,6 +32,9 @@ CDEmu::CDEmu() + m_currentBus(0) + { + this->findCurrentBus(); ++ // If the daemon has not been started, try to start it ++ if (!m_currentBus) ++ this->findCurrentBus(true); + + this->connectSlots(&m_sessionBus); + this->connectSlots(&m_systemBus); +@@ -181,7 +184,7 @@ void CDEmu::connectSlots(QDBusConnection *connection) + } + + +-void CDEmu::findCurrentBus() ++void CDEmu::findCurrentBus(bool start_daemon) + { + // We don't want to get signals from the wrong bus in case we + // switch from the session bus to the system bus or vice versa +@@ -194,12 +197,16 @@ void CDEmu::findCurrentBus() + + // Try session bus first + QDBusConnectionInterface *interface = m_sessionBus.interface(); ++ if (start_daemon) ++ interface->startService("net.sf.cdemu.CDEMUD_Daemon"); + if (interface->isServiceRegistered("net.sf.cdemu.CDEMUD_Daemon")) + m_currentBus = &m_sessionBus; + else + { + // Try system bus then + interface = m_systemBus.interface(); ++ if (start_daemon) ++ interface->startService("net.sf.cdemu.CDEMUD_Daemon"); + if (interface->isServiceRegistered("net.sf.cdemu.CDEMUD_Daemon")) + m_currentBus = &m_systemBus; + else +diff --git a/src/cdemu.h b/src/cdemu.h +index c7b0655..8381c2f 100644 +--- a/src/cdemu.h ++++ b/src/cdemu.h +@@ -56,7 +56,7 @@ private: + ~CDEmu(); + + void connectSlots(QDBusConnection *connection); +- void findCurrentBus(); ++ void findCurrentBus(bool start_daemon = false); + int nextFreeSlot(); + + QDBusConnection m_sessionBus; +-- +1.7.8.3 + diff --git a/app-cdr/kcdemu/kcdemu-0.3.1.ebuild b/app-cdr/kcdemu/kcdemu-0.3.1-r1.ebuild similarity index 70% rename from app-cdr/kcdemu/kcdemu-0.3.1.ebuild rename to app-cdr/kcdemu/kcdemu-0.3.1-r1.ebuild index bc3c595f6ccf..266fdd9950ea 100644 --- a/app-cdr/kcdemu/kcdemu-0.3.1.ebuild +++ b/app-cdr/kcdemu/kcdemu-0.3.1-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-cdr/kcdemu/kcdemu-0.3.1.ebuild,v 1.1 2010/10/06 20:02:40 tampakrap Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-cdr/kcdemu/kcdemu-0.3.1-r1.ebuild,v 1.1 2012/01/12 00:10:53 johu Exp $ -EAPI=3 +EAPI=4 KDE_LINGUAS="de es pl ro" inherit kde4-base @@ -19,6 +19,10 @@ IUSE="debug" RDEPEND=">=app-cdr/cdemu-1.2.0" +PATCHES=( + "${FILESDIR}/${P}-start-cdemud.patch" +) + S=${WORKDIR}/${MY_PN} DOCS=( ChangeLog ) -- 2.26.2