Apply upstream "unlock the mutex before deleting it" patch.

Package-Manager: portage-2.2_rc62/cvs/Linux x86_64

4 files changed, 134 insertions, 2 deletions

diff --git a/dev-libs/soprano/ChangeLog b/dev-libs/soprano/ChangeLog
index 4d5b71afd94e..49d42e5da280 100644
--- a/dev-libs/soprano/ChangeLog
+++ b/dev-libs/soprano/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/soprano
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/soprano/ChangeLog,v 1.40 2010/02/09 23:32:33 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/soprano/ChangeLog,v 1.41 2010/02/11 12:47:53 ssuominen Exp $
+
+*soprano-2.4.0-r1 (11 Feb 2010)
+
+  11 Feb 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +soprano-2.4.0-r1.ebuild, +files/soprano-2.4.0-socketMutex.unlock.patch:
+  Apply upstream "unlock the mutex before deleting it" patch.
 
 *soprano-2.4.0 (09 Feb 2010)
 
diff --git a/dev-libs/soprano/Manifest b/dev-libs/soprano/Manifest
index e78f7d0b521f..e02b268849af 100644
--- a/dev-libs/soprano/Manifest
+++ b/dev-libs/soprano/Manifest
@@ -1,6 +1,8 @@
+AUX soprano-2.4.0-socketMutex.unlock.patch 580 RMD160 c10a31b8507432d63bfe2dc78d586900c84d2ec1 SHA1 c295f1e10dad4c9a28d9742bb4784608054013e0 SHA256 de04ba8fc453a16521cb9ef1a4da567c1620832c0179d325788fce7f7429ff7d
 DIST soprano-2.3.1.tar.bz2 1919103 RMD160 51d36d21241423da1766b876dee6acd5ef4cc5d8 SHA1 25871876ed83a4a3863585deee4d63b882ff7c9e SHA256 13e8b123bbbaea55f0a89495de6b08bb09945cd983f525a63c60f3345726be95
 DIST soprano-2.4.0.tar.bz2 1942200 RMD160 84231d68e8940518b1ad092dfbf7a3974d6f8d62 SHA1 13b5bedcd3fce821bbd912b4fcd9b8c5f609112b SHA256 7f36a4c022f0de7baef7fcac57afae8f6922afc19b7640282b4ba945bae26098
 EBUILD soprano-2.3.1-r1.ebuild 2855 RMD160 c75054853fd51be05aa032cd1955347570bb4e60 SHA1 b5f020ca8f6b126f478bdc5b4fa274302e4e3623 SHA256 bd27c035d0fb80ff3ff45f78319bd027094a4249603b83ad1e74f50ed64707fb
+EBUILD soprano-2.4.0-r1.ebuild 3022 RMD160 d3b8c7b892b0b14b0f9fc2a868159a8dee583a13 SHA1 4262e695268471f77f0ba92c212ad5fef29a9920 SHA256 08b0a60dacc624fb85c6f8798a74c34a4a67eb652f8b352cfeb3f0e20f9f1bbe
 EBUILD soprano-2.4.0.ebuild 2961 RMD160 f789dc1c20c5e3c12732148e1a0c2039c4c6a899 SHA1 9a0b6e15970b8e021a3ff340466b165e4e2f4258 SHA256 b41e68512a43e323bafee75527d018cf054d7ce916ffe3468de2de547cf46845
-MISC ChangeLog 5841 RMD160 652529531f446ab9ef99de8c7fdbd8ba00950bf8 SHA1 a443f971047d647e2eb2f215b66177a025f18cb4 SHA256 ab5da74dc1a5b595dea8c1260f226af300b2befb8050d9307ff6e3b0548531fe
+MISC ChangeLog 6067 RMD160 2ed469da89784f5e379f9b570c14887636c1f59b SHA1 68cecf2c28c5282786f84d6debeedbb20ca7ce9f SHA256 4af20da500a49ed755e17c922ebc1d5c096cd9c36a602992d3651f6ba5938189
 MISC metadata.xml 661 RMD160 4cc052a1f0507d9ea45b3dc36c0d1319cd5d6801 SHA1 ccb365c5b898290244b5ea3c66fa938fb327cce6 SHA256 e06e233e003c202ac8257cdc080eb6380dc6b78166554c54fe72cee5ba39619b
diff --git a/dev-libs/soprano/files/soprano-2.4.0-socketMutex.unlock.patch b/dev-libs/soprano/files/soprano-2.4.0-socketMutex.unlock.patch
new file mode 100644
index 000000000000..a346e5bfa507
--- /dev/null
+++ b/dev-libs/soprano/files/soprano-2.4.0-socketMutex.unlock.patch
@@ -0,0 +1,20 @@
+http://bugs.kde.org/show_bug.cgi?id=226218#c2
+http://websvn.kde.org/?view=rev&revision=1088551
+
+--- client/clientconnection.cpp
++++ client/clientconnection.cpp
+@@ -71,12 +71,13 @@
+ 
+ Soprano::Client::ClientConnection::~ClientConnection()
+ {
+-    QMutexLocker lock( &d->socketMutex );
++    d->socketMutex.lock();
+     // the sockets need to be deleted in their respective threads.
+     // this is what d->socketStorage does. We only close them here.
+     foreach( QIODevice* socket, d->sockets ) {
+         socket->close();
+     }
++    d->socketMutex.unlock();
+     delete d;
+ }
+ 
diff --git a/dev-libs/soprano/soprano-2.4.0-r1.ebuild b/dev-libs/soprano/soprano-2.4.0-r1.ebuild
new file mode 100644
index 000000000000..a51fec63f3c6
--- /dev/null
+++ b/dev-libs/soprano/soprano-2.4.0-r1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/soprano/soprano-2.4.0-r1.ebuild,v 1.1 2010/02/11 12:47:53 ssuominen Exp $
+
+EAPI="2"
+
+JAVA_PKG_OPT_USE="java"
+inherit base cmake-utils flag-o-matic java-pkg-opt-2
+
+DESCRIPTION="Library that provides a nice Qt interface to RDF storage solutions"
+HOMEPAGE="http://sourceforge.net/projects/soprano"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+IUSE="clucene +dbus debug doc elibc_FreeBSD java +raptor +redland +virtuoso"
+
+COMMON_DEPEND="
+	>=x11-libs/qt-core-4.5.0:4
+	clucene? ( dev-cpp/clucene )
+	dbus? ( >=x11-libs/qt-dbus-4.5.0:4 )
+	raptor? ( >=media-libs/raptor-1.4.16 )
+	redland? (
+		>=dev-libs/rasqal-0.9.15
+		>=dev-libs/redland-1.0.10
+	)
+	java? ( >=virtual/jdk-1.6.0 )
+	virtuoso? ( dev-db/libiodbc:0 )
+"
+DEPEND="${COMMON_DEPEND}
+	doc? ( app-doc/doxygen )
+"
+RDEPEND="${COMMON_DEPEND}
+	virtuoso? ( >=dev-db/virtuoso-server-6.1.0 )
+"
+
+CMAKE_IN_SOURCE_BUILD="1"
+
+PATCHES=( "${FILESDIR}/${P}-socketMutex.unlock.patch" )
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+
+	if [[ ${PV} = *9999* && -z $I_KNOW_WHAT_I_AM_DOING ]]; then
+		echo
+		ewarn "WARNING! This is an experimental ebuild of ${PN} SVN tree. Use at your own risk."
+		ewarn "Do _NOT_ file bugs at bugs.gentoo.org because of this ebuild!"
+		echo
+	fi
+
+	if ! use java && ! use virtuoso; then
+		if ! use redland; then
+			echo
+			ewarn "You have explicitly disabled the default soprano backend and haven't chosen"
+			ewarn "a different one. Applications using soprano may need at least one backend"
+			ewarn "to be functional. If you experience any problems, enable any of those USE"
+			ewarn "flags:"
+			ewarn "java, redland, virtuoso (recommended)"
+			echo
+		else
+			echo
+			ewarn "You selected redland as the only backend for soprano."
+			ewarn "Be advised that it's known to be broken (bug #275326)."
+			echo
+		fi
+	fi
+}
+
+src_prepare() {
+	base_src_prepare
+}
+
+src_configure() {
+	# Fix for missing pthread.h linking
+	# NOTE: temporarily fix until a better cmake files patch will be provided.
+	use elibc_FreeBSD && append-flags -pthread
+
+	mycmakeargs=(
+		-DSOPRANO_BUILD_TESTS=OFF
+		-DCMAKE_SKIP_RPATH=OFF
+		$(cmake-utils_use !clucene SOPRANO_DISABLE_CLUCENE_INDEX)
+		$(cmake-utils_use !dbus SOPRANO_DISABLE_DBUS)
+		$(cmake-utils_use !raptor SOPRANO_DISABLE_RAPTOR_PARSER)
+		$(cmake-utils_use !redland SOPRANO_DISABLE_RAPTOR_SERIALIZER)
+		$(cmake-utils_use !redland SOPRANO_DISABLE_REDLAND_BACKEND)
+		$(cmake-utils_use !java SOPRANO_DISABLE_SESAME2_BACKEND)
+		$(cmake-utils_use !virtuoso SOPRANO_DISABLE_VIRTUOSO_BACKEND)
+		$(cmake-utils_use doc SOPRANO_BUILD_API_DOCS)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	mycmakeargs+=(-DSOPRANO_BUILD_TESTS=ON)
+	cmake-utils_src_configure
+	cmake-utils_src_compile
+	ctest --extra-verbose || die "Tests failed."
+}