diff options
Diffstat (limited to 'sci-visualization')
| -rw-r--r-- | sci-visualization/Manifest.gz | bin | 5362 -> 5369 bytes | |||
| -rw-r--r-- | sci-visualization/gr/Manifest | 6 | ||||
| -rw-r--r-- | sci-visualization/gr/files/gr-0.49.0-paths.patch | 15 | ||||
| -rw-r--r-- | sci-visualization/gr/files/gr-0.50.0-qt-5.15.patch | 21 | ||||
| -rw-r--r-- | sci-visualization/gr/gr-0.50.0-r1.ebuild (renamed from sci-visualization/gr/gr-0.49.0.ebuild) | 31 |
5 files changed, 46 insertions, 27 deletions
diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz Binary files differindex b24c38e58b87..27fedbf61180 100644 --- a/sci-visualization/Manifest.gz +++ b/sci-visualization/Manifest.gz diff --git a/sci-visualization/gr/Manifest b/sci-visualization/gr/Manifest index 24b5645b4702..24fed34ec38d 100644 --- a/sci-visualization/gr/Manifest +++ b/sci-visualization/gr/Manifest @@ -1,4 +1,4 @@ -AUX gr-0.49.0-paths.patch 461 BLAKE2B e8ebc8f2ad6731d402c9d9bd8237b191b57268a27c0c4da67bad2a9efc30d1966ae39e38a8631a158babe6c1d5ba81ee74f85bfb7c8002ef3310613dce71d02f SHA512 e3a2916f8366796761049e6ac5d069ac65f270a195fdf48843042c85455c1e65d7369e10d00ac6a2c72cb9cd172d1535d521f4fe06bbe57584159ef7c1e32fd5 -DIST gr-0.49.0.tar.gz 8604669 BLAKE2B a4f14910b8b229e722018a00e7f7f1b0c354265282b16c49e536bb8771a1bd69c0e0c17a9e4e70593f185e6c58885fcb6842b2f2c121988c1c161f5d11548b1b SHA512 851deac9cc2f42a9f62883e6bfb4bcc6e71e46910ec97a7b5fec087299f12d09043365f594d47c315a23079342bf25893b1a0f59bbd0e92eb140cc2a11126a14 -EBUILD gr-0.49.0.ebuild 1319 BLAKE2B 3cb8e481e84708827d53ac1df595e3c04f8e8018ee9dc4eb7f259487036bf8770c338fdae63c64ddac150a46002980e83979bae2e78839c27ea0f5b832fe6ff1 SHA512 ea2701b3694bf8000f017b0fa7beef055b8ed3ae9c42a2983017a4198a9d9bce5875825492322ac9ea13d99cdf8fc4853029c2064d691e6e15d6634200409be2 +AUX gr-0.50.0-qt-5.15.patch 652 BLAKE2B 0d945a678acf7e457ca848da770f442caa0e64dba984c073cf394903f08548e668935d4333f574429f93f415e2b74a225573f9aa0da594bd9358c79ca4fb94c2 SHA512 fc85ff4227c257cffe05925095d54451793f899013f9123bf5cc480ea2bb5e267a5067b862feebb000cee9a34781c283ad83fc8adee3b5ec9689d12c37699a5e +DIST gr-0.50.0.tar.gz 8612608 BLAKE2B 70f4a3c6ce1dac8556646a1632667e6e464a5048f3c44fb689709e3e8218e8d7375db6ff8ce73e11dbeda559fb27c83b7f2b42f0ab518df9b464c8443748c30e SHA512 34ca077ae729e6eda0e5df7046811c77d717f3ef0e34203d6ab3a7f4b67b3aa058a68b9b2d7d78adc8b2f0830a0298778198a6499bd3d6e5697e4b7270cb648a +EBUILD gr-0.50.0-r1.ebuild 1759 BLAKE2B f6d9fee994a2c3d7662b4774707c9a29bc0ed134f7a40ec115172867e2fe92f02e0132ecaa4ca1099a1d1614d41e9afbcb05824b5cb9c3f3c5425d55dc24d970 SHA512 b772317223cd5c5413d3ffab4aebff8e5ba1df95c41197e6feba517c6743a9bfea11b6a64e62046cfd18811cc9e44620db03caea6ff956f2ea6a203fbed3d7e1 MISC metadata.xml 260 BLAKE2B 5eb8d87919aaab2f101cfc899ccb00b8efb723b67cb102ce580e0e69781639708cb8523b8967f9fb169e00455c548cff19d2827ce711c3f36d5ae58a1d3777ee SHA512 b6369aad1615446c9a4e1740a51a49d843868e114e49bc526e7b00cefdc795a601b9c508d866b065cc4ed750b85f48f136ee5925b9511a80f4056d7ef832eab2 diff --git a/sci-visualization/gr/files/gr-0.49.0-paths.patch b/sci-visualization/gr/files/gr-0.49.0-paths.patch deleted file mode 100644 index 73e23022f372..000000000000 --- a/sci-visualization/gr/files/gr-0.49.0-paths.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index db08eeb7..46be6fab 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -907,8 +907,8 @@ if(GR_INSTALL) - install(FILES lib/gr/qtgr/grwidget.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/) - endif() - install( -- DIRECTORY lib/gks/fonts -- DESTINATION ${CMAKE_INSTALL_PREFIX}/ -+ DIRECTORY lib/gks/fonts/ -+ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/fonts/gks - USE_SOURCE_PERMISSIONS - ) - endif() diff --git a/sci-visualization/gr/files/gr-0.50.0-qt-5.15.patch b/sci-visualization/gr/files/gr-0.50.0-qt-5.15.patch new file mode 100644 index 000000000000..800492350cc6 --- /dev/null +++ b/sci-visualization/gr/files/gr-0.50.0-qt-5.15.patch @@ -0,0 +1,21 @@ +From 20204e37d8411b19b69a7ee5c776035c07f7175d Mon Sep 17 00:00:00 2001 +From: Sutou Kouhei <kou@clear-code.com> +Date: Sun, 31 May 2020 11:56:51 +0900 +Subject: [PATCH] Include QPainterPath explicitly for Qt 5.15.0 + +--- + lib/gks/plugin/qt5plugin.cxx | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/lib/gks/plugin/qt5plugin.cxx b/lib/gks/plugin/qt5plugin.cxx +index de9cd3d2..301d7fb9 100644 +--- a/lib/gks/plugin/qt5plugin.cxx ++++ b/lib/gks/plugin/qt5plugin.cxx +@@ -6,6 +6,7 @@ + + #include <QtWidgets/QWidget> + #include <QtGui/QPainter> ++#include <QtGui/QPainterPath> + #include <QtGui/QImage> + #include <QtGui/QGuiApplication> + #include <QtGui/QScreen> diff --git a/sci-visualization/gr/gr-0.49.0.ebuild b/sci-visualization/gr/gr-0.50.0-r1.ebuild index cf5992490cfb..b15a75608877 100644 --- a/sci-visualization/gr/gr-0.49.0.ebuild +++ b/sci-visualization/gr/gr-0.50.0-r1.ebuild @@ -12,22 +12,20 @@ SRC_URI="https://github.com/sciapp/gr/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="cairo ffmpeg opengl postscript qt5 tiff truetype X" +IUSE="cairo ffmpeg postscript tiff truetype X" DEPEND=" + dev-qt/qtgui:5 media-libs/fontconfig + media-libs/glfw media-libs/libjpeg-turbo media-libs/libpng media-libs/qhull sys-libs/zlib + virtual/opengl cairo? ( x11-libs/cairo ) ffmpeg? ( media-video/ffmpeg ) - opengl? ( - media-libs/glfw - virtual/opengl - ) postscript? ( app-text/ghostscript-gpl ) - qt5? ( dev-qt/qtgui:5 ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype ) X? ( x11-libs/libX11 ) @@ -36,18 +34,27 @@ RDEPEND="${DEPEND}" BDEPEND="" PATCHES=( - "${FILESDIR}/${P}-paths.patch" + "${FILESDIR}/${P}-qt-5.15.patch" ) src_configure() { use cairo || mycmakeargs+=( -DCAIRO_LIBRARY= ) - use opengl || mycmakeargs+=( -DGLFW_LIBRARY= ) use postscript || mycmakeargs+=( -DGS_LIBRARY= ) use ffmpeg || mycmakeargs+=( -DFFMPEG_INCLUDE_DIR= ) use truetype || mycmakeargs+=( -DFREETYPE_LIBRARY= ) use tiff || mycmakeargs+=( -DTIFF_LIBRARY= ) - # todo: Qt5, X11 automagic + # todo: X11 automagic + + mycmakeargs+=( -DCMAKE_INSTALL_PREFIX=/usr/gr ) + # + # I need to have a serious conversation with upstream. + # * The main consumer of this package is dev-lang/julia. + # * If I patch gr to install in standard locations, julia does + # not find it anymore. + # * I can't patch julia, since the corresponding scripts are + # downloaded at runtime from its package registry ... + # cmake_src_configure } @@ -55,4 +62,10 @@ src_configure() { src_install() { cmake_src_install find "${ED}" -name '*.a' -delete + + echo "GRDIR=/usr/gr" > "${T}/99gr" + echo "LDPATH=/usr/gr/$(get_libdir)" >> "${T}/99gr" + doenvd "${T}/99gr" + + dosym ../gr/bin/gksqt /usr/bin/gksqt } |