| 1 |
commit: 6bed1851bc5da9203f9e9df3c3b71b74a4db5faa |
| 2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jun 1 15:35:19 2013 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jun 1 15:35:19 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=6bed1851 |
| 7 |
|
| 8 |
[dev-libs/soprano] Respin broken patch wrt bug #472014. |
| 9 |
|
| 10 |
Package-Manager: portage-2.1.12.2 |
| 11 |
|
| 12 |
--- |
| 13 |
....cmake => soprano-2.9.3-make-broken-redland-fatal.cmake} | 13 +++++++------ |
| 14 |
dev-libs/soprano/soprano-9999.ebuild | 2 +- |
| 15 |
2 files changed, 8 insertions(+), 7 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-libs/soprano/files/soprano-2.4.4-make-broken-redland-fatal.cmake b/dev-libs/soprano/files/soprano-2.9.3-make-broken-redland-fatal.cmake |
| 18 |
similarity index 50% |
| 19 |
rename from dev-libs/soprano/files/soprano-2.4.4-make-broken-redland-fatal.cmake |
| 20 |
rename to dev-libs/soprano/files/soprano-2.9.3-make-broken-redland-fatal.cmake |
| 21 |
index e63c5a4..6641714 100644 |
| 22 |
--- a/dev-libs/soprano/files/soprano-2.4.4-make-broken-redland-fatal.cmake |
| 23 |
+++ b/dev-libs/soprano/files/soprano-2.9.3-make-broken-redland-fatal.cmake |
| 24 |
@@ -1,12 +1,13 @@ |
| 25 |
-diff -ru cmake/modules/FindRedland.cmake cmake/modules/FindRedland.cmake |
| 26 |
---- cmake/modules/FindRedland.cmake 2009-12-18 15:33:44.000000000 +0100 |
| 27 |
-+++ cmake/modules/FindRedland.cmake 2010-07-06 03:25:55.421484970 +0200 |
| 28 |
-@@ -108,7 +108,7 @@ |
| 29 |
+diff --git a/cmake/modules/FindRedland.cmake b/cmake/modules/FindRedland.cmake |
| 30 |
+index c7274c9..577dec2 100644 |
| 31 |
+--- a/cmake/modules/FindRedland.cmake |
| 32 |
++++ b/cmake/modules/FindRedland.cmake |
| 33 |
+@@ -115,7 +115,7 @@ if(NOT WIN32) |
| 34 |
if(NOT "${_TEST_EXITCODE}" EQUAL 0) |
| 35 |
set(_REDLAND_VERSION_OK) |
| 36 |
message(STATUS "${_OUTPUT}") |
| 37 |
- message(STATUS "Redland with broken NEEDED section detected, disabling") |
| 38 |
+ message(SEND_ERROR "Broken Redland detected, rebuild it now. If problem persists, report bug at bugs.gentoo.org.") |
| 39 |
- endif(NOT "${_TEST_EXITCODE}" EQUAL 0) |
| 40 |
- endif(_REDLAND_STORAGE_LIBS) |
| 41 |
+ endif() |
| 42 |
+ endif() |
| 43 |
|
| 44 |
|
| 45 |
diff --git a/dev-libs/soprano/soprano-9999.ebuild b/dev-libs/soprano/soprano-9999.ebuild |
| 46 |
index b837cc1..0f1397a 100644 |
| 47 |
--- a/dev-libs/soprano/soprano-9999.ebuild |
| 48 |
+++ b/dev-libs/soprano/soprano-9999.ebuild |
| 49 |
@@ -43,7 +43,7 @@ RDEPEND="${COMMON_DEPEND} |
| 50 |
CMAKE_IN_SOURCE_BUILD="1" |
| 51 |
|
| 52 |
PATCHES=( |
| 53 |
- "${FILESDIR}/${PN}-2.4.4-make-broken-redland-fatal.cmake" |
| 54 |
+ "${FILESDIR}/${PN}-2.9.3-make-broken-redland-fatal.cmake" |
| 55 |
) |
| 56 |
|
| 57 |
pkg_setup() { |
Archives