aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoroli <oli@32389bae-6d03-0410-99cf-db05cde120eb>2008-09-05 11:38:03 +0000
committeroli <oli@32389bae-6d03-0410-99cf-db05cde120eb>2008-09-05 11:38:03 +0000
commit59f7f7b7bec44081a0b96dbc36071285a7128016 (patch)
tree0faa683494619d93956406c61d0ee820a50c12e2 /sci-misc/salome-med
parentsci-misc/salome-kernel: Fixed version dependency (diff)
downloadsci-59f7f7b7bec44081a0b96dbc36071285a7128016.tar.gz
sci-59f7f7b7bec44081a0b96dbc36071285a7128016.tar.bz2
sci-59f7f7b7bec44081a0b96dbc36071285a7128016.zip
sci-misc/salome-med: Added patch for >=dev-libs/boost-1.35.0
git-svn-id: http://overlays.gentoo.org/svn/proj/science/overlay@1287 32389bae-6d03-0410-99cf-db05cde120eb
Diffstat (limited to 'sci-misc/salome-med')
-rw-r--r--sci-misc/salome-med/ChangeLog4
-rw-r--r--sci-misc/salome-med/Manifest5
-rw-r--r--sci-misc/salome-med/files/salome-med-3.2.6_boost-1.35.patch20
-rw-r--r--sci-misc/salome-med/salome-med-3.2.6.ebuild5
4 files changed, 32 insertions, 2 deletions
diff --git a/sci-misc/salome-med/ChangeLog b/sci-misc/salome-med/ChangeLog
index 1d38119db..f7d5a89d3 100644
--- a/sci-misc/salome-med/ChangeLog
+++ b/sci-misc/salome-med/ChangeLog
@@ -1,6 +1,10 @@
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 05 Sep 2008; Oliver Borm (boroli) <oli.borm@web.de>
+ salome-med-3.2.6.ebuild, +files/salome-med-3.2.6_boost-1.35.patch:
+ Added patch for >=dev-libs/boost-1.35.0
+
04 Sep 2008; Oliver Borm (boroli) <oli.borm@web.de>
salome-med-3.2.6.ebuild:
removed omniorb* dependencies, as they are already in salome-kernel
diff --git a/sci-misc/salome-med/Manifest b/sci-misc/salome-med/Manifest
index 7d92509e3..4186c1ed6 100644
--- a/sci-misc/salome-med/Manifest
+++ b/sci-misc/salome-med/Manifest
@@ -1,8 +1,9 @@
AUX salome-med-3.2.6-gcc-4.3.patch 2565 RMD160 62ad0205e90c291eade1dd20706489d7e8147b7b SHA1 3cac370c4f6fed86ec70587b3abe72149c6c07c3 SHA256 1a3ace4ce4b6423d34c934dd2768d8169ac8f3895f95b01b488f0da26ca811cf
AUX salome-med-3.2.6.patch 1295 RMD160 0c9363c57a7ade8e631f42ba41ab9335bd37feae SHA1 b6938d6bf1990ab2325cba90f0eabaf6b9742d81 SHA256 af6defd83e9196bcf5df66e5dda0a64e1fd5cecf07259bd410ef0f91bb057b2b
+AUX salome-med-3.2.6_boost-1.35.patch 774 RMD160 db99f619e4cd989e3de772863f14bb2185e8bce3 SHA1 1fd5d3b49c8d804eefdc7fb7f2cd64c0b0ea74a6 SHA256 a896371677425ddcb6bd5902d83f1a65cceddd7a77e1f5f40b1d9fd0c9267cd2
AUX salome-med-3.2.6_environ.patch 829 RMD160 b2d457296e389d0f26344d1667cbd39f95bced69 SHA1 e3b584cef8a149c2bc92e98892714617383b8271 SHA256 718ce88901ec43210dcf67e7b36cae6cd1bde6f7e334f316da73bf8368304556
AUX salome-med-3.2.6_gcc4.patch 947 RMD160 c2af9d3fa5b8dd87baae7dab13798f71d61dd4f9 SHA1 16b58dbc90eb61835547f7c4987426fb295f242b SHA256 02f59ca69ee92a0a7378f0fa9662f00078fbcd8c4fa24f8c097ef5046787ed07
DIST src3.2.6.tar.gz 88763725 RMD160 0a0b77aa538832265416605bf502df9e790b45b7 SHA1 e4736b8431d3a4f43541e09eed861f88a2a2f439 SHA256 1f4ae59538675242b179fa2af9bf9adeffe87c8d80d3e6798bca03eafc0bb258
-EBUILD salome-med-3.2.6.ebuild 3889 RMD160 80f4d7b5d730c54b1a8582e327f4aa364f449bea SHA1 50636a16a2ecd2791a3ae53703982eedd87eb861 SHA256 3f29420ad6d0de040da328c530174a12ca60d531fcf695cca0ca8e046294490d
-MISC ChangeLog 1106 RMD160 c23cf8061b2e6702a5baa0c35d70bb3910cb64fb SHA1 573dd839daafe6b3e4fb889eaeda5e8677a57f36 SHA256 12d829ee63b22d487f8a374cb0c91218cfb9cecaba1a3cd525bdba8d9714d1cf
+EBUILD salome-med-3.2.6.ebuild 4012 RMD160 bc5c0d17a4af885043f4516eecd51f971d727b8e SHA1 33d82cade26af98571d91439dc2e54f7e1598f7e SHA256 66cb41e2d9ec740163efd6c0368fb8c3f4ee12c2fb915f2497941232ef41dd81
+MISC ChangeLog 1272 RMD160 1a912c446e85b8377ab6582d28d2822fa255423e SHA1 5dff29c248e73dfc6525a4cb09db81316e700181 SHA256 75d4c17d2f9e088de4b5f932520e03334e7eac1718d6c67bd456b6183c949247
MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900
diff --git a/sci-misc/salome-med/files/salome-med-3.2.6_boost-1.35.patch b/sci-misc/salome-med/files/salome-med-3.2.6_boost-1.35.patch
new file mode 100644
index 000000000..7425b13e9
--- /dev/null
+++ b/sci-misc/salome-med/files/salome-med-3.2.6_boost-1.35.patch
@@ -0,0 +1,20 @@
+--- src3.2.6_orig/MED_SRC_3.2.6/src/MEDWrapper/Base/MED_Wrapper.cxx 2008-09-04 21:10:27.000000000 +0200
++++ src3.2.6/MED_SRC_3.2.6/src/MEDWrapper/Base/MED_Wrapper.cxx 2008-09-04 21:14:06.000000000 +0200
+@@ -23,7 +23,7 @@
+ ::TLockProxy(TWrapper* theWrapper):
+ myWrapper(theWrapper)
+ {
+- boost::detail::thread::lock_ops<TWrapper::TMutex>::lock(myWrapper->myMutex);
++ myWrapper->myMutex.lock();
+ INITMSG(MYDEBUG,"TLockProxy() - this -"<<this<<"; myWrapper = "<<myWrapper<<endl);
+ }
+
+@@ -31,7 +31,7 @@
+ ::~TLockProxy()
+ {
+ INITMSG(MYDEBUG,"~TLockProxy() - this -"<<this<<"; myWrapper = "<<myWrapper<<endl);
+- boost::detail::thread::lock_ops<TWrapper::TMutex>::unlock(myWrapper->myMutex);
++ myWrapper->myMutex.unlock();
+ }
+
+ TWrapper*
diff --git a/sci-misc/salome-med/salome-med-3.2.6.ebuild b/sci-misc/salome-med/salome-med-3.2.6.ebuild
index 34e613156..40f6e77e0 100644
--- a/sci-misc/salome-med/salome-med-3.2.6.ebuild
+++ b/sci-misc/salome-med/salome-med-3.2.6.ebuild
@@ -44,6 +44,11 @@ src_unpack() {
epatch "${FILESDIR}"/${P}.patch
epatch "${FILESDIR}"/${P}_environ.patch
+ # boost 1.35.0 support
+ if has_version ">=dev-libs/boost-1.35.0" ; then
+ epatch "${FILESDIR}"/${P}_boost-1.35.patch
+ fi
+
# Gcc 4.3 support
if version_is_at_least "4.3" $(gcc-version) ; then
epatch "${FILESDIR}"/${P}-gcc-4.3.patch