diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-09-16 09:32:48 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-09-16 09:32:48 +0100 |
| commit | 9ee6d97c2883d42f204a533a8bc1f4562df778fb (patch) | |
| tree | b690ddc0ca30f1472887edbb0b8313629bfcbbb2 /kde-apps/marble | |
| parent | b17a3ef12038de50228bade1f05502c74e135321 (diff) | |
gentoo resync : 16.09.2020
Diffstat (limited to 'kde-apps/marble')
| -rw-r--r-- | kde-apps/marble/Manifest | 4 | ||||
| -rw-r--r-- | kde-apps/marble/marble-20.08.1.ebuild (renamed from kde-apps/marble/marble-20.08.0.ebuild) | 7 |
2 files changed, 4 insertions, 7 deletions
diff --git a/kde-apps/marble/Manifest b/kde-apps/marble/Manifest index beb5f7cb7982..362ae25473ed 100644 --- a/kde-apps/marble/Manifest +++ b/kde-apps/marble/Manifest @@ -1,5 +1,5 @@ DIST marble-20.04.3.tar.xz 52200548 BLAKE2B 83388e292487dbbe10bde4f4d67337b8d8606df26fda3621640cf49a1a930b6cdb9357a96568fc33597f0ee2627a22a2f2920a7dad45bab1502e5a8869934de1 SHA512 5c29b0a25164b50f197c826258d8de8b4e1a386d91fa7a6f67eb3da64197b2cefef31b0759c3bd19e9a5b0f0c639adc779d71a7ef1d7b51fca4e58cc3c8530cd -DIST marble-20.08.0.tar.xz 52192524 BLAKE2B 4f5466b0d6ead3ab554aeee47852113355467a6b026bcc7b9e7f8759f064dda3003694580d3b15856964f4a29df09265be5467852d3f475ac83ddc25d751d430 SHA512 e7ef24184418cba674c37baf656562cac9fa8bb9afe623e9dd9cfabe7defdcdd2316c18e61eb2f89d0d43d4020b1005f28207db8b7b97b9ca207b985f0554fcf +DIST marble-20.08.1.tar.xz 52194612 BLAKE2B 69d58959c632e289b70bebabd55b7f9e66d202676a36597527d945b055620dd0b373cde6211d2c9bbef2b56c952f326fd8bbbcf4946b7fbcdcd17f47ece2ea6b SHA512 4306ba2ca620d7081b289b309abca9d741ee3376583ee662b34d09a1b03b42e00f034c34be371fed03a1196df5dd21fecf7e6c981053acfc9511a2bd85417485 EBUILD marble-20.04.3.ebuild 2688 BLAKE2B df187b207a1c62a2e479bab9cadb4a8841fc7860e212766831b121c8cf5a18d23e6dc2fd92cedc2ffbd339f31d5e308610b19e4975af6518b42b4d992e1bb25c SHA512 df2f3f8474b33830496f4244d414b8074929d9cbeb52430f500c1114be240d17b95025f3a8d0e4e5c85d4d709620b016c9b419faf740bc596045bd2ec4ca3c27 -EBUILD marble-20.08.0.ebuild 2691 BLAKE2B ca944be552eb107b8471526077505201d63ed580f6c201f9fc4033880f857c2f1ea35be8e3408d555f49a0e06dad0534bd31573f2fa2022f187d028c4baa485c SHA512 77676ba6a90cddb1e4e4c12c36934ad63cbd8127f48e9687d0f4adc8ccad3d9b8ce8cdd71305d4bd3935506fe4a20752c5d960a0e9e896337b657600a750aef9 +EBUILD marble-20.08.1.ebuild 2624 BLAKE2B c80b29ea7ab282e06e08474b4c9b223a55ff5767357d3b751a42ea7564fb11668a2b248f9ffd979fa80392ef55a7d28cbbe9a377743e01c5df69f2b012fd83b9 SHA512 3dd6c70ab5ef8404289a94a169105f0ed006da27bcc4835c141fdf524645a231ce7f72851cee7a941c656836816b2460408d20271964a1d9730a1152df6cf223 MISC metadata.xml 744 BLAKE2B 30ba725f71b40212a305dbe604efa03d57cc35812bb1533168fda73401076dc1941f357f45aa7ea84a59e9107441318675e223fc01cf7ced5978ba57f2aa56c6 SHA512 8992b885dd614a6f784fd516a4fc8c38cb127bdce2eab9aaead3af778a0972fa0297037b2132b9a9180e416331e15b6691c4a4213158f7425d58d5cc369f6473 diff --git a/kde-apps/marble/marble-20.08.0.ebuild b/kde-apps/marble/marble-20.08.1.ebuild index 27ea2b8a1a8b..49121f7a989f 100644 --- a/kde-apps/marble/marble-20.08.0.ebuild +++ b/kde-apps/marble/marble-20.08.1.ebuild @@ -52,7 +52,7 @@ DEPEND=" >=kde-frameworks/kservice-${KFMIN}:5 >=kde-frameworks/kwallet-${KFMIN}:5 ) - phonon? ( media-libs/phonon[qt5(+)] ) + phonon? ( >=media-libs/phonon-4.11.0 ) shapefile? ( sci-libs/shapelib:= ) webengine? ( >=dev-qt/qtwebchannel-${QTMIN}:5 @@ -69,10 +69,7 @@ src_prepare() { rm -rf src/3rdparty/zlib || die "Failed to remove bundled libs" - if use kde; then - sed -e "/add_subdirectory(marble-qt)/ s/^/#DONT/" \ - -i src/apps/CMakeLists.txt || die "Failed to disable marble-qt" - fi + use kde && cmake_run_in src/apps cmake_comment_add_subdirectory marble-qt } src_configure() { |