diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-04-14 01:05:40 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-04-14 01:05:40 +0100 |
| commit | 76cba73c47c8694e74377004634daca18f2d9c08 (patch) | |
| tree | 468603ebdc189bcfae77696162761b3be936baea /sci-libs/avogadrolibs | |
| parent | 6957f5c65b02bba533954eabc0b62f5de36be206 (diff) | |
gentoo resync : 14.04.2018
Diffstat (limited to 'sci-libs/avogadrolibs')
| -rw-r--r-- | sci-libs/avogadrolibs/Manifest | 3 | ||||
| -rw-r--r-- | sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180406-r1.ebuild (renamed from sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180406.ebuild) | 4 | ||||
| -rw-r--r-- | sci-libs/avogadrolibs/files/avogadrolibs-1.91.0_pre20180406-qt-5.11.patch | 29 |
3 files changed, 34 insertions, 2 deletions
diff --git a/sci-libs/avogadrolibs/Manifest b/sci-libs/avogadrolibs/Manifest index c73b0ab3e9f9..756b149e2612 100644 --- a/sci-libs/avogadrolibs/Manifest +++ b/sci-libs/avogadrolibs/Manifest @@ -1,8 +1,9 @@ AUX avogadrolibs-0.7.2-6464.patch 902 BLAKE2B 29a06e0d5e814aee4c1aff30af3642e374d32813e4e9837706ef652f89ffde173ff043fc3589fc08b22592e3ded2c0d8ef9c544e54a561ac658ae43651403633 SHA512 3851a3c5f7c599e439b4faa491ea080264e60bf2a7c4d35e01a10726f901a5797026bf32535107b46ca44335c5723d9ec7f0b6a46e9eebf7ffd9f90c7f2103d3 AUX avogadrolibs-1.91.0_pre20180406-bundled-genxrdpattern.patch 1644 BLAKE2B 3b25bc2648b323b803b5d0b6e10be2689ef9e4c988d0c55abe172bf4312da8f5f9b527262a2f8e48d0b2391b01a03a976bc36cc22c467ac9a44fb85cc43c7a6d SHA512 515c7029e6f99c5e88a37f43387e656b2873b99e14e8d8e9b1b20bf82604f70be8f669d8b97383e80969b0f80d43439647fdfd17566bbf6fbd32cb75ce2fb4e3 +AUX avogadrolibs-1.91.0_pre20180406-qt-5.11.patch 797 BLAKE2B 80459a969efbcf8ffe257a21359df298eda3bc191d8eddbc239b807b0d3090057bf8cba69caa0fe734821174e0bb98f24d0dc05c99c16c327a157fa588c6b3db SHA512 ef6fde385be85e101039a3ce555ea9d3fb4294fa47153cbf7faae5fd10fdc3601e000d8e83676c5da222dfe1cfedf338376532b055d0f2357f660f6b36665c6c AUX avogadrolibs-1.91.0_pre20180406-unbundle-jsoncpp.patch 5377 BLAKE2B 5de00cdcd90d7642ddb82aa8ae0e6685ad17c2a6332a4ef9ba28be66f48a6eabf51d557173a6129b588b9eafb394db74d332fc178b2a323d29777e88e37174a7 SHA512 b4445aa7377370fd1336b7fdf0aa3dfa93b6d538efa70ca383cdcf85d9f54e64a6bd0c2af5e0f5c80ed731d4babd4c2a1f7a4e909fb5cf2a30bf72224737870a AUX avogadrolibs-1.91.0_pre20180406-underlinking.patch 549 BLAKE2B e773e8994677a4cc0880013455efbe153ecdf92061599b787e3486638a6a2a0b5ebe731387a6f79357ff8f049c74b2a5efdeec0ed886b89e02f5160268dda4a2 SHA512 05d7ef99d1d5d395962def8896fb0c61ae437aeb0199ea8ce26a6076abba0559973aff5a4a4620f5c7dbe6413c80237490ad6b80f8a7503a8b2d3ae92f81fbf4 DIST avogadrolibs-1.91.0_pre20180406.tar.gz 857345 BLAKE2B 8e5c6b0a838a2a6b7dc925c1b544ab4d4de8b7769b1fe8d787127a1014b1243da89a2a6f6cfc871181f81a443c3ee63d758369f003afaf591c9373c9d5122ee3 SHA512 1814b2105615aabc1df78b14c581e78fea20a1e4ace8979bb2ad123ab0994d90c3935e37f0cc58b60d3307ffe682599a93d8cadddc22b4ba524caaec1a2c5319 DIST linux64-genXrdPattern 7480152 BLAKE2B dca8285c41aadfaa20c72f337e0f02db8ee07ce30c11ae84bf3aa7bd0b2220273d33f484d63f761d41a8946c6a0b77a0fb27906c480bcae01ae49b1531ae5cbb SHA512 538bde12e1e52600a21640d5907f43fcc853c6f3c111880f39eb238093e3d1358ccdfa1f45e944ec8b8e5ee3c2dff269cefe5334db5d73300e6ca327c95520b8 -EBUILD avogadrolibs-1.91.0_pre20180406.ebuild 2027 BLAKE2B 92fe377bed2c30b2eea8b4e67c9695fa19d61c6a8dceda0479f41fa9df10e077988b3c9249812d69221ed269df258f9a3bd864fb8a1e92126d63b6f6c9b8b6db SHA512 8e96e1b50e5c35346d6827d261ddb6f2483acba94b21d33c3638594442cf04582b9ed9c52f4e04e1f33ade1f4bdce3dc7651f3c5451edbac639ba7a813ceb128 +EBUILD avogadrolibs-1.91.0_pre20180406-r1.ebuild 2086 BLAKE2B 5e01df80ef83ec255b6468531ab46efbcd798b786d9b8483bc8faa399262a3df7682b75d8f722c7becac1286cdd2556ef2fb28c6d8cffc2205f611285e5d94e6 SHA512 7490e3e4c909cb1963a869619b7aaa717af3dc59c4ebd50551570af9c7ab50c3f16931b5e52ad7bcf8368f1e8101a7193f86115f7d0c8beb206c3759d972412d MISC metadata.xml 670 BLAKE2B 39737e6ffacaf9284506e41dfa1154f233a6bf37dd514c0eafe6bdf7bd7129a43d81cf4c3e510759b7888277bb403ad933e21abf0ba4dbedd43fda2aa2b55edd SHA512 781b3e67a291253d83d6c2e11124b07dbae652267de2702a1a2b10680f7db19cf35bda8964b320658d849091bd9ead07eeb5fc682a8817101dd1e7a1e9e20757 diff --git a/sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180406.ebuild b/sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180406-r1.ebuild index f7417ab49bf5..377cfc965c57 100644 --- a/sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180406.ebuild +++ b/sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180406-r1.ebuild @@ -35,10 +35,11 @@ RDEPEND=" media-libs/glew:0= virtual/opengl ) - vtk? ( sci-libs/vtk[qt5] ) + vtk? ( sci-libs/vtk[qt5,views] ) " DEPEND="${RDEPEND} dev-cpp/eigen:3 + dev-qt/qtopengl:5 test? ( dev-cpp/gtest )" S="${WORKDIR}/${PN}-${COMMIT}" @@ -48,6 +49,7 @@ PATCHES=( "${FILESDIR}/"${P}-underlinking.patch "${FILESDIR}/"${P}-unbundle-jsoncpp.patch "${FILESDIR}/"${P}-bundled-genxrdpattern.patch + "${FILESDIR}/"${P}-qt-5.11.patch ) src_unpack() { diff --git a/sci-libs/avogadrolibs/files/avogadrolibs-1.91.0_pre20180406-qt-5.11.patch b/sci-libs/avogadrolibs/files/avogadrolibs-1.91.0_pre20180406-qt-5.11.patch new file mode 100644 index 000000000000..437b1e755af8 --- /dev/null +++ b/sci-libs/avogadrolibs/files/avogadrolibs-1.91.0_pre20180406-qt-5.11.patch @@ -0,0 +1,29 @@ +From 5d70cd5ec5ac8460ff5d3d6b0b47b9c60e1f3ca2 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Tue, 10 Apr 2018 21:59:32 +0200 +Subject: [PATCH] Fix build with Qt-5.11 + +--- + avogadro/qtplugins/gamessinput/gamessinput.cpp | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/avogadro/qtplugins/gamessinput/gamessinput.cpp b/avogadro/qtplugins/gamessinput/gamessinput.cpp +index 779d2d4..0b2e106 100644 +--- a/avogadro/qtplugins/gamessinput/gamessinput.cpp ++++ b/avogadro/qtplugins/gamessinput/gamessinput.cpp +@@ -24,9 +24,9 @@ + + #include <molequeue/client/jobobject.h> + +-#include <QtCore/QDebug> +- +-#include <QtWidgets/QMessageBox> ++#include <QAction> ++#include <QDebug> ++#include <QMessageBox> + + namespace Avogadro { + namespace Core { +-- +2.17.0 + |