diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2017-10-19 17:57:29 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2017-10-19 17:57:29 +0100 |
| commit | d473a706836012853193afc7000922601e4ada61 (patch) | |
| tree | 01c43bd6b2121d90bc97ead47dd7654d9402ea1d /kde-plasma/drkonqi | |
| parent | 420eeee727d39d869d864caddb04a80dafda7160 (diff) | |
gentoo resync : 19.10.2017
Diffstat (limited to 'kde-plasma/drkonqi')
| -rw-r--r-- | kde-plasma/drkonqi/Manifest | 5 | ||||
| -rw-r--r-- | kde-plasma/drkonqi/drkonqi-5.11.1.ebuild (renamed from kde-plasma/drkonqi/drkonqi-5.11.0.ebuild) | 2 | ||||
| -rw-r--r-- | kde-plasma/drkonqi/files/drkonqi-5.11.1-x11.patch | 46 |
3 files changed, 51 insertions, 2 deletions
diff --git a/kde-plasma/drkonqi/Manifest b/kde-plasma/drkonqi/Manifest index b41c52429217..9d01fae89a1f 100644 --- a/kde-plasma/drkonqi/Manifest +++ b/kde-plasma/drkonqi/Manifest @@ -1,3 +1,4 @@ -DIST drkonqi-5.11.0.tar.xz 737320 SHA256 5b0b19acbcaa614ba0fb6969ac95be7dfa3240aaa6b2ed9c7216cc7fc14dd7ec SHA512 91ce947f17d8ed25845aedfd9f88dfcad1879b3b42be3f3a8268e13035c2516b635d7abd05d9b216e45b4e0a61b708c0458f9cc99dd84e70dd3cf1833c4a46bd WHIRLPOOL 766af1e01550686caf635cac7f7dc64323b9e86fe58a0c2f5296b2fa7d6ee59b565a13b7fc81d6c5cc642daf4c8593786dc030f3b448b8e64f4d6be9ca44c72d -EBUILD drkonqi-5.11.0.ebuild 1335 SHA256 708804558f9ddee3e0e5bfc739d7073b37db7db246726e19b421bca34b4b65cd SHA512 d8c0098ea07c60e514233ec8ddca8cb3ea9f19350889e664f77e71abfad7863916cda754fadb90f18e26cd7caad5df27e1f301922234c3a363de771f6df5c2d0 WHIRLPOOL ff8d3183e143737c46ae2e3986f74af714871768045da66a0ed00b8d40cb9abcd78c6472c51960c0d20f863e3bd02b6ae0b72904b875c9238ceb114ab42036ec +AUX drkonqi-5.11.1-x11.patch 1438 SHA256 88a2d8ff7c579f44778d294ea20e5e2bfd09af06c5169007fb1d952e8c37a65d SHA512 3d19b11f7cfd47bcabcdaf7b3bb4dc1e38b38a5e52a3c23849860ed851b1211aaaa61da48f23a46f7a51dea7ec2f132a3c16577bea042da513d1bc84264e0bb4 WHIRLPOOL 803d754955083df4beea94f3140534140edbc4de5adeb99f422839a3b7e2dc652d8ab0d9f75ad9c5c7c31c0e10dceba96309539a39ad5447ab1af0bdf846bd22 +DIST drkonqi-5.11.1.tar.xz 737176 SHA256 6560453eed9c6bee39d214b60693d043a6d02d775832b2527818d534be36004f SHA512 3ffb42955182cae070478a90242602d1d9a76f77c3ba5d4661da7b326636e2bbba2e36b1eb16cb0fde8b247bfe8b604395d1c26970a9162e04bce84f4c17a132 WHIRLPOOL 53e25438d0fe0c4eebf64423bfac84a25dfd7c92bd78d4e91c195cfd6122df5dd7e62278966d40ae205e776fab99679a9f87ad1b3999612490254d49dd22f617 +EBUILD drkonqi-5.11.1.ebuild 1377 SHA256 647d3949bf5af5d6d445c5b5ead3d53dff7c89a7c8a2d7de78272857b5ed64fc SHA512 b4d7db113722e953384a71d224b5a3e3e23e35ffb045de78ab92ca04d1655abaf9bf89e9000a2dc85d37c72b50f441f0c3e45773c9d4375d115e4d58093b20e5 WHIRLPOOL 3bf2fd38acb3127e94f3e6d60d3889f12ec99e6cf082c97cdedc974afecdc9b7bd84928f5c652b6f41b26ef319d11d6ac0487d9bd78a1257949021bbe29c4be6 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c diff --git a/kde-plasma/drkonqi/drkonqi-5.11.0.ebuild b/kde-plasma/drkonqi/drkonqi-5.11.1.ebuild index 530280b565db..d540f577a872 100644 --- a/kde-plasma/drkonqi/drkonqi-5.11.0.ebuild +++ b/kde-plasma/drkonqi/drkonqi-5.11.1.ebuild @@ -39,6 +39,8 @@ RDEPEND="${COMMON_DEPEND} !<kde-plasma/plasma-workspace-5.10.95:5 " +PATCHES=( "${FILESDIR}/${P}-x11.patch" ) + src_configure() { local mycmakeargs=( $(cmake-utils_use_find_package X Qt5X11Extras) diff --git a/kde-plasma/drkonqi/files/drkonqi-5.11.1-x11.patch b/kde-plasma/drkonqi/files/drkonqi-5.11.1-x11.patch new file mode 100644 index 000000000000..ffbd25c4f719 --- /dev/null +++ b/kde-plasma/drkonqi/files/drkonqi-5.11.1-x11.patch @@ -0,0 +1,46 @@ +From c5047038751052c3feb588496cd14bdb233a18f8 Mon Sep 17 00:00:00 2001 +From: Kevin Funk <kfunk@kde.org> +Date: Sun, 15 Oct 2017 18:52:53 +0200 +Subject: Make Qt5::X11Extras really optional + +Summary: +Otherwise may fail. + +Reviewers: rjvbb, sitter, davidedmundson + +Reviewed By: sitter, davidedmundson + +Subscribers: apol, plasma-devel + +Tags: #plasma + +Differential Revision: https://phabricator.kde.org/D8307 +--- + CMakeLists.txt | 2 +- + config-X11.h.cmake | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 43eeea5..8c8f9b2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -30,7 +30,7 @@ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core Widgets Test + + find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS I18n CoreAddons Service ConfigWidgets JobWidgets KIO Crash Completion XmlRpcClient WidgetsAddons Wallet Notifications IdleTime) + +-find_package(Qt5 ${QT_MIN_VERSION} CONFIG COMPONENTS X11Extras) ++find_package(Qt5X11Extras ${QT_MIN_VERSION} CONFIG) + + include_directories("${CMAKE_CURRENT_BINARY_DIR}") + configure_file(config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h) +diff --git a/config-X11.h.cmake b/config-X11.h.cmake +index 26064aa..2f779a2 100644 +--- a/config-X11.h.cmake ++++ b/config-X11.h.cmake +@@ -1,2 +1,2 @@ +-#cmakedefine Qt5X11Extras_FOUND 1 ++#cmakedefine01 Qt5X11Extras_FOUND + #define HAVE_X11 Qt5X11Extras_FOUND +-- +cgit v0.11.2 + |