| 1 |
commit: c9b59f99cf444d40028ed6c8728c37834c9d3ba2 |
| 2 |
Author: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed May 30 14:37:02 2012 +0000 |
| 4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed May 30 14:37:02 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=c9b59f99 |
| 7 |
|
| 8 |
[kde-base/nepomuk-core] Add upstream patches to fix file collisions properly. |
| 9 |
|
| 10 |
(Portage version: 2.2.0_alpha108/git/Linux x86_64, unsigned Manifest commit) |
| 11 |
|
| 12 |
--- |
| 13 |
.../files/nepomuk-core-4.8.80-remove-rcgen.patch | 23 +++++++++++++++++++ |
| 14 |
.../files/nepomuk-core-4.8.80-workspace.patch | 24 ++++++++++++++++++++ |
| 15 |
kde-base/nepomuk-core/nepomuk-core-4.8.80.ebuild | 5 ++++ |
| 16 |
3 files changed, 52 insertions(+), 0 deletions(-) |
| 17 |
|
| 18 |
diff --git a/kde-base/nepomuk-core/files/nepomuk-core-4.8.80-remove-rcgen.patch b/kde-base/nepomuk-core/files/nepomuk-core-4.8.80-remove-rcgen.patch |
| 19 |
new file mode 100644 |
| 20 |
index 0000000..0f96371 |
| 21 |
--- /dev/null |
| 22 |
+++ b/kde-base/nepomuk-core/files/nepomuk-core-4.8.80-remove-rcgen.patch |
| 23 |
@@ -0,0 +1,23 @@ |
| 24 |
+commit 6ec4e729e2426dac37e9e27932d4d9e579d53ba4 |
| 25 |
+Author: Vishesh Handa <handa.vish@×××××.com> |
| 26 |
+Date: Fri May 25 19:57:26 2012 +0530 |
| 27 |
+ |
| 28 |
+ Do not compile and install the rcgen |
| 29 |
+ |
| 30 |
+ Conflicts with kdelibs. |
| 31 |
+ |
| 32 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 33 |
+index 5c7c8ab..3bd49c2 100644 |
| 34 |
+--- a/CMakeLists.txt |
| 35 |
++++ b/CMakeLists.txt |
| 36 |
+@@ -57,7 +57,9 @@ include_directories( |
| 37 |
+ ) |
| 38 |
+ |
| 39 |
+ add_subdirectory(libnepomukcore) |
| 40 |
+-add_subdirectory(rcgen) |
| 41 |
++# Do not install rcgen, it's installed by kdelibs |
| 42 |
++# If it needs to be installed then we need to change the name |
| 43 |
++#add_subdirectory(rcgen) |
| 44 |
+ add_subdirectory(ontologies) |
| 45 |
+ add_subdirectory(common) |
| 46 |
+ add_subdirectory(server) |
| 47 |
|
| 48 |
diff --git a/kde-base/nepomuk-core/files/nepomuk-core-4.8.80-workspace.patch b/kde-base/nepomuk-core/files/nepomuk-core-4.8.80-workspace.patch |
| 49 |
new file mode 100644 |
| 50 |
index 0000000..24616b4 |
| 51 |
--- /dev/null |
| 52 |
+++ b/kde-base/nepomuk-core/files/nepomuk-core-4.8.80-workspace.patch |
| 53 |
@@ -0,0 +1,24 @@ |
| 54 |
+commit b60025c6d5d6201b2bbe6881f11c431ec2671677 |
| 55 |
+Author: Vishesh Handa <handa.vish@×××××.com> |
| 56 |
+Date: Fri May 25 23:31:47 2012 +0530 |
| 57 |
+ |
| 58 |
+ Do not depend on KDE4Workspace |
| 59 |
+ |
| 60 |
+ Weird cyclic dependency. Plus we do not need anything from the |
| 61 |
+ workspace. |
| 62 |
+ |
| 63 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 64 |
+index 3bd49c2..32e1909 100644 |
| 65 |
+--- a/CMakeLists.txt |
| 66 |
++++ b/CMakeLists.txt |
| 67 |
+@@ -14,8 +14,8 @@ set(CMAKE_NEPOMUK_CORE_VERSION_STRING "${CMAKE_NEPOMUK_CORE_VERSION_MAJOR}.${CMA |
| 68 |
+ set(KDE_MIN_VERSION "4.7.00") |
| 69 |
+ find_package(KDE4 4.7.00 REQUIRED) |
| 70 |
+ include(KDE4Defaults) |
| 71 |
+-find_package(KDE4Workspace) |
| 72 |
+-include(MacroLibrary) |
| 73 |
++#find_package(KDE4Workspace) |
| 74 |
++#include(MacroLibrary) |
| 75 |
+ |
| 76 |
+ set(SDO_MIN_VERSION "0.7") |
| 77 |
+ find_package(SharedDesktopOntologies) |
| 78 |
|
| 79 |
diff --git a/kde-base/nepomuk-core/nepomuk-core-4.8.80.ebuild b/kde-base/nepomuk-core/nepomuk-core-4.8.80.ebuild |
| 80 |
index e43b6df..741c13e 100644 |
| 81 |
--- a/kde-base/nepomuk-core/nepomuk-core-4.8.80.ebuild |
| 82 |
+++ b/kde-base/nepomuk-core/nepomuk-core-4.8.80.ebuild |
| 83 |
@@ -21,3 +21,8 @@ add_blocker nepomuk '<4.8.80' |
| 84 |
|
| 85 |
RESTRICT="test" |
| 86 |
# bug 392989 |
| 87 |
+ |
| 88 |
+PATCHES=( |
| 89 |
+ "${FILESDIR}/${P}-remove-rcgen.patch" |
| 90 |
+ "${FILESDIR}/${P}-workspace.patch" |
| 91 |
+) |
Archives