diff options
| -rw-r--r-- | kde-base/kmail/Manifest | 4 | ||||
| -rw-r--r-- | kde-base/kmail/files/generate-globalsettings-kcfg.patch | 12 | ||||
| -rw-r--r-- | kde-base/kmail/files/generate-kcfg-files.patch | 16 | ||||
| -rw-r--r-- | kde-base/kmail/kmail-9999.ebuild | 4 |
4 files changed, 21 insertions, 15 deletions
diff --git a/kde-base/kmail/Manifest b/kde-base/kmail/Manifest index 50e843724be..209536e4e86 100644 --- a/kde-base/kmail/Manifest +++ b/kde-base/kmail/Manifest @@ -1,4 +1,4 @@ -AUX generate-messageviewer-kcfg.patch 410 RMD160 05304a1b75169835715494f633cb7193d93e31a3 SHA1 a32e1b26dcff57bdcd25cd0d1ed2bb07bfd90d78 SHA256 cbafd6201ad7c7b182f2ea03d45aca5ee0eea4dbd078d3c82e03aedfc8ab9afd +AUX generate-kcfg-files.patch 671 RMD160 6f78008967990f4efb521d8fcf5202977829723c SHA1 97865ca098fe10583256ea1f1f372da00e959acf SHA256 ab9c8d706dafbc632c0aa82ae6b8ce6e344a7f48a59a7657efd056d77bc3bbfe EBUILD kmail-4.4.9999.ebuild 1551 RMD160 fd78233e84d2c717ad849532701109f223b95176 SHA1 88fba555ccac04d913e663323ea337098b3c5734 SHA256 132d915f566b5b857e241653159233d7851909b3ae3fd20424f8e09a3482141f -EBUILD kmail-9999.ebuild 1536 RMD160 decb1ab60b326beee87bf2379b58081f7610d710 SHA1 0a65f0c164e805fbba0ea7cee5c77473db046cb7 SHA256 b2d8dcadbb2e65174f8681c66ef0021b1397172f944f82bbb6215ebc1d51eb6d +EBUILD kmail-9999.ebuild 1580 RMD160 8d0eb2045126b7ca37ad2c0cdb46b8d32b20ae23 SHA1 730d6d5216ea800587a27bae0df6b121d203ff5e SHA256 2ad815ca6523a1181a6557a5db75feacb9e5b8f343d3d9e3face756ff0f90f07 MISC metadata.xml 279 RMD160 8e4afc55339c16ac4ff11c986a73243696bd9940 SHA1 238511afd59478eb71e701ce58e30a7d8fde1784 SHA256 becb9880c6456e35b6099918612ce90460d9b7555c669f1a970d0e88f7dce28a diff --git a/kde-base/kmail/files/generate-globalsettings-kcfg.patch b/kde-base/kmail/files/generate-globalsettings-kcfg.patch deleted file mode 100644 index 4cb22158a75..00000000000 --- a/kde-base/kmail/files/generate-globalsettings-kcfg.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- kmail/CMakeLists.txt.orig 2010-04-01 00:45:22.000000000 +0200 -+++ kmail/CMakeLists.txt 2010-04-01 00:45:41.000000000 +0200 -@@ -223,6 +223,9 @@ - customtemplates_kfg.kcfgc - ) - -+kde4_add_kcfg_files(kmailprivate_LIB_SRCS -+ ../messageviewer/globalsettings_base.kcfgc USE_RELATIVE_PATH -+) - - kde4_add_library(kmailprivate SHARED ${kmailprivate_LIB_SRCS}) - target_link_libraries(kmailprivate diff --git a/kde-base/kmail/files/generate-kcfg-files.patch b/kde-base/kmail/files/generate-kcfg-files.patch new file mode 100644 index 00000000000..da1d23c513d --- /dev/null +++ b/kde-base/kmail/files/generate-kcfg-files.patch @@ -0,0 +1,16 @@ +--- kmail/CMakeLists.txt.orig 2010-04-01 00:45:22.000000000 +0200 ++++ kmail/CMakeLists.txt 2010-04-01 00:45:41.000000000 +0200 +@@ -223,6 +223,13 @@ + customtemplates_kfg.kcfgc + ) + ++kde4_add_kcfg_files(kmailprivate_LIB_SRCS ++ ../messagecomposer/messagecomposersettings_base.kcfgc USE_RELATIVE_PATH ++ ../messageviewer/globalsettings_base.kcfgc USE_RELATIVE_PATH ++ ../templateparser/customtemplates_kfg.kcfgc USE_RELATIVE_PATH ++ ../templateparser/globalsettings_base.kcfgc USE_RELATIVE_PATH ++ ../templateparser/templatesconfiguration_kfg.kcfgc USE_RELATIVE_PATH ++) + + kde4_add_library(kmailprivate SHARED ${kmailprivate_LIB_SRCS}) + target_link_libraries(kmailprivate diff --git a/kde-base/kmail/kmail-9999.ebuild b/kde-base/kmail/kmail-9999.ebuild index 054e450f1d7..57cc3d55a54 100644 --- a/kde-base/kmail/kmail-9999.ebuild +++ b/kde-base/kmail/kmail-9999.ebuild @@ -22,6 +22,7 @@ DEPEND=" $(add_kdebase_dep messagecore) $(add_kdebase_dep messagelist) $(add_kdebase_dep messageviewer) + $(add_kdebase_dep templateparser) " RDEPEND="${DEPEND} $(add_kdebase_dep kdepim-runtime) @@ -41,6 +42,7 @@ KMEXTRACTONLY=" messagecore/ messagelist/ messageviewer/ + templateparser/ " KMEXTRA=" kmailcvt/ @@ -50,7 +52,7 @@ KMEXTRA=" " KMLOADLIBS="libkdepim" -PATCHES=( "${FILESDIR}/generate-messageviewer-kcfg.patch" ) +PATCHES=( "${FILESDIR}/generate-kcfg-files.patch" ) src_compile() { # Bug #276377: kontact/ can build before kmail/, causing a dependency not to be built |