diff options
| -rw-r--r-- | eclass/kde4-meta.eclass | 7 | ||||
| -rw-r--r-- | kde-base/korganizer/Manifest | 5 | ||||
| -rw-r--r-- | kde-base/korganizer/files/fix-broken-gpgme-cmake-guard.diff | 21 | ||||
| -rw-r--r-- | kde-base/korganizer/korganizer-4.4.9999.ebuild | 7 | ||||
| -rw-r--r-- | kde-base/korganizer/korganizer-9999.ebuild | 7 |
5 files changed, 8 insertions, 39 deletions
diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass index 14227718283..eec7acf8428 100644 --- a/eclass/kde4-meta.eclass +++ b/eclass/kde4-meta.eclass @@ -574,9 +574,14 @@ kde4-meta_change_cmakelists() { -e '/find_package\((KdepimLibs|Boost|QGpgme|Akonadi|ZLIB|Strigi|SharedDesktopOntologies|Soprano|Nepomuk)/{/macro_optional_/!s/find/macro_optional_&/}' \ -e '/macro_log_feature\((Boost|QGPGME|Akonadi|ZLIB|STRIGI|SHAREDDESKTOPONTOLOGIES|Soprano|Nepomuk)_FOUND/s/ TRUE / FALSE /' \ -i CMakeLists.txt || die "failed to disable hardcoded checks" + # Disable broken or redundant build logic + sed -e '/if[[:space:]]*([[:space:]]*BUILD_.*)/s/^/#OVERRIDE /' \ + -e '/if[[:space:]]*([[:space:]]*[[:alnum:]]*_FOUND[[:space:]]*)/s/^/#OVERRIDE /' \ + -i CMakeLists.txt \ + -i kontact/plugins/CMakeLists.txt || die 'failed to disable broken build logic' if ! slot_is_at_least 4.5 ${SLOT}; then case ${PN} in - kalarm|kmailcvt|kontact|korganizer|korn) + kaddressbook|kalarm|kmailcvt|kontact|korganizer|korn) sed -n -e '/qt4_generate_dbus_interface(.*org\.kde\.kmail\.\(kmail\|mailcomposer\)\.xml/p' \ -e '/add_custom_target(kmail_xml /,/)/p' \ -i kmail/CMakeLists.txt || die "uncommenting xml failed" diff --git a/kde-base/korganizer/Manifest b/kde-base/korganizer/Manifest index d9f70a40200..181342539a5 100644 --- a/kde-base/korganizer/Manifest +++ b/kde-base/korganizer/Manifest @@ -1,4 +1,3 @@ -AUX fix-broken-gpgme-cmake-guard.diff 635 RMD160 3b1704b0e88885fe835a7b614d547872469faa1c SHA1 c48d0296340dcedd091453f59084793d4a5a21ba SHA256 1f27d321300ea64723d6b3c167484ab375140a7f55c3cdef8a208729d4580fdd -EBUILD korganizer-4.4.9999.ebuild 1124 RMD160 a9bd22ca87fcb6118cbf21373c8dbb2ba2eed1ff SHA1 2158297bc50356b366f14eab3986d18c9d1f50f6 SHA256 df8b485aed6f3b24dff4667391b49fd8849af9559b3d90c425c988e3465e7cdf -EBUILD korganizer-9999.ebuild 1188 RMD160 99cfe52d57dddc581b5f24e0df75ea8c2ec11804 SHA1 3c69e14e87c06d02c5476e772663c3511cb37326 SHA256 e21c0e520263e7b754d622b40431e232ad00f6f43496e61509aaba8750632f03 +EBUILD korganizer-4.4.9999.ebuild 996 RMD160 8a0c110038e95eb0c33bd80ae82207f4ac99bafe SHA1 a4d9bceebacef5aa74ef5409b10118f799cb482d SHA256 a1e2b41fbecbaf8707ee1b5576cf4801f4b2c356ffba765a246e69a44f2f2d07 +EBUILD korganizer-9999.ebuild 1060 RMD160 02e4c17ed562d33373a862c155d54a426c6c3f01 SHA1 72aa26aa8117c6b8a33f1ca662c41597a791f4af SHA256 bed2e62d9ebd18a7e5897e05ff9a68d1ff69d11cecf4341878057ceebc500c4c MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a diff --git a/kde-base/korganizer/files/fix-broken-gpgme-cmake-guard.diff b/kde-base/korganizer/files/fix-broken-gpgme-cmake-guard.diff deleted file mode 100644 index bf8c759bd59..00000000000 --- a/kde-base/korganizer/files/fix-broken-gpgme-cmake-guard.diff +++ /dev/null @@ -1,21 +0,0 @@ -Index: CMakeLists.txt -=================================================================== ---- CMakeLists.txt (revision 1073383) -+++ CMakeLists.txt (working copy) -@@ -185,7 +185,6 @@ - add_subdirectory(messagecore) - add_subdirectory(messagelist) - -- if(QGPGME_FOUND) - if (Boost_TOPOLOGICAL_SORT_DIR) - macro_optional_add_subdirectory(kleopatra) - endif(Boost_TOPOLOGICAL_SORT_DIR) -@@ -211,7 +210,6 @@ - include( SopranoAddOntology ) - add_subdirectory( ontologies ) - # add_subdirectory( nepomuk_email_feeder ) -- endif(QGPGME_FOUND) - - if(KDEPIM_BUILD_EVERYTHING) - macro_optional_add_subdirectory(knode) - diff --git a/kde-base/korganizer/korganizer-4.4.9999.ebuild b/kde-base/korganizer/korganizer-4.4.9999.ebuild index b208b670a72..09614e6f194 100644 --- a/kde-base/korganizer/korganizer-4.4.9999.ebuild +++ b/kde-base/korganizer/korganizer-4.4.9999.ebuild @@ -44,13 +44,6 @@ src_unpack() { kde4-meta_src_unpack } -src_prepare() { - epatch "${FILESDIR}/fix-broken-gpgme-cmake-guard.diff" - - # Needs to be done this way - kde4-meta_src_prepare -} - pkg_postinst() { kde4-meta_pkg_postinst diff --git a/kde-base/korganizer/korganizer-9999.ebuild b/kde-base/korganizer/korganizer-9999.ebuild index db3e392377f..4920391f2ff 100644 --- a/kde-base/korganizer/korganizer-9999.ebuild +++ b/kde-base/korganizer/korganizer-9999.ebuild @@ -47,13 +47,6 @@ src_unpack() { kde4-meta_src_unpack } -src_prepare() { - epatch "${FILESDIR}/fix-broken-gpgme-cmake-guard.diff" - - # Needs to be done this way - kde4-meta_src_prepare -} - pkg_postinst() { kde4-meta_pkg_postinst |