summaryrefslogtreecommitdiff
path: root/dev-libs
diff options
context:
space:
mode:
authorMaciej Mrozowski <reavertm@gentoo.org>2010-07-07 10:26:03 +0200
committerMaciej Mrozowski <reavertm@gentoo.org>2010-07-07 10:26:42 +0200
commitfa3a4e67216d449c89d5aa60644c8e75fb408771 (patch)
treea2fc5bb68180af99e113f3803398494646f965e6 /dev-libs
parent186f75ddda38ddff8ee908426c3791dbff8a4dca (diff)
downloadkde-fa3a4e67216d449c89d5aa60644c8e75fb408771.tar.gz
kde-fa3a4e67216d449c89d5aa60644c8e75fb408771.tar.bz2
kde-fa3a4e67216d449c89d5aa60644c8e75fb408771.zip
[dev-libs/soprano] Sync with tree (add make-broken-redland-fatal patch)
Diffstat (limited to 'dev-libs')
-rw-r--r--dev-libs/soprano/Manifest5
-rw-r--r--dev-libs/soprano/files/soprano-2.4.4-make-broken-redland-fatal.cmake12
-rw-r--r--dev-libs/soprano/soprano-2.4.63.ebuild4
-rw-r--r--dev-libs/soprano/soprano-9999.ebuild4
4 files changed, 23 insertions, 2 deletions
diff --git a/dev-libs/soprano/Manifest b/dev-libs/soprano/Manifest
index 3def916ef46..74bdf90eff5 100644
--- a/dev-libs/soprano/Manifest
+++ b/dev-libs/soprano/Manifest
@@ -1,4 +1,5 @@
+AUX soprano-2.4.4-make-broken-redland-fatal.cmake 664 RMD160 cc2ad8117dd3202f38c7c3273506671a31c7a55b SHA1 64550959420cb2ec429c77a7f7ba6a1813343c6d SHA256 cabff4156ec94222573bdd7be5c387298ab89838b682cfb7ce0a59f4949a31ae
DIST soprano-2.4.63.tar.bz2 1944827 RMD160 4ed28b9663e319cba31d77f7fb86fcd4ff3733f6 SHA1 67f458394b0f3c064c51455774e0c9a4aae9dba2 SHA256 6ee1021a5d0b53bcdbe16dd6f8b7dbf5dc8df4e62fde3dba70ef82567c031a47
-EBUILD soprano-2.4.63.ebuild 3027 RMD160 ee9a4c4def530112f6d25cab533a1e1c03d3521a SHA1 ae2e621285ddbd78dcb7c6442a0215f4e03b8ecf SHA256 fc1a75118701cf29f2f00c5f2d46b0fe329907acc2b5774968f77bc0a307e812
-EBUILD soprano-9999.ebuild 2869 RMD160 8d84b882c6375618bbbc484090be7763ec89db16 SHA1 c4763c1ba27a5b48ea096ee1222362eb2bd28199 SHA256 19b36554d90ca7eaff84665c9c629ae9a8835ee2bb397c506c67b0cc8bc4c602
+EBUILD soprano-2.4.63.ebuild 3099 RMD160 1461326faced177023e865f4dbee69937978bf7d SHA1 4cf7d180e4281ec19fb83f39e209ae1946a345f8 SHA256 fea6a87501eebd4ad8e144fd749becf38ab0ea710e44729223bbf44a00f00f9c
+EBUILD soprano-9999.ebuild 2941 RMD160 aba32d29e7445cc28d22d036b4e09944d04c925a SHA1 5b14caa535a32a3a0d5f710c459b01b194aef77d SHA256 7038ab1cae542c0ea123d57bad51616a90e78b4caed939e2026977a5c02ccf05
MISC metadata.xml 661 RMD160 4cc052a1f0507d9ea45b3dc36c0d1319cd5d6801 SHA1 ccb365c5b898290244b5ea3c66fa938fb327cce6 SHA256 e06e233e003c202ac8257cdc080eb6380dc6b78166554c54fe72cee5ba39619b
diff --git a/dev-libs/soprano/files/soprano-2.4.4-make-broken-redland-fatal.cmake b/dev-libs/soprano/files/soprano-2.4.4-make-broken-redland-fatal.cmake
new file mode 100644
index 00000000000..84e7e0689da
--- /dev/null
+++ b/dev-libs/soprano/files/soprano-2.4.4-make-broken-redland-fatal.cmake
@@ -0,0 +1,12 @@
+diff -ru ../soprano-2.4.4/cmake/modules/FindRedland.cmake ./cmake/modules/FindRedland.cmake
+--- ../soprano-2.4.4/cmake/modules/FindRedland.cmake 2009-12-18 15:33:44.000000000 +0100
++++ ./cmake/modules/FindRedland.cmake 2010-07-06 03:25:55.421484970 +0200
+@@ -108,7 +108,7 @@
+ if(NOT "${_TEST_EXITCODE}" EQUAL 0)
+ set(_REDLAND_VERSION_OK)
+ message(STATUS "${_OUTPUT}")
+- message(STATUS "Redland with broken NEEDED section detected, disabling")
++ message(SEND_ERROR "Broken Redland detected, rebuild it now. If problem persists, report bug at bugs.gentoo.org.")
+ endif(NOT "${_TEST_EXITCODE}" EQUAL 0)
+ endif(_REDLAND_STORAGE_LIBS)
+
diff --git a/dev-libs/soprano/soprano-2.4.63.ebuild b/dev-libs/soprano/soprano-2.4.63.ebuild
index f2cfed99d99..0c558ef840c 100644
--- a/dev-libs/soprano/soprano-2.4.63.ebuild
+++ b/dev-libs/soprano/soprano-2.4.63.ebuild
@@ -38,6 +38,10 @@ RDEPEND="${COMMON_DEPEND}
CMAKE_IN_SOURCE_BUILD="1"
+PATCHES=(
+ "${FILESDIR}/${PN}-2.4.4-make-broken-redland-fatal.cmake"
+)
+
pkg_setup() {
java-pkg-opt-2_pkg_setup
diff --git a/dev-libs/soprano/soprano-9999.ebuild b/dev-libs/soprano/soprano-9999.ebuild
index 5cebc4c0c63..97e3ada0375 100644
--- a/dev-libs/soprano/soprano-9999.ebuild
+++ b/dev-libs/soprano/soprano-9999.ebuild
@@ -38,6 +38,10 @@ RDEPEND="${COMMON_DEPEND}
CMAKE_IN_SOURCE_BUILD="1"
+PATCHES=(
+ "${FILESDIR}/${PN}-2.4.4-make-broken-redland-fatal.cmake"
+)
+
pkg_setup() {
java-pkg-opt-2_pkg_setup