[gentoo-commits] proj/kde:master commit in: kde-base/kdepim-common-libs/, kde-base/kdepim-common-libs/files/

[gentoo-commits] proj/kde:master commit in: kde-base/kdepim-common-libs/, kde-base/kdepim-common-libs/files/

[Patrick Lauer]

commit:     8475d02af4c526f0a825833442b0751fa41a545f
Author:     Patrick Lauer <patrick <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 25 03:20:14 2013 +0000
Commit:     Patrick Lauer <patrick <AT> gentoo <DOT> org>
CommitDate: Mon Feb 25 03:20:14 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=8475d02a

[kde-base/kdepim-common-libs] Fix installed files #455274

---
 .../files/install-composereditorng.patch           |   15 +++++++++++++++
 .../kdepim-common-libs-9999.ebuild                 |    2 ++
 2 files changed, 17 insertions(+), 0 deletions(-)

diff --git a/kde-base/kdepim-common-libs/files/install-composereditorng.patch b/kde-base/kdepim-common-libs/files/install-composereditorng.patch
new file mode 100644
index 0000000..a5fbd33
--- /dev/null
+++ b/kde-base/kdepim-common-libs/files/install-composereditorng.patch
@@ -0,0 +1,15 @@
+--- CMakeLists.txt      2013-02-25 03:16:44.129528884 +0000
++++ CMakeLists.txt.new  2013-02-25 03:18:48.016192479 +0000
+@@ -58,8 +58,8 @@
+ install(TARGETS composereditorng ${INSTALL_TARGETS_DEFAULT_ARGS} )
+ install( FILES data/composereditorinitialhtml DESTINATION  ${DATA_INSTALL_DIR}/composereditor )
+ 
+-#install( FILES
+-#         composereditor_export.h
+-#         composereditor.h
+-#         DESTINATION ${INCLUDE_INSTALL_DIR}/composereditorng COMPONENT Devel )
++install( FILES
++         composereditor_export.h
++         composereditor.h
++         DESTINATION ${INCLUDE_INSTALL_DIR}/composereditorng COMPONENT Devel )
+

diff --git a/kde-base/kdepim-common-libs/kdepim-common-libs-9999.ebuild b/kde-base/kdepim-common-libs/kdepim-common-libs-9999.ebuild
index e04b5c4..412db5a 100644
--- a/kde-base/kdepim-common-libs/kdepim-common-libs-9999.ebuild
+++ b/kde-base/kdepim-common-libs/kdepim-common-libs-9999.ebuild
@@ -66,3 +66,5 @@ KMEXTRACTONLY="
 "
 
 KMSAVELIBS="true"
+
+PATCHES=( "${FILESDIR}/install-composereditorng.patch" )

[gentoo-commits] proj/kde:master commit in: kde-base/kdepim-common-libs/, kde-base/kdepim-common-libs/files/

[Dennis Schridde]

commit:     3a3291a65b0fa52fac190d3801d276e886c3abd5
Author:     Dennis Schridde <devurandom <AT> gmx <DOT> net>
AuthorDate: Sun Mar 23 11:52:17 2014 +0000
Commit:     Dennis Schridde <devurandom <AT> gmx <DOT> net>
CommitDate: Sun Mar 23 11:52:17 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=3a3291a6

[kde-base/kdepim-common-libs-4.12.95] folderarchiveagent.desktop belongs to kde-base/kmail, so do not install it here (bug #505212)

Package-Manager: portage-HEAD

---
 ...epim-common-libs-4.12.95-dont-install-folderarchiveagent.patch | 8 ++++++++
 kde-base/kdepim-common-libs/kdepim-common-libs-4.12.95.ebuild     | 3 +--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/kde-base/kdepim-common-libs/files/kdepim-common-libs-4.12.95-dont-install-folderarchiveagent.patch b/kde-base/kdepim-common-libs/files/kdepim-common-libs-4.12.95-dont-install-folderarchiveagent.patch
new file mode 100644
index 0000000..2e7600f
--- /dev/null
+++ b/kde-base/kdepim-common-libs/files/kdepim-common-libs-4.12.95-dont-install-folderarchiveagent.patch
@@ -0,0 +1,8 @@
+--- a/agents/CMakeLists.txt	2014-03-20 23:18:57.934117532 +0100
++++ b/agents/CMakeLists.txt	2014-03-20 23:39:40.801138867 +0100
+@@ -8,4 +8,3 @@
+ #DONOTCOMPILE add_subdirectory(notesagent)
+ #comment until 4.13
+ #add_subdirectory(followupreminderagent)
+-install(FILES folderarchiveagent.desktop DESTINATION "${CMAKE_INSTALL_PREFIX}/share/akonadi/agents")
+

diff --git a/kde-base/kdepim-common-libs/kdepim-common-libs-4.12.95.ebuild b/kde-base/kdepim-common-libs/kdepim-common-libs-4.12.95.ebuild
index ddf8f3d..ea56442 100644
--- a/kde-base/kdepim-common-libs/kdepim-common-libs-4.12.95.ebuild
+++ b/kde-base/kdepim-common-libs/kdepim-common-libs-4.12.95.ebuild
@@ -62,7 +62,6 @@ KMEXTRA="
 	templateparser/
 "
 KMEXTRACTONLY="
-	agents/folderarchiveagent.desktop
 	kleopatra/
 	kmail/
 	knode/org.kde.knode.xml
@@ -72,4 +71,4 @@ KMEXTRACTONLY="
 "
 KMSAVELIBS="true"
 
-PATCHES=( "${FILESDIR}/install-composereditorng.patch" )
+PATCHES=( "${FILESDIR}/install-composereditorng.patch" "${FILESDIR}/${P}-dont-install-folderarchiveagent.patch" )