diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-04-19 14:14:48 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-04-19 14:14:48 +0100 |
| commit | 5cfef3c94cd7e82136c69a0322f5ba21f7e64632 (patch) | |
| tree | 8f255dfacbacb657e3ac3654d01c1e11e651c066 /sci-chemistry/avogadro2 | |
| parent | 8aebb228036d5e2863b7eaa6e319ab41c1669269 (diff) | |
gentoo resync : 19.04.2018
Diffstat (limited to 'sci-chemistry/avogadro2')
| -rw-r--r-- | sci-chemistry/avogadro2/Manifest | 3 | ||||
| -rw-r--r-- | sci-chemistry/avogadro2/avogadro2-1.90.0_p20180211.ebuild | 2 | ||||
| -rw-r--r-- | sci-chemistry/avogadro2/files/avogadro2-1.90.0_p20180211-qt-5.11b3.patch | 34 |
3 files changed, 38 insertions, 1 deletions
diff --git a/sci-chemistry/avogadro2/Manifest b/sci-chemistry/avogadro2/Manifest index 039a585eb04e..6065c99351f1 100644 --- a/sci-chemistry/avogadro2/Manifest +++ b/sci-chemistry/avogadro2/Manifest @@ -1,3 +1,4 @@ +AUX avogadro2-1.90.0_p20180211-qt-5.11b3.patch 1134 BLAKE2B ff96a5b19d17768de242490e555679270d568ce41b321e549e88986c66c931e7275c88697ee71600cdab7990f473f6c214f903771754d292ff0766874a82f810 SHA512 5362a64709127b30656f1f7830d902ac00291cdf39160c4639f121568666fe1249f2f92c9378f75b2fc6cf44cecf74e92e207b73c029a9c9d997ac852f02ed86 DIST avogadro2-1.90.0_p20180211.tar.gz 1099312 BLAKE2B fbf8e2006c46114632587615b48ac130e45a46ce2859a9c34270714091bc8397d9d7a93c3166bf58833f100e3e40afd1962012e479a8f92ba8ff9078200d51c5 SHA512 db9b0983d2161df493138ddf18c5dbda54cf2f8b75ebc944f1f57dab0f1e2048582362e5f46a78b1610aba080aaac8a66d2b2b71db748e031ffde306d3609856 -EBUILD avogadro2-1.90.0_p20180211.ebuild 1225 BLAKE2B 28916f43f2a48e1cb855f70a2ca3df5a03438420841481bc4d33816333c3f54e04979c5d06238ece6c990ca8458862eeba04b7f060b3cb69ae0d5b82c63f96ad SHA512 249c0905f92fd3021da53327945ece37e30d48650b4a47267231f5833a85a1d97d27f3e87e3b41255ae4d9ce67f0169cdbc06c755db99c895cc3e57b8edb2a7c +EBUILD avogadro2-1.90.0_p20180211.ebuild 1273 BLAKE2B b0f9d795978e059158ae4929cdbe97425f58f84da99f67407b858e0b59672d35dbd83864d0e08d23fd0f3a1cb7d7ef70f9db0475e94e7b6a837f376313b9209e SHA512 d790a4f9c61937bf832c48ee7551ca9e63061732507e771d6ad9cf9b024da318ae83b7879f344360aff60a98473791cb741264c5cc73e4f930a8a3256fb65970 MISC metadata.xml 513 BLAKE2B f721104691759eb8a87d9cb6dd56bef45ac151e180caa68376406274a57df6c04e3fec6ba6d7e2aabf4355356002d27dd92e5b850c55103b3b23340d9b64d891 SHA512 4209c0681f7055b240f1054a10d58d5c22dca467903096ab1f5eb1b8cf276990f694b2033b4e9b4e4838cce65dd7c7660633079764248f394e32ece0048f09a0 diff --git a/sci-chemistry/avogadro2/avogadro2-1.90.0_p20180211.ebuild b/sci-chemistry/avogadro2/avogadro2-1.90.0_p20180211.ebuild index 8b017684a578..8345cd9619e5 100644 --- a/sci-chemistry/avogadro2/avogadro2-1.90.0_p20180211.ebuild +++ b/sci-chemistry/avogadro2/avogadro2-1.90.0_p20180211.ebuild @@ -33,6 +33,8 @@ RESTRICT="test" S="${WORKDIR}/${MY_PN}-${COMMIT}" +PATCHES=( "${FILESDIR}/${P}-qt-5.11b3.patch" ) + src_prepare() { cmake-utils_src_prepare sed -e "/LICENSE/d" -i CMakeLists.txt || die diff --git a/sci-chemistry/avogadro2/files/avogadro2-1.90.0_p20180211-qt-5.11b3.patch b/sci-chemistry/avogadro2/files/avogadro2-1.90.0_p20180211-qt-5.11b3.patch new file mode 100644 index 000000000000..1e7a23f0b54e --- /dev/null +++ b/sci-chemistry/avogadro2/files/avogadro2-1.90.0_p20180211-qt-5.11b3.patch @@ -0,0 +1,34 @@ +From 2c70d9bf7248d8da7691a5830ba6a0972fd9eea7 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Tue, 17 Apr 2018 11:57:32 +0200 +Subject: [PATCH] Fix build with Qt 5.11_beta3 (dropping qt5_use_modules) + +--- + avogadro/CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/avogadro/CMakeLists.txt b/avogadro/CMakeLists.txt +index 115b798..f564eb5 100644 +--- a/avogadro/CMakeLists.txt ++++ b/avogadro/CMakeLists.txt +@@ -16,7 +16,7 @@ if(MSVC) + endif() + + # Find the Qt components we need. +-find_package(Qt5 COMPONENTS Widgets Network REQUIRED) ++find_package(Qt5 REQUIRED COMPONENTS Concurrent Widgets Network CONFIG) + + configure_file(avogadroappconfig.h.in avogadroappconfig.h) + +@@ -88,7 +88,7 @@ endif() + + add_executable(avogadro WIN32 MACOSX_BUNDLE + ${avogadro_srcs} ${ui_srcs} ${rcc_srcs}) +-qt5_use_modules(avogadro Widgets Network Concurrent) ++target_link_libraries(avogadro Qt5::Widgets Qt5::Network Qt5::Concurrent) + if(WIN32) + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /NODEFAULTLIB:MSVCRTD") + target_link_libraries(avogadro Qt5::WinMain) +-- +2.17.0 + |