diff options
Diffstat (limited to 'media-gfx')
39 files changed, 66 insertions, 953 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz Binary files differindex 11d0915521a2..a6877b109d46 100644 --- a/media-gfx/Manifest.gz +++ b/media-gfx/Manifest.gz diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest index bdc918a075af..37da0c42d90b 100644 --- a/media-gfx/digikam/Manifest +++ b/media-gfx/digikam/Manifest @@ -1,6 +1,7 @@ AUX digikam-6.3.0-cmake.patch 2038 BLAKE2B 73c6c7d008c3b76f9347f4192d435e10aa3607abf62436372ef131ac034ef538c1baa8d0d03e6b587b771fb766fa3286c649a6ffc7640a2f21e292b1e524cab6 SHA512 c8e6d2fd6c18d8c8e8733dffd1e0e2fb66b8bf3496aa6f767a4c633a56733c85bc53bdceaf689e84beca672a5013a02349cfca73d9f1e89a99252c7bac526a4d +AUX digikam-6.4.0-qt-5.15.patch 1499 BLAKE2B 8d82d27d0b5376d5974dbc4d244dc1e3c683b8bfe392956b2d13cf30753984dd84746aaca049284a2c10f5074a1a9a51b228114c0b3eb02f8ae5ceb20abc00fc SHA512 3794b43734258112dfa693795d62887e66b8c99ffe339de3baa91fcd750d409962934e9bfcfc02f253ff9b4b04241eb5c4f983dc8a1b88a8f15d94d7cd3812ac DIST digikam-6.4.0.tar.xz 340146992 BLAKE2B ca1bc8b0d165f9774354d8489a11d46d8d7467edd3c1e90fd3a96024c4b7cd23bfd5c813251183bcca6d4beac9bffeb9d921beaa9a3752f75f1918796aacd719 SHA512 b3b5e9903538d110613aa872c9215f5e7c19f7520a2b9060c24e686f20f72075378b447239dd3e17cb8860cdd35c699399994199b848757f0497ad25a7805e42 DIST digikam-7.0.0-rc.tar.xz 566061948 BLAKE2B 0f167387c7110223764f203c829079eb677de0251f440b65d7dbc9c6b6e49a77d7e7bdd44d3f578338b7a06a3a7f694402b7a406537075c4cc32a3abb59cf159 SHA512 fbfb3b91038fa76b3f699304318f91e429f6ac51424f9895d48cf30b5319029a8e2b3791adba56b444329916d51fae5a8adc8f6aedbeae36fd165e781742119e -EBUILD digikam-6.4.0-r1.ebuild 4310 BLAKE2B 9c69ad526cedaac830105b620f2ee096504ca4e78c4ee4a6db60ac1398602be51bf1fe38a5b5dc338af2ae87ea041c93f3d1861352303c709121673034962133 SHA512 02d6beb8875c218acfe8f42d7c08715b53282b6d9a57949c8eb70176be6680a5b752719087f26b4cfa6bcae47e055c37db62d55cbec80ee6ddb4539ef2423b98 +EBUILD digikam-6.4.0-r1.ebuild 4358 BLAKE2B ca4ffa68ef7be1191439f94f3d52916c2ef4cb06c1fca12017989290c55ae5f2e819d74286ebac80835792df81a895b3c7d002205c44d698129887e36ddc5ddc SHA512 dc14d9384b6c4ee943dd63ec5a6eb6f5fcde9539cbdc4a34d2e5f2467c83eacb9acbabfcba93ea731b5b97a0a7e5fb07e02dbbe4a35f0bc956883a9ff88bfceb EBUILD digikam-7.0.0_rc.ebuild 4084 BLAKE2B fab6cca649fa9ff160e754ec45a5c70a45139c92fc79d8b740c2e24250931a43d6a304c506445db8c4ae1cac3958dce5634ba2cca43719373a0f62617b6b5523 SHA512 3bb5113b79604ae17fdfeee9fffa730dbbb06e884033c9ecb7ab9d23bcc1e30f70d5cabf9d8535503170d953be6abefe21c59f9409aa33dd3946eccd656ba600 MISC metadata.xml 1368 BLAKE2B 5dec50abba4f748e1f8eb465807c719f4b81759277241169d9e721749a1ba807425f7d46e9feb1edb4dcf3b4dd00b40bfbb353fe479e29c8a1878ad1fbfb5082 SHA512 4cd1ada9c4274338e49a692095d80b572c309bd34c838e2663a18ec1e7230de87e27087febfedde46a0f6af19f1a3f440335750375117d20eacd0c756db8b2f8 diff --git a/media-gfx/digikam/digikam-6.4.0-r1.ebuild b/media-gfx/digikam/digikam-6.4.0-r1.ebuild index f89120250bc7..870d93f3a99d 100644 --- a/media-gfx/digikam/digikam-6.4.0-r1.ebuild +++ b/media-gfx/digikam/digikam-6.4.0-r1.ebuild @@ -109,7 +109,10 @@ RDEPEND="${COMMON_DEPEND} RESTRICT+=" test" # bug 366505 -PATCHES=( "${FILESDIR}/${PN}-6.3.0-cmake.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-6.3.0-cmake.patch" + "${FILESDIR}/${P}-qt-5.15.patch" # bug 730298 +) pkg_pretend() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp diff --git a/media-gfx/digikam/files/digikam-6.4.0-qt-5.15.patch b/media-gfx/digikam/files/digikam-6.4.0-qt-5.15.patch new file mode 100644 index 000000000000..c2d5154b5498 --- /dev/null +++ b/media-gfx/digikam/files/digikam-6.4.0-qt-5.15.patch @@ -0,0 +1,38 @@ +Fix build with Qt 5.15 + +Authored-by: Thomas Posch <bugs.gentoo.org@online.posch.name> + +diff -Naur a/core/dplugins/generic/view/presentation/opengl/presentationgl.cpp b/core/dplugins/generic/view/presentation/opengl/presentationgl.cpp +--- a/core/dplugins/generic/view/presentation/opengl/presentationgl.cpp 2020-06-30 22:48:50.477149053 +0200 ++++ b/core/dplugins/generic/view/presentation/opengl/presentationgl.cpp 2020-06-30 22:49:52.217439213 +0200 +@@ -44,6 +44,8 @@ + #include <QMatrix> + #include <QMouseEvent> + #include <QPainter> ++#include <QPainterPath> ++#include <QPainterPathStroker> + #include <QPixmap> + #include <QTimer> + #include <QWheelEvent> +diff -Naur a/core/libs/dimg/filters/curves/curveswidget.cpp b/core/libs/dimg/filters/curves/curveswidget.cpp +--- a/core/libs/dimg/filters/curves/curveswidget.cpp 2020-06-30 22:48:50.374150231 +0200 ++++ b/core/libs/dimg/filters/curves/curveswidget.cpp 2020-06-30 22:49:17.219842551 +0200 +@@ -41,6 +41,7 @@ + #include <QFont> + #include <QFontMetrics> + #include <QPaintEvent> ++#include <QPainterPath> + #include <QMouseEvent> + + // KDE includes +diff -Naur a/core/libs/dimg/filters/levels/histogrampainter.cpp b/core/libs/dimg/filters/levels/histogrampainter.cpp +--- a/core/libs/dimg/filters/levels/histogrampainter.cpp 2020-06-30 22:48:50.374150231 +0200 ++++ b/core/libs/dimg/filters/levels/histogrampainter.cpp 2020-06-30 22:49:17.219842551 +0200 +@@ -30,6 +30,7 @@ + // Qt includes + + #include <QPainter> ++#include <QPainterPath> + + // KDE includes + diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest index 16c947cba6d0..18f2584b5993 100644 --- a/media-gfx/exiv2/Manifest +++ b/media-gfx/exiv2/Manifest @@ -1,6 +1,6 @@ AUX exiv2-0.27.2-libssh-0.9.2.patch 2035 BLAKE2B aeb9be311217b80a347d76a7df14ec11fc2018626cf7e9a813865dffd76038db10432fc2c898c0c26bdb3f1556cd34c0f8e4a25b189bc32733a3b4e018b241bf SHA512 25b4ca539585ddc2f4a11fc24ba49e799689d361f5f99f5552e99bd81179c95968affc4a42acd9ac0ba56f237f29ec53970a134b4dce44274a6044638d5bd78e DIST exiv2-0.27.2-Source.tar.gz 27591236 BLAKE2B bd10d71356e4c8a465b71f8ceac07fbf2fd6cfb287cb22774568ad35eb38200be504e297224920af50a15ab4e9da98384ff4da7c33713f5346b33738380698b0 SHA512 39eb7d920dce18b275ac66f4766c7c73f7c72ee10e3e1e43d84c611b24f48ce20a70eac6d53948914e93242a25b8b52cc4bc760ee611ddcd77481306c1f9e721 -DIST exiv2-0.27.3.20-Source.tar.gz 26462789 BLAKE2B 1fab5636f2ff69a6e61b78e29f8f536ef699bc7eb6e32edfd2f643805205df99502a3e1a9654dd8cd60e4f948d1442aa2bf4c4e71a345adaf310746bce5054c5 SHA512 4efd358adf615b924ef5446b68b7b7e260dd243179c8aa290006ea84d2fa08ab7069aa1af80b594858600660e184c80613c9254e66320d47087e00c9eccc8448 +DIST exiv2-0.27.3-Source.tar.gz 26447901 BLAKE2B ac13e6d8fce83923278cfeb628f143310a3c62b42936c8ed8b302a2c3df4c36f5666fa749adfb1d745e42da8f519762532e6fc281993aa55bcd7ce56e08c6e3e SHA512 3f5758ee862b811eeb89cc75fc2bbd8bf10329efa2ce1e68555cdc7729faa6cfd1603e0cc859fbdbe6d8fd5e53bd9b9e6d869d8a20ed17497bf87ce78c005de9 EBUILD exiv2-0.27.2.ebuild 2457 BLAKE2B 5d610e7e21b215a72a31435a305d5f5dfdb0e9ef3499b6d805ca53729273475ef85c783aa269b106d24bc846007479159551a5cd3b10f8ccf226773c3e44f7d1 SHA512 bfea82132bdad7b89a35114ad4154db0044940324adcf65427306c15ddc1cd2a5152706a11f1613150799d6a1d439f1881bfe9f1dd62f8b4accb96eeb6251bb1 -EBUILD exiv2-0.27.3_rc2.ebuild 2491 BLAKE2B 2a24901ccc3a33bda3bccb255ee1e4765b9ae3caa408c37715e5a639542f69e874508054e0bd5d08c5355ac3c14fcafe423b9369c5a7cda465c97c677cda5111 SHA512 fc7c2f129c9c4e3d38dd53d79a8d530694071a9245b9e246dc85e8b63036556478866f5b77a42132936962f53c136fb913e1e250267289cb89b6d71acd39af2f +EBUILD exiv2-0.27.3.ebuild 2461 BLAKE2B 731b33b83bc92239f23803e278f91ff5c0a300732393394b8ed2c0705ad620f0d14e3ca165f98686781624bc0435725c4846952f42eee1337bb5f3ba35a67723 SHA512 81aab9d3d04d05be26023f247448b155283adbd2c05c1852841f2de4f3f2a00ac2c754d490ea9a41780f80199eadc49a9e9c31ef6d8bfe31546b07f8d4c70428 MISC metadata.xml 492 BLAKE2B 06b2f7b1d7b50e853ae116ad18f254103116c88c7d6957c1c9323083f0f87d7ed268ee188e91edf8b42b02a996e5c85017fffc12b0680f7522a0eda07ecbf74a SHA512 d0e56dd6585c3f10b14043764313de11545380fb15b18ca1627bbd92db357219aef801af050cbf3466b0b4e97fce25a55293068d21db93c1b6003a802944886f diff --git a/media-gfx/exiv2/exiv2-0.27.3_rc2.ebuild b/media-gfx/exiv2/exiv2-0.27.3.ebuild index 276e4ea019b6..273b13df3d38 100644 --- a/media-gfx/exiv2/exiv2-0.27.3_rc2.ebuild +++ b/media-gfx/exiv2/exiv2-0.27.3.ebuild @@ -7,12 +7,13 @@ if [[ ${PV} = *9999 ]]; then EGIT_REPO_URI="https://github.com/Exiv2/exiv2.git" inherit git-r3 else - SRC_URI="https://pre-release.exiv2.org/builds/${P/_rc2/.20}-Source.tar.gz" -# KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" + SRC_URI="https://exiv2.org/builds/${P}-Source.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" + S="${WORKDIR}/${P}-Source" fi CMAKE_ECLASS=cmake -PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_COMPAT=( python3_{6,7,8,9} ) inherit cmake-multilib python-any-r1 DESCRIPTION="EXIF, IPTC and XMP metadata C++ library and command line utility" @@ -46,8 +47,6 @@ RDEPEND="${DEPEND}" DOCS=( README.md doc/ChangeLog doc/cmd.txt ) -S="${WORKDIR}/${P/_rc2/.20}-Source" - pkg_setup() { use doc && python-any-r1_pkg_setup } diff --git a/media-gfx/feh/Manifest b/media-gfx/feh/Manifest index 18af65b758f9..54a59316b5b3 100644 --- a/media-gfx/feh/Manifest +++ b/media-gfx/feh/Manifest @@ -3,6 +3,6 @@ DIST feh-3.3.tar.bz2 2112880 BLAKE2B 56042367c0acce966e115e77f3afa1acd3f942a956b DIST feh-3.4.1.tar.bz2 2114441 BLAKE2B c24e5f54762439cfbb031b4b24ded03f1c0c9c75233ae5b6dc66a7a56922902c672606a1b36fef9b30789c09946c8ccc5f9a60fe201db07e70bcf0ce0638c0c1 SHA512 d674d3134819cf6731aebf8af87a2f890d54dd7f8c64071e8816a032aeeb95c31f56752bb3477be0dfb653f813872b32dc2daf4e0514fed03e3f6bba36896c66 DIST feh-3.4.tar.bz2 2114146 BLAKE2B 0bc65db77c67c42b693122b877417c3dc4db7a0551cdf62723b3f7c134e5f2bb73ee6d0aa5a0c81402cf5a5f723ceb29a45fb5e4aef1911dc643aeb82c3ef17d SHA512 50cb7fd33b583ee802cbbba8ed7a74e9eb72a141ffa28ab998a196f9f8d030a8192420fc084136f699cb33b1b8c4d8c2c111fa90695dd82a1366330a428383ce EBUILD feh-3.3.ebuild 1462 BLAKE2B 6a15abb299ed6f7667e2bb72cc615f8ed9b0c19a85363970f6338703a71650b73a124a6674d2d632ebf282792dc509fd06478cebdcf7cb30d850fed331cfe047 SHA512 0112815c065ba37ad9574bc497d2d6617de4bec7e6fe8a7b2ab94dbdb41fbd1e81631e0d674638026459ff3021a76cab6d1a76370ed87af5b0044ba6eb7f9b4c -EBUILD feh-3.4.1.ebuild 1466 BLAKE2B 7f802e0c0e92c003602a60f1b1faf1c132c88de3ed6b92138075fe3497fb24f0b8fccef12c7e034e31b407b56cea1a751558ae4b8bb723eb29feca80a6a8fe23 SHA512 52cf87f2fffc675074444ba45bb97a6aebce8c144d29799091040fe9e590a83229bed60120561e0fad18134220f3f9de211b3fb0b19a8d57a8b42c8b00327117 +EBUILD feh-3.4.1.ebuild 1473 BLAKE2B eb858644d7a10d27e7bc9258534312c8223431bc364a1714bf6189b8d910ba39fe89c3c78bc0163aeda4576afb8268931917b0137dd4f9fcf066836a9768dcf5 SHA512 acedb3528aeda464305fd704223bb42a6c6f45c10ac93a28b8a09a8097e08924b6a2beda5b7c1bbe71a2c4d08940d9e2c1d916f02a7ee65d477d18f9d0d07d4a EBUILD feh-3.4.ebuild 1466 BLAKE2B 7f802e0c0e92c003602a60f1b1faf1c132c88de3ed6b92138075fe3497fb24f0b8fccef12c7e034e31b407b56cea1a751558ae4b8bb723eb29feca80a6a8fe23 SHA512 52cf87f2fffc675074444ba45bb97a6aebce8c144d29799091040fe9e590a83229bed60120561e0fad18134220f3f9de211b3fb0b19a8d57a8b42c8b00327117 MISC metadata.xml 252 BLAKE2B c64921f238c2751f1f0746df3d109951ebf79c5e1ed5a2fa6d9c33f5420a6ff87c52a5387048a35c148e8cdd29beb406001a9aca3f6cc0f396a78ccb37ae2e3e SHA512 39fbe572d744f1a6f2a23b85a7d62706c478d05f2c74c30e48ccfca5ffd8f26d968fe0869fb9eed4b6494c655f950ab6445346da6eacf85d10da0c1a627cf59b diff --git a/media-gfx/feh/feh-3.4.1.ebuild b/media-gfx/feh/feh-3.4.1.ebuild index cdfb177f990f..7d87a35ace60 100644 --- a/media-gfx/feh/feh-3.4.1.ebuild +++ b/media-gfx/feh/feh-3.4.1.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://feh.finalrewind.org/${P}.tar.bz2" LICENSE="feh" SLOT="0" -KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86" IUSE="debug curl exif test xinerama" RESTRICT="!test? ( test )" diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest index 0385dd3fbb5e..93e0e161c9b5 100644 --- a/media-gfx/gmic/Manifest +++ b/media-gfx/gmic/Manifest @@ -1,5 +1,5 @@ -DIST gmic_2.8.3.tar.gz 6172645 BLAKE2B 51a910ca9bb146173863f7f72dafec8ed42334757223055a5e174bebbed9e23372e1fdeb5b522c2120b203f4cbac0f255a9ada58fa62c7f83c745016d11bcabb SHA512 cde0e3fc50a97dae2b6d1dac1e7292a3d0af5e963586ec3e7ab6890721bc9617ea80b3bc86ec4cdc897d8b4ddc0fde552eea8322f8f337c447c603bcbc1403fd DIST gmic_2.9.0.tar.gz 6195597 BLAKE2B 3e1f83aa7e2024c545cab16c15cbd108ecaa33e7b0423c37cbb7e19fc9179280dfb31d819926110f06ff10a8b2b3e22b3c7f6c3e8bdece8b51c7295b8e78a974 SHA512 3b3703520998e5ad547316683158d7b60541a8cea2a7c1e7118f8de88492e0961bf1fe1da360dfb26d0ba7eaf997e7005a864364297db2bb405d532dedc4241d -EBUILD gmic-2.8.3.ebuild 4280 BLAKE2B d75d51965efd8f73b1b3112b14d640ddc63ee4ea8f0c51aa7deaa06ae16b87259e1d3b50c8513271a1004633246d788862ace4cbf05e341c13a0c6ebee427293 SHA512 99dc7f60578d1b42865e476527e4a2f86622dec59afd182d85c5588ace1764f34f2c92f08a6ffae1cb2f27c66e8b2044cd20d9daaa19aed64b5a03d21a01142b +DIST gmic_2.9.1.tar.gz 6212626 BLAKE2B cb948987629f9bf07f3e756eb5f90526ac2012a7bd2c11021a3fbc253709d9e62ecd60a2f3a9f9fd9a8605f0f2a73497143c4f121e27d1cb5aa4f3a455916c56 SHA512 dc6a90bb130b50164f7696a2e0c702ee24267f1559f52b77d4040fa0477c452b52eb140263bb3abb49673638246784b356004866e13f6d0660feff759688b45b EBUILD gmic-2.9.0.ebuild 4280 BLAKE2B d75d51965efd8f73b1b3112b14d640ddc63ee4ea8f0c51aa7deaa06ae16b87259e1d3b50c8513271a1004633246d788862ace4cbf05e341c13a0c6ebee427293 SHA512 99dc7f60578d1b42865e476527e4a2f86622dec59afd182d85c5588ace1764f34f2c92f08a6ffae1cb2f27c66e8b2044cd20d9daaa19aed64b5a03d21a01142b +EBUILD gmic-2.9.1.ebuild 4280 BLAKE2B d75d51965efd8f73b1b3112b14d640ddc63ee4ea8f0c51aa7deaa06ae16b87259e1d3b50c8513271a1004633246d788862ace4cbf05e341c13a0c6ebee427293 SHA512 99dc7f60578d1b42865e476527e4a2f86622dec59afd182d85c5588ace1764f34f2c92f08a6ffae1cb2f27c66e8b2044cd20d9daaa19aed64b5a03d21a01142b MISC metadata.xml 455 BLAKE2B 3854d23d62226a85f06404a3df62db1520a966a921137768f90a64bf2fcb0235f0786b8187154a0758682551eae61550fd571f7dfd940396de6f03fd6be204ad SHA512 95088719b28034519d74495a7232695eedd527cb031f65b808ac30d4cf0fc8ab2bca2271d02ef285f338d60151b30f0b3420eb29a45ac4f8a8922ab6b7e42a5e diff --git a/media-gfx/gmic/gmic-2.8.3.ebuild b/media-gfx/gmic/gmic-2.9.1.ebuild index 660e4b3ff4dc..660e4b3ff4dc 100644 --- a/media-gfx/gmic/gmic-2.8.3.ebuild +++ b/media-gfx/gmic/gmic-2.9.1.ebuild diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest index 701e9ab6354f..65e11c39c82b 100644 --- a/media-gfx/inkscape/Manifest +++ b/media-gfx/inkscape/Manifest @@ -1,16 +1,4 @@ -AUX inkscape-0.48.4-epython.patch 441 BLAKE2B 3c30f6a15002b8b046d01220a7528078d877fdb5632dae6f07d65ca257d5021e4ad29ffb1caa8584473f5634f8487189015b0667a696b40ec4eb848cfb282e1e SHA512 49253f2cc984b70cb09e90393fda8690efb47b511883ec6e8fcd9942442dadbb2085f5b6eb529b8cf4cb7cd1f4b8e39b88bf68a867d7f0724382d3da89eddc67 -AUX inkscape-0.91_pre3-cppflags.patch 493 BLAKE2B 6690a5d9eea503c4fccaaca8df67cd64e854a72b2941f51f8f82addca6120692a79e862d8a222b72cb97f0d14ef28f5a3dc19215119e0ab43ec4a472661010f4 SHA512 12253f89d51b2ad7610381aeba637d844c5ee2579eebc75aaad1791c87ef455a6a9a8dd1db5fc9e1adf51a928e8efe06946efc73e3743e209f970a457b397c35 -AUX inkscape-0.91_pre3-exif.patch 321 BLAKE2B 36f9d7ce19c1716b56800431ac095f047c5392974d64cf8c9374266b89b8fc75197185bb8a48ce8b3a19cd7daf3ac24e26220fdf72b976bcf9f73816ecf61b07 SHA512 c35b97cceba4e9470bd04d3f01f1eb8469c817b848c604540e61830321281b642856b6e38446cb9762c1501c16606ace2776344df20fd80a6952e6cd2e6e9ff2 -AUX inkscape-0.91_pre3-sk-man.patch 362 BLAKE2B adfe363332dcf46297d01feb986ffaf4e5fe2f2db88c5d7e663e477736a56f226183caa90ca2b421f064ce42e5e7b4e81419026681987aa85040f4379c74511d SHA512 5b4b6fd927b88fbf5d113da7fbd70a5d39a7926849b7e0118bbade0218e8429e751d977e0630894ba7f024d1628c4ff9e54c9a0a4ed6b9b87315e200b04bd8ab -AUX inkscape-0.92.1-automagic.patch 5416 BLAKE2B 3b17fd7a4cd305b6e683fd6a3f6bd6b81559be5097603f80bb438467f63594dea353acdf92ed5410399b641b6a5a92950e5c6bea582807717891073fe2877b5b SHA512 48f5d20cc32bcaa5fbbd7b9177ef1c68f2c6d2d0c39553bfc9f8e37fa7e74c63129a9ad94d93f26265dd2492359c983c50539286b86830783e001bb5dc3fa4c5 -AUX inkscape-0.92.1-desktop.patch 919 BLAKE2B c9952613e8d8dca1cd11146afd4d8db210be0f65f61b1a674cf5443dfaed3422e7082667cb93e183589d1e840ac3b55c7e70d03f44c0302b8c7db8ae621a976d SHA512 0000e5c6bd83e7d3994712d5a9f7369b2ecb7a15ba8371bfc9e2646b33293334eff987ffc360c2753025d0561395368024587d71ffc015f5a0e8c39077fd45b2 -AUX inkscape-0.92.4-glibmm-2.62.patch 561 BLAKE2B df3797f6b9a4a01338ca707e39da8ccd07728cc3d0d4b57ed981081512c8bed10a82619247ed6d828c116b09c3bd2e5f753e11ad8566c04680d567a96725a834 SHA512 8c6d43760dedd0c2bcdf31aeb0344e8d6bb154cbe7b2fc8f37e933b405fd9c42e05f68e1725c0781818f9a1de7ea292b991b7f12228a694a387f16d0a39ff97b -AUX inkscape-0.92.4-poppler-0.76.0.patch 1579 BLAKE2B c8c578dc3c6f0d79403bc0716bb6875544fbf19c98e721294cf9e5f58d9c89c1b8414dd58975846100c4ae5c21eba8e7e4797c037300ce05d741d9245a0dc59c SHA512 2f45e16aba67f4d1498cf012ac6198ec2bb977b9e39b3d4e2d14a216d86b1d407ff7ea5a889b58b5e800c129c0f99ec8bbc0a42dd7d41578d94ae1ab59208698 -AUX inkscape-0.92.4-poppler-0.82.0.patch 3223 BLAKE2B 6e530a2d2602d61c9f97f61813fad837536ccd3dc25405cf79ebda6563c56ff09e4a98b99c83aced6e8995473b27c7942c5774abafc7c33a2dbe45df58f419e4 SHA512 4a5f2e3ec9f16abe76786945e3085e405bbe7a4c57dfa0e6e7d4ddd4aadd17463766c7392846db08fa41419e05ef8c688d989ded8905755c010db6b08afa2feb -AUX inkscape-0.92.4-poppler-0.83.0.patch 4167 BLAKE2B cccc3ae0a4196815dcd7c2ff7260ed8ab8f81b4aaeecb557bb2f35d0f01ea616dfe7b0144dbf1638a679dc8642485448f479e6fa0a45274581c812ee792f51fc SHA512 1c6b1bd594bc49b392844d0cc232d79a8478e8f222179444cc197c6b93839cfefeb26b3a4cf702896baaa227d7ef5560dfefddc96ee6a9a1b1ea571fe4374bfc -DIST inkscape-0.92.4.tar.bz2 31929728 BLAKE2B 892bf4ed913019b27a9b8897e3ae32c44152163ded0eb345d59915ffdc9818d29f210de3294ef1b05601141185b5e3b10779778551b860f31e7df5c659492c77 SHA512 b9034605a79cd8aea808edf42e284819951ae1ea67778f0922f4c10224e94aca6c844acbc2294625773f0a7047d4e32ccdada876238a792a2c17db172c88e120 DIST inkscape-1.0.tar.xz 31935616 BLAKE2B 096ef6ccfd519118acffa3b15302a2d92f94976f37cf58c1fdab79abb64a2de14d02e1199364c71265a332f57809603ec1b6f4f34b90e910376e1cbc5c6d1cb8 SHA512 37c18079eb926fd6874deee95e4008bae165c5e52d05cb53bbc8f4a48eedd0e0ab6b3e5dfbb23709169187bfe8eb5aa44d576268667f2566a2cd4dd5426554f0 -EBUILD inkscape-0.92.4-r3.ebuild 3921 BLAKE2B ad0b135b5c24cd27954aa493d45b90eb74af7cd13fffcb919b6af4e9b4c66848bfc8ba5eeec5e36fdb6ca14052fa794f78f801c129c762ef4b4a3f9da43cdb58 SHA512 91705b00b90160ea40e2c055900ff51016f5cb0897ce8c23b9798a7158062a8485fc5077b18b5446baf3c5515e8161df1dc8377925ca2865037b9930656d7e53 -EBUILD inkscape-1.0-r1.ebuild 3929 BLAKE2B ba7493a7f5b5ba208b1bb431f572e755c0ec80fba14dc6b0434749c73618ef36b129024db53ec34f96d2f79d2ff281c5a98d49a9cd65742b911d2e09d87dbc62 SHA512 39caefe0f043463962c75c25499c7fbbfb3b644ddcc039eb744486bb2d59aa377262b61a55903f2233a220d18c7f8131594e40055a40553825f1665ecc0dd85d +EBUILD inkscape-1.0-r1.ebuild 3925 BLAKE2B 7693e7eba1c4e5c762751e93fb15653928167f9fbf3bf2332671452abad4e7c11e6094bcfed7d1388478714d00c8487e7416cdf28da5ebc9bfeef3a470785433 SHA512 ceef00cc2408ce6ea37825d2d1599dca87a462a1981a24b8b4d3630c8c3e79dd3bcb72e4d288b9419418bf62df1ac9b8cfead9331dcfd6b33c70b9cbe0c0c908 EBUILD inkscape-9999.ebuild 3910 BLAKE2B cfab74f275ac4a5adfba4a19966fda81345f5db7e3cc25ed7222a8c29208e893249dab17887dd7a6fd6a76f27f3f559f9e7181ef229e9c7109d0fa47e0546868 SHA512 b24b3f393c8d66dca3bb29de09cdd44214532c25e7de4d0e45c93a8be2365f1ea7208d9f24311299406da02b9c60ad257efd58795f467a7d6a8ecb3d81a90843 -MISC metadata.xml 1178 BLAKE2B 437e874d080bbd913e0910e0c7dc3a86834ac88b770493d65f29623db9a87d96f2cfc72e04bcdf51fc9f5d688695742d07a19414db55ff2ccb1a1b20cef20ad2 SHA512 007d65995421695c434b0c4a80474c43c95b7604cbe1cf576f5c7c4741777e563daa19bb25421089a979e0d23ce86522efae01e3f12a0b210323fc5306a2d305 +MISC metadata.xml 983 BLAKE2B 5b149700a92f0f4e8a07a643eb004ee6669a668a8a04dd74f13883c858bd2457f8a7f193f64313bf3203fa628484e502a0252272ae8f665a9ebe661589f3637d SHA512 7ab0de464a4dece17f9421bf44a660590c4d453447603a57568a092f90a0005e751cd599ca0923152fc101558c46c479dc65c13a8727b6071a43b1703b459b1e diff --git a/media-gfx/inkscape/files/inkscape-0.48.4-epython.patch b/media-gfx/inkscape/files/inkscape-0.48.4-epython.patch deleted file mode 100644 index 2e2483c1b1e3..000000000000 --- a/media-gfx/inkscape/files/inkscape-0.48.4-epython.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- inkscape-0.48.4/src/extension/implementation/script.cpp -+++ inkscape-0.48.4/src/extension/implementation/script.cpp -@@ -89,7 +89,7 @@ - #ifdef WIN32 - {"python", "python-interpreter", "pythonw" }, - #else -- {"python", "python-interpreter", "python" }, -+ {"python", "python-interpreter", "@EPYTHON@" }, - #endif - {"ruby", "ruby-interpreter", "ruby" }, - {"shell", "shell-interpreter", "sh" }, diff --git a/media-gfx/inkscape/files/inkscape-0.91_pre3-cppflags.patch b/media-gfx/inkscape/files/inkscape-0.91_pre3-cppflags.patch deleted file mode 100644 index 94dbf881de0c..000000000000 --- a/media-gfx/inkscape/files/inkscape-0.91_pre3-cppflags.patch +++ /dev/null @@ -1,14 +0,0 @@ -Gentoo enables _FORTIFY_SOURCE by default so this avoids redefined warnings. - ---- inkscape-0.91pre3/configure.ac -+++ inkscape-0.91pre3/configure.ac -@@ -72,9 +72,6 @@ - #### - # Generic cpp flags... - -- # What is just plain "-W" ? -- # Fortify source requires -O2 or higher, which is handled with newer autoconf -- CPPFLAGS="-W -D_FORTIFY_SOURCE=2 $CPPFLAGS" - # Enable format and format security warnings - CPPFLAGS="-Wformat -Wformat-security $CPPFLAGS" - # Enable all default warnings diff --git a/media-gfx/inkscape/files/inkscape-0.91_pre3-exif.patch b/media-gfx/inkscape/files/inkscape-0.91_pre3-exif.patch deleted file mode 100644 index 4180fd4d2ef0..000000000000 --- a/media-gfx/inkscape/files/inkscape-0.91_pre3-exif.patch +++ /dev/null @@ -1,12 +0,0 @@ -Actually try to use EXIF support if it's enabled. - ---- inkscape-0.91pre3/src/extension/internal/image-resolution.cpp -+++ inkscape-0.91pre3/src/extension/internal/image-resolution.cpp -@@ -18,6 +18,7 @@ - #include <png.h> - - #ifdef HAVE_EXIF -+#define IR_TRY_EXIF 1 - #include <math.h> - #include <libexif/exif-data.h> - #endif diff --git a/media-gfx/inkscape/files/inkscape-0.91_pre3-sk-man.patch b/media-gfx/inkscape/files/inkscape-0.91_pre3-sk-man.patch deleted file mode 100644 index f14e7d152e19..000000000000 --- a/media-gfx/inkscape/files/inkscape-0.91_pre3-sk-man.patch +++ /dev/null @@ -1,15 +0,0 @@ -Install sk man page to the right directory. - -https://bugs.gentoo.org/show_bug.cgi?id=481276 - ---- inkscape-0.91pre3/Makefile.am -+++ inkscape-0.91pre3/Makefile.am -@@ -561,7 +561,7 @@ - manja_DATA = inkscape.ja.1 - manjadir = $(mandir)/ja/man1 - --mansk_DATA = inkscape.ja.1 -+mansk_DATA = inkscape.sk.1 - manskdir = $(mandir)/sk/man1 - - manzhtw_DATA = inkscape.zh_TW.1 diff --git a/media-gfx/inkscape/files/inkscape-0.92.1-automagic.patch b/media-gfx/inkscape/files/inkscape-0.92.1-automagic.patch deleted file mode 100644 index db069d1e87cc..000000000000 --- a/media-gfx/inkscape/files/inkscape-0.92.1-automagic.patch +++ /dev/null @@ -1,154 +0,0 @@ -diff -ruN inkscape-0.92.1.orig/configure.ac inkscape-0.92.1/configure.ac ---- inkscape-0.92.1.orig/configure.ac 2017-02-14 00:46:57.000000000 +0100 -+++ inkscape-0.92.1/configure.ac 2017-05-12 21:20:45.880842301 +0200 -@@ -201,11 +201,14 @@ - dnl Check for OpenMP - dnl ****************************** - AC_OPENMP --if test "x$ac_cv_prog_cxx_openmp" != "xunsupported"; then -- openmp_ok=yes -- dnl We have it, now set up the flags -- CXXFLAGS="$CXXFLAGS $OPENMP_CXXFLAGS" -- AC_DEFINE(HAVE_OPENMP, 1, [Use OpenMP]) -+openmp_ok="no" -+if test "x$enable_openmp" = "xyes"; then -+ if test "x$ac_cv_prog_cxx_openmp" != "xunsupported"; then -+ openmp_ok=yes -+ dnl We have it, now set up the flags -+ CXXFLAGS="$CXXFLAGS $OPENMP_CXXFLAGS" -+ AC_DEFINE(HAVE_OPENMP, 1, [Use OpenMP]) -+ fi - fi - - dnl ******************** -@@ -222,9 +225,15 @@ - dnl ****************************** - dnl Check for libexif - dnl ****************************** --PKG_CHECK_MODULES(EXIF, libexif, exif_ok=yes, exif_ok=no) --if test "x$exif_ok" = "xyes"; then -- AC_DEFINE(HAVE_EXIF, 1, [Use libexif]) -+AC_ARG_ENABLE(exif, -+ AS_HELP_STRING([--enable-exif], [compile with EXIF support]), -+ enable_exif=$enableval,enable_exif=no) -+ -+if test "x$enable_exif" = "xyes"; then -+ PKG_CHECK_MODULES(EXIF, libexif, exif_ok=yes, exif_ok=no) -+ if test "x$exif_ok" = "xyes"; then -+ AC_DEFINE(HAVE_EXIF, 1, [Use libexif]) -+ fi - fi - AC_SUBST(EXIF_LIBS) - AC_SUBST(EXIF_CFLAGS) -@@ -232,10 +241,16 @@ - dnl ****************************** - dnl Check for libjpeg - dnl ****************************** --AC_CHECK_LIB(jpeg, jpeg_CreateDecompress, [AC_CHECK_HEADER(jpeglib.h, jpeg_ok=yes, jpeg_ok=no)], jpeg_ok=no) --if test "x$jpeg_ok" = "xyes"; then -- LIBS="-ljpeg $LIBS" -- AC_DEFINE(HAVE_JPEG, 1, [Use libjpeg]) -+AC_ARG_ENABLE(jpeg, -+ AS_HELP_STRING([--enable-jpeg], [compile with JPEG support]), -+ enable_jpeg=$enableval,enable_jpeg=no) -+ -+if test "x$enable_jpeg" = "xyes"; then -+ AC_CHECK_LIB(jpeg, jpeg_CreateDecompress, [AC_CHECK_HEADER(jpeglib.h, jpeg_ok=yes, jpeg_ok=no)], jpeg_ok=no) -+ if test "x$jpeg_ok" = "xyes"; then -+ LIBS="-ljpeg $LIBS" -+ AC_DEFINE(HAVE_JPEG, 1, [Use libjpeg]) -+ fi - fi - - dnl This check is to get a FIONREAD definition on Solaris 8 -@@ -614,9 +629,16 @@ - dnl Check for ImageMagick Magick++ - dnl ****************************** - --PKG_CHECK_MODULES(IMAGEMAGICK, ImageMagick++, magick_ok=yes, magick_ok=no) --if test "x$magick_ok" = "xyes"; then -- AC_DEFINE(WITH_IMAGE_MAGICK,1,[Image Magick++ support for bitmap effects]) -+AC_ARG_ENABLE(magick, -+ AS_HELP_STRING([--enable-magick], [compile with Image Magick++ support for bitmap effects]), -+ enable_magick=$enableval,enable_magick=no) -+ -+magick_ok="no" -+if test "x$enable_magick" = "xyes"; then -+ PKG_CHECK_MODULES(IMAGEMAGICK, Magick++, magick_ok=yes, magick_ok=no) -+ if test "x$magick_ok" = "xyes"; then -+ AC_DEFINE(WITH_IMAGE_MAGICK,1,[Image Magick++ support for bitmap effects]) -+ fi - fi - AM_CONDITIONAL(USE_IMAGE_MAGICK, test "x$magick_ok" = "xyes") - -@@ -712,6 +734,10 @@ - - AC_CHECK_HEADER([boost/unordered_set.hpp], [AC_DEFINE(HAVE_BOOST_UNORDERED_SET, 1, [Boost unordered_set (Boost >= 1.36)])], []) - -+ -+AC_ARG_WITH([gtkspell], -+ AS_HELP_STRING([--without-gtkspell], [disable gtk spelling widget]),[with_gtkspell=$withval], [with_gtkspell=yes]) -+ - dnl ********************************* - dnl Allow experimental GTK+3 build - dnl ********************************* -@@ -723,11 +749,13 @@ - if test "x$enable_gtk3" = "xyes"; then - - ink_spell_pkg= -- if pkg-config --exists gtkspell-3.0; then -- ink_spell_pkg=gtkspell-3.0 -- AC_DEFINE(WITH_GTKSPELL, 1, [enable gtk spelling widget]) -+ if test "x$with_gtkspell" = "xyes"; then -+ if pkg-config --exists gtkspell-3.0; then -+ ink_spell_pkg=gtkspell-3.0 -+ AC_DEFINE(WITH_GTKSPELL, 1, [enable gtk spelling widget]) -+ fi - fi -- -+ - PKG_CHECK_MODULES(GTK, - gtk+-3.0 >= 3.8 - gdk-3.0 >= 3.8 -@@ -804,11 +832,13 @@ - else - - ink_spell_pkg= -- if pkg-config --exists gtkspell-2.0; then -- ink_spell_pkg=gtkspell-2.0 -- AC_DEFINE(WITH_GTKSPELL, 1, [enable gtk spelling widget]) -+ if test "x$with_gtkspell" = "xyes"; then -+ if pkg-config --exists gtkspell-2.0; then -+ ink_spell_pkg=gtkspell-2.0 -+ AC_DEFINE(WITH_GTKSPELL, 1, [enable gtk spelling widget]) -+ fi - fi -- -+ - PKG_CHECK_MODULES(GTK, - gtk+-2.0 >= 2.24 - $ink_spell_pkg) -@@ -931,12 +961,17 @@ - dnl ************************** - dnl Check for aspell - dnl ****************************** --AC_CHECK_LIB(aspell, new_aspell_config, [AC_CHECK_HEADER(aspell.h, aspell_ok=yes, aspell_ok=no)], aspell_ok=no, -lz -lm) --if test "x$aspell_ok" = "xyes"; then -- AC_DEFINE(HAVE_ASPELL, 1, [Use aspell for built-in spellchecker]) -- INKSCAPE_LIBS="$INKSCAPE_LIBS -laspell" --else -- AC_MSG_CHECKING([Aspell not found, spell checker will be disabled]) -+AC_ARG_WITH([aspell], -+ AS_HELP_STRING([--without-aspell], [disable aspell spell checker]),[with_aspell=$withval], [with_aspell=yes]) -+ -+if test "x$with_aspell" = "xyes"; then -+ AC_CHECK_LIB(aspell, new_aspell_config, [AC_CHECK_HEADER(aspell.h, aspell_ok=yes, aspell_ok=no)], aspell_ok=no, -lz -lm) -+ if test "x$aspell_ok" = "xyes"; then -+ AC_DEFINE(HAVE_ASPELL, 1, [Use aspell for built-in spellchecker]) -+ INKSCAPE_LIBS="$INKSCAPE_LIBS -laspell" -+ else -+ AC_MSG_CHECKING([Aspell not found, spell checker will be disabled]) -+ fi - fi - - dnl Check for bind_textdomain_codeset, including -lintl if GLib brings it in. diff --git a/media-gfx/inkscape/files/inkscape-0.92.1-desktop.patch b/media-gfx/inkscape/files/inkscape-0.92.1-desktop.patch deleted file mode 100644 index be49ea505d36..000000000000 --- a/media-gfx/inkscape/files/inkscape-0.92.1-desktop.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN inkscape-0.92.1.orig/inkscape.desktop.in inkscape-0.92.1/inkscape.desktop.in ---- inkscape-0.92.1.orig/inkscape.desktop.in 2017-02-14 00:46:57.000000000 +0100 -+++ inkscape-0.92.1/inkscape.desktop.in 2017-05-12 21:25:01.628853033 +0200 -@@ -6,7 +6,7 @@ - _Comment=Create and edit Scalable Vector Graphics images - _Keywords=image;editor;vector;drawing; - Type=Application --Categories=Graphics;VectorGraphics;GTK; -+Categories=Graphics;2DGraphics;VectorGraphics;GTK; - MimeType=image/svg+xml;image/svg+xml-compressed;application/vnd.corel-draw;application/pdf;application/postscript;image/x-eps;application/illustrator;image/cgm;image/x-wmf;application/x-xccx;application/x-xcgm;application/x-xcdt;application/x-xsk1;application/x-xcmx;image/x-xcdr;application/visio;application/x-visio;application/vnd.visio;application/visio.drawing;application/vsd;application/x-vsd;image/x-vsd; - Exec=inkscape %F - TryExec=inkscape diff --git a/media-gfx/inkscape/files/inkscape-0.92.4-glibmm-2.62.patch b/media-gfx/inkscape/files/inkscape-0.92.4-glibmm-2.62.patch deleted file mode 100644 index 7a35d8d55ada..000000000000 --- a/media-gfx/inkscape/files/inkscape-0.92.4-glibmm-2.62.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur a/configure.ac b/configure.ac ---- a/configure.ac 2019-01-15 04:29:27.000000000 +0000 -+++ b/configure.ac 2020-04-03 18:39:26.372870987 +0000 -@@ -879,10 +879,6 @@ - if test "x$enable_strict_build" != "xno"; then - CPPFLAGS="-DGDKMM_DISABLE_DEPRECATED $CPPFLAGS" - -- # Ensure that no deprecated glibmm symbols are introduced. -- # lp:inkscape builds cleanly with this option at r10957 -- CPPFLAGS="-DGLIBMM_DISABLE_DEPRECATED $CPPFLAGS" -- - dnl Pango 1.32.4 uses a deprecated Glib symbol: - dnl https://bugzilla.gnome.org/show_bug.cgi?id=689843 - dnl diff --git a/media-gfx/inkscape/files/inkscape-0.92.4-poppler-0.76.0.patch b/media-gfx/inkscape/files/inkscape-0.92.4-poppler-0.76.0.patch deleted file mode 100644 index 11383d9aa338..000000000000 --- a/media-gfx/inkscape/files/inkscape-0.92.4-poppler-0.76.0.patch +++ /dev/null @@ -1,44 +0,0 @@ -From dc25406853353320078eca22cf817fb052c97082 Mon Sep 17 00:00:00 2001 -From: Marc Jeanmougin <marc@jeanmougin.fr> -Date: Wed, 24 Apr 2019 14:11:26 +0200 -Subject: [PATCH] Tentative fix for poppler 0.76 - ---- - src/extension/internal/pdfinput/pdf-parser.cpp | 2 +- - src/extension/internal/pdfinput/poppler-transition-api.h | 7 +++++++ - 2 files changed, 8 insertions(+), 1 deletion(-) - -diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp -index 2981d6ee51..ddbff7671f 100644 ---- a/src/extension/internal/pdfinput/pdf-parser.cpp -+++ b/src/extension/internal/pdfinput/pdf-parser.cpp -@@ -426,7 +426,7 @@ void PdfParser::parse(Object *obj, GBool topLevel) { - error(errInternal, -1, "Weird page contents"); - return; - } -- parser = new Parser(xref, new Lexer(xref, obj), gFalse); -+ parser = new _POPPLER_NEW_PARSER(xref, obj); - go(topLevel); - delete parser; - parser = NULL; -diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h -index 6e4dde7dee..21a60702fa 100644 ---- a/src/extension/internal/pdfinput/poppler-transition-api.h -+++ b/src/extension/internal/pdfinput/poppler-transition-api.h -@@ -3,6 +3,13 @@ - - #include <glib/poppler-features.h> - -+#if POPPLER_CHECK_VERSION(0, 76, 0) -+#define _POPPLER_NEW_PARSER(xref, obj) Parser(xref, obj, gFalse) -+#else -+#define _POPPLER_NEW_PARSER(xref, obj) Parser(xref, new Lexer(xref, obj), gFalse) -+#endif -+ -+ - #if POPPLER_CHECK_VERSION(0, 72, 0) - #define getCString c_str - #endif --- -2.18.1 - diff --git a/media-gfx/inkscape/files/inkscape-0.92.4-poppler-0.82.0.patch b/media-gfx/inkscape/files/inkscape-0.92.4-poppler-0.82.0.patch deleted file mode 100644 index 73cc4f97c37b..000000000000 --- a/media-gfx/inkscape/files/inkscape-0.92.4-poppler-0.82.0.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 9b2f1a99bd8a411926925ac0c91f50289c7db8ee Mon Sep 17 00:00:00 2001 -From: Thomas Holder <thomas@thomas-holder.de> -Date: Sat, 16 Nov 2019 14:12:24 +0100 -Subject: [PATCH] fix poppler 0.82.0 build -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Backport of 324c7903d9fd62e74c042c31477299be3b980fd2 from master by -Andreas K. Hüttel <dilfridge@gentoo.org> ---- - src/extension/internal/pdfinput/pdf-parser.cpp | 2 +- - src/extension/internal/pdfinput/poppler-transition-api.h | 6 ++++++ - src/extension/internal/pdfinput/svg-builder.cpp | 2 +- - src/extension/internal/pdfinput/svg-builder.h | 2 +- - 4 files changed, 9 insertions(+), 3 deletions(-) - -diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp -index ddbff7671f..e71bb79381 100644 ---- a/src/extension/internal/pdfinput/pdf-parser.cpp -+++ b/src/extension/internal/pdfinput/pdf-parser.cpp -@@ -2414,7 +2414,7 @@ void PdfParser::doShowText(GooString *s) { - int wMode; - double riseX, riseY; - CharCode code; -- Unicode *u = NULL; -+ Unicode _POPPLER_CONST_82 *u = NULL; - double x, y, dx, dy, tdx, tdy; - double originX, originY, tOriginX, tOriginY; - double oldCTM[6], newCTM[6]; -diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h -index 21a60702fa..93c0f99ba1 100644 ---- a/src/extension/internal/pdfinput/poppler-transition-api.h -+++ b/src/extension/internal/pdfinput/poppler-transition-api.h -@@ -3,6 +3,12 @@ - - #include <glib/poppler-features.h> - -+#if POPPLER_CHECK_VERSION(0, 82, 0) -+#define _POPPLER_CONST_82 const -+#else -+#define _POPPLER_CONST_82 -+#endif -+ - #if POPPLER_CHECK_VERSION(0, 76, 0) - #define _POPPLER_NEW_PARSER(xref, obj) Parser(xref, obj, gFalse) - #else -diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp -index 1cefb92abd..ea2940ffe1 100644 ---- a/src/extension/internal/pdfinput/svg-builder.cpp -+++ b/src/extension/internal/pdfinput/svg-builder.cpp -@@ -1379,7 +1379,7 @@ void SvgBuilder::beginString(GfxState *state) { - void SvgBuilder::addChar(GfxState *state, double x, double y, - double dx, double dy, - double originX, double originY, -- CharCode /*code*/, int /*nBytes*/, Unicode *u, int uLen) { -+ CharCode /*code*/, int /*nBytes*/, Unicode const *u, int uLen) { - - - bool is_space = ( uLen == 1 && u[0] == 32 ); -diff --git a/src/extension/internal/pdfinput/svg-builder.h b/src/extension/internal/pdfinput/svg-builder.h -index 34b42e17b8..78e302081f 100644 ---- a/src/extension/internal/pdfinput/svg-builder.h -+++ b/src/extension/internal/pdfinput/svg-builder.h -@@ -141,7 +141,7 @@ public: - void addChar(GfxState *state, double x, double y, - double dx, double dy, - double originX, double originY, -- CharCode code, int nBytes, Unicode *u, int uLen); -+ CharCode code, int nBytes, Unicode const *u, int uLen); - void beginTextObject(GfxState *state); - void endTextObject(GfxState *state); - --- -2.24.0 - diff --git a/media-gfx/inkscape/files/inkscape-0.92.4-poppler-0.83.0.patch b/media-gfx/inkscape/files/inkscape-0.92.4-poppler-0.83.0.patch deleted file mode 100644 index bcfb1cd482eb..000000000000 --- a/media-gfx/inkscape/files/inkscape-0.92.4-poppler-0.83.0.patch +++ /dev/null @@ -1,92 +0,0 @@ -From 51351358a62acb6887eab49bc0dc4a7a3d18c17a Mon Sep 17 00:00:00 2001 -From: Jan Tojnar <jtojnar@gmail.com> -Date: Tue, 3 Dec 2019 00:17:05 +0100 -Subject: [PATCH] Fix build with Poppler 0.83.0 - -Fixed for gentoo by dilfridge@gentoo.org - -diff -ruN inkscape-0.92.4.orig/src/extension/internal/pdfinput/pdf-input.cpp inkscape-0.92.4/src/extension/internal/pdfinput/pdf-input.cpp ---- inkscape-0.92.4.orig/src/extension/internal/pdfinput/pdf-input.cpp 2019-01-15 05:29:27.000000000 +0100 -+++ inkscape-0.92.4/src/extension/internal/pdfinput/pdf-input.cpp 2020-01-06 10:55:05.105063212 +0100 -@@ -689,12 +689,12 @@ - // - gchar const *poppler_datadir = g_getenv("POPPLER_DATADIR"); - if (poppler_datadir != NULL) { -- globalParams = new GlobalParams(poppler_datadir); -+ globalParams = _POPPLER_NEW_GLOBAL_PARAMS(poppler_datadir); - } else { -- globalParams = new GlobalParams(); -+ globalParams = _POPPLER_NEW_GLOBAL_PARAMS(); - } - #else -- globalParams = new GlobalParams(); -+ globalParams = _POPPLER_NEW_GLOBAL_PARAMS(); - #endif // ENABLE_OSX_APP_LOCATIONS - } - -diff -ruN inkscape-0.92.4.orig/src/extension/internal/pdfinput/pdf-parser.cpp inkscape-0.92.4/src/extension/internal/pdfinput/pdf-parser.cpp ---- inkscape-0.92.4.orig/src/extension/internal/pdfinput/pdf-parser.cpp 2020-01-06 10:53:44.947229010 +0100 -+++ inkscape-0.92.4/src/extension/internal/pdfinput/pdf-parser.cpp 2020-01-06 10:56:49.611773932 +0100 -@@ -272,7 +272,7 @@ - ClipHistoryEntry *save(); - ClipHistoryEntry *restore(); - GBool hasSaves() { return saved != NULL; } -- void setClip(GfxPath *newClipPath, GfxClipType newClipType = clipNormal); -+ void setClip(_POPPLER_CONST_83 GfxPath *newClipPath, GfxClipType newClipType = clipNormal); - GfxPath *getClipPath() { return clipPath; } - GfxClipType getClipType() { return clipType; } - -@@ -3394,7 +3394,7 @@ - } - } - --void ClipHistoryEntry::setClip(GfxPath *clipPathA, GfxClipType clipTypeA) { -+void ClipHistoryEntry::setClip(_POPPLER_CONST_83 GfxPath *clipPathA, GfxClipType clipTypeA) { - // Free previous clip path - if (clipPath) { - delete clipPath; -diff -ruN inkscape-0.92.4.orig/src/extension/internal/pdfinput/poppler-transition-api.h inkscape-0.92.4/src/extension/internal/pdfinput/poppler-transition-api.h ---- inkscape-0.92.4.orig/src/extension/internal/pdfinput/poppler-transition-api.h 2020-01-06 10:53:44.947229010 +0100 -+++ inkscape-0.92.4/src/extension/internal/pdfinput/poppler-transition-api.h 2020-01-06 10:55:05.107063491 +0100 -@@ -3,6 +3,12 @@ - - #include <glib/poppler-features.h> - -+#if POPPLER_CHECK_VERSION(0, 83, 0) -+#define _POPPLER_CONST_83 const -+#else -+#define _POPPLER_CONST_83 -+#endif -+ - #if POPPLER_CHECK_VERSION(0, 82, 0) - #define _POPPLER_CONST_82 const - #else -@@ -15,6 +21,12 @@ - #define _POPPLER_NEW_PARSER(xref, obj) Parser(xref, new Lexer(xref, obj), gFalse) - #endif - -+#if POPPLER_CHECK_VERSION(0, 83, 0) -+#define _POPPLER_NEW_GLOBAL_PARAMS(args...) std::unique_ptr<GlobalParams>(new GlobalParams(args)) -+#else -+#define _POPPLER_NEW_GLOBAL_PARAMS(args...) new GlobalParams(args) -+#endif -+ - - #if POPPLER_CHECK_VERSION(0, 72, 0) - #define getCString c_str -diff -ruN inkscape-0.92.4.orig/src/extension/internal/pdfinput/svg-builder.cpp inkscape-0.92.4/src/extension/internal/pdfinput/svg-builder.cpp ---- inkscape-0.92.4.orig/src/extension/internal/pdfinput/svg-builder.cpp 2020-01-06 10:53:44.948229017 +0100 -+++ inkscape-0.92.4/src/extension/internal/pdfinput/svg-builder.cpp 2020-01-06 10:55:05.107063491 +0100 -@@ -264,10 +264,10 @@ - /** - * \brief Generates a SVG path string from poppler's data structure - */ --static gchar *svgInterpretPath(GfxPath *path) { -+static gchar *svgInterpretPath(_POPPLER_CONST_83 GfxPath *path) { - Inkscape::SVG::PathString pathString; - for (int i = 0 ; i < path->getNumSubpaths() ; ++i ) { -- GfxSubpath *subpath = path->getSubpath(i); -+ _POPPLER_CONST_83 GfxSubpath *subpath = path->getSubpath(i); - if (subpath->getNumPoints() > 0) { - pathString.moveTo(subpath->getX(0), subpath->getY(0)); - int j = 1; diff --git a/media-gfx/inkscape/inkscape-0.92.4-r3.ebuild b/media-gfx/inkscape/inkscape-0.92.4-r3.ebuild deleted file mode 100644 index 1b9241b51aa1..000000000000 --- a/media-gfx/inkscape/inkscape-0.92.4-r3.ebuild +++ /dev/null @@ -1,166 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="xml" -inherit autotools flag-o-matic gnome2-utils xdg toolchain-funcs python-single-r1 - -MY_P="${P/_/}" - -DESCRIPTION="SVG based generic vector-drawing program" -HOMEPAGE="https://inkscape.org/" -SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz2" - -LICENSE="GPL-2 LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86" -IUSE="cdr dia dbus exif gnome imagemagick openmp postscript inkjar jpeg latex" -IUSE+=" lcms nls spell static-libs visio wpg uniconvertor" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -COMMON_DEPEND="${PYTHON_DEPS} - >=app-text/poppler-0.26.0:=[cairo] - >=dev-cpp/glibmm-2.54.1 - >=dev-cpp/gtkmm-2.18.0:2.4 - >=dev-cpp/cairomm-1.9.8 - >=dev-libs/boehm-gc-7.1:= - >=dev-libs/glib-2.28 - >=dev-libs/libsigc++-2.0.12 - >=dev-libs/libxml2-2.6.20 - >=dev-libs/libxslt-1.0.15 - dev-libs/popt - media-gfx/potrace - media-libs/fontconfig - media-libs/freetype:2 - media-libs/libpng:0= - sci-libs/gsl:= - x11-libs/libX11 - >=x11-libs/gtk+-2.10.7:2 - >=x11-libs/pango-1.24 - cdr? ( - app-text/libwpg:0.3 - dev-libs/librevenge - media-libs/libcdr - ) - dbus? ( dev-libs/dbus-glib ) - exif? ( media-libs/libexif ) - gnome? ( >=gnome-base/gnome-vfs-2.0 ) - imagemagick? ( <media-gfx/imagemagick-7:=[cxx] ) - jpeg? ( virtual/jpeg:0 ) - lcms? ( media-libs/lcms:2 ) - spell? ( - app-text/aspell - app-text/gtkspell:2 - ) - visio? ( - app-text/libwpg:0.3 - dev-libs/librevenge - media-libs/libvisio - ) - wpg? ( - app-text/libwpg:0.3 - dev-libs/librevenge - ) -" -# These only use executables provided by these packages -# See share/extensions for more details. inkscape can tell you to -# install these so we could of course just not depend on those and rely -# on that. -RDEPEND="${COMMON_DEPEND} - $(python_gen_cond_dep ' - || ( - dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}] - dev-python/numpy[${PYTHON_MULTI_USEDEP}] - ) - ') - uniconvertor? ( media-gfx/uniconvertor ) - dia? ( app-office/dia ) - latex? ( - media-gfx/pstoedit[plotutils] - app-text/dvipsk - app-text/texlive-core - ) - postscript? ( app-text/ghostscript-gpl ) -" -DEPEND="${COMMON_DEPEND} - >=dev-libs/boost-1.36 - dev-util/glib-utils - >=dev-util/intltool-0.40 - >=sys-devel/gettext-0.17 - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}/${PN}-0.92.1-automagic.patch" - "${FILESDIR}/${PN}-0.91_pre3-cppflags.patch" - "${FILESDIR}/${PN}-0.92.1-desktop.patch" - "${FILESDIR}/${PN}-0.91_pre3-exif.patch" - "${FILESDIR}/${PN}-0.91_pre3-sk-man.patch" - "${FILESDIR}/${PN}-0.48.4-epython.patch" - "${FILESDIR}/${PN}-0.92.4-poppler-0.76.0.patch" #684246 - "${FILESDIR}/${PN}-0.92.4-poppler-0.82.0.patch" - "${FILESDIR}/${PN}-0.92.4-poppler-0.83.0.patch" - "${FILESDIR}/${PN}-0.92.4-glibmm-2.62.patch" #715394 -) - -S="${WORKDIR}/${MY_P}" - -RESTRICT="test" - -pkg_pretend() { - if [[ ${MERGE_TYPE} != binary ]] && use openmp; then - tc-has-openmp || die "Please switch to an openmp compatible compiler" - fi -} - -src_prepare() { - default - - sed -i "s#@EPYTHON@#${EPYTHON}#" \ - src/extension/implementation/script.cpp || die - - eautoreconf - - # bug 421111 - python_fix_shebang share/extensions -} - -src_configure() { - # aliasing unsafe wrt #310393 - append-flags -fno-strict-aliasing - - local myeconfargs=( - $(use_enable static-libs static) - $(use_enable nls) - $(use_enable openmp) - $(use_enable exif) - $(use_enable jpeg) - $(use_enable lcms) - --enable-poppler-cairo - $(use_enable wpg) - $(use_enable visio) - $(use_enable cdr) - $(use_enable dbus dbusapi) - $(use_enable imagemagick magick) - $(use_with gnome gnome-vfs) - $(use_with inkjar) - $(use_with spell gtkspell) - $(use_with spell aspell) - ) - econf "${myeconfargs[@]}" -} - -src_compile() { - emake -C src helper/sp-marshal.h #686304 - emake AR="$(tc-getAR)" -} - -src_install() { - default - - find "${ED}" -name "*.la" -delete || die - python_optimize "${ED%/}"/usr/share/${PN}/extensions -} diff --git a/media-gfx/inkscape/inkscape-1.0-r1.ebuild b/media-gfx/inkscape/inkscape-1.0-r1.ebuild index bd52bf80600b..86a1a7aa6dca 100644 --- a/media-gfx/inkscape/inkscape-1.0-r1.ebuild +++ b/media-gfx/inkscape/inkscape-1.0-r1.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://inkscape.org/gallery/item/18460/${P}.tar.xz" LICENSE="GPL-2 LGPL-2.1" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86" IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg lcms openmp postscript spell static-libs svg2 visio wpg" diff --git a/media-gfx/inkscape/metadata.xml b/media-gfx/inkscape/metadata.xml index 73af4608f62b..67658aa01494 100644 --- a/media-gfx/inkscape/metadata.xml +++ b/media-gfx/inkscape/metadata.xml @@ -13,11 +13,9 @@ <flag name="cdr">Enable support for CorelDRAW files via <pkg>media-libs/libcdr</pkg></flag> <flag name="dia">Enable DIA flow chart import via <pkg>app-office/dia</pkg></flag> <flag name="inkjar">Enable support for OpenOffice.org SVG jar files</flag> - <flag name="latex">Enable rendering of LaTeX formulas</flag> <flag name="svg2">Enable support for new SVG2 features</flag> <flag name="visio">Enable support for Microsoft Visio diagrams via <pkg>media-libs/libvisio</pkg></flag> <flag name="wpg">Enable support for WordPerfect graphics via <pkg>app-text/libwpg</pkg></flag> - <flag name="uniconvertor">Enable conversion of vector graphic files via <pkg>media-gfx/uniconvertor</pkg> (needs Python 2)</flag> </use> <upstream> <remote-id type="gitlab">inkscape/inkscape</remote-id> diff --git a/media-gfx/meshlab/Manifest b/media-gfx/meshlab/Manifest index 70a5ab19f699..d18182be825a 100644 --- a/media-gfx/meshlab/Manifest +++ b/media-gfx/meshlab/Manifest @@ -24,7 +24,5 @@ AUX 2016.12/remove-edit_mutualcorrs.patch 475 BLAKE2B 925756e7bed4fd9474b2a011f9 AUX 2016.12/remove-io_TXT.patch 416 BLAKE2B 60aa9c033a4902c4a9acb76b1ac130076cfdef314ac57a144c0a83d59e1d7f2aa5e55c01c41ba671661cdeef249aa09e021085440214910c8153fa6303833c2f SHA512 2ff0391e5c0bd171bb06fc61cbe84112f5e480667f7a7caacbb3b3a0e566c6c2f31f443d8c6026298c3a86bf2979db534989b4eab368baaee67491b95e76723a DIST meshlab-2016.12.tar.gz 94194402 BLAKE2B 53dda75b51198d529d35ae64e1b9d8ec240ec6031835e6cde2ff1ad21403086112a6f4b9acf5c6f53328787078b3e1a90cc177f5e009834b310cdf6b168c59b0 SHA512 68bf863fc390725a949578b545bc749bbe2c07ca75d1461772c7777fd6a4b095f11b64b5b0e8b729f83fea1bb9e3ca4b41123cdea3799a8eee0de587eb7bf1d8 DIST vcglib-1.0.1.tar.gz 9063634 BLAKE2B 91fba7ebf1ac18d0dfb33d3e26656e546b7c35ae753777730c44ebdf327413dfe94dd5e84907eb7e1644d70bfdf7d00ae8ecd0a81587d790a31354f7db09d626 SHA512 55d1854054744abae2d41e7b5041df89253bae108df5fc1cfe777013de7192dce04bc474475cb11a1d0343ebcab1ea61b381d9d9c36c452528043e85e75bc211 -EBUILD meshlab-2016.12-r2.ebuild 3497 BLAKE2B 9e3de165ab7cb48eec6289e55f2e1df0f88c9476ee0b67b7d99fdf052d0255143d48fac4002b3554d36ba967493ae3754fddd0a8c617b3aa30860cb887e6d547 SHA512 50433f5f61a00c4ecf33f901300156845ddc404ee427af7214fb42edd292cfe91cf26f5dc96d9cb7316e6b97d3934d9534a513c8d278d327fb82ff82df49712a -EBUILD meshlab-2016.12-r3.ebuild 3539 BLAKE2B ce73969c0caf822ce458b4e3e40c591479f032fe9780b61bb2eb852cf9ae12eb933fb4b355b36b2af70f201a6a29135d8cba814be87af2369366b0fa798a6684 SHA512 a1df95a5610db88be56ed83e16ba4fd4fc71a7ff138435f1cfbaefe71d8dd9a56c193bdc32f9f7affd303c6ac4db4ffc244452cb20571e350d2f0a6dde6246f9 EBUILD meshlab-2016.12-r4.ebuild 3652 BLAKE2B 5ea94dd176d7229e6e07ea102b130d8e97907edbcd630258f704b14f47179ba02fe5ae44485132372b2bdfeef14317e2e10904b027b1f1d0081ba23e9cdccf82 SHA512 5bc637d6299fa057dd4549d6559c20e0a8e91d441794fa54de5963288a067fa8f435f8f38b172c8869659b334c313a2b05f4ecbe6433a37f8a69bc14b9abb130 MISC metadata.xml 729 BLAKE2B 5c89ef346791f1aaecf313a580c18e32d37a116e87aa5955d21445816fd7a9fae30af5763dafe32f019fcda1333b3bfe48280abb1845fe096f223642badb9629 SHA512 f1d3b39a1c612b895463f0cb674411fce2614ff55855b964dee1b9c999aa1ad4bb6ec0a000cab9a1767f54474597836a92fda48722a3d8a90d21f412316e2b71 diff --git a/media-gfx/meshlab/meshlab-2016.12-r2.ebuild b/media-gfx/meshlab/meshlab-2016.12-r2.ebuild deleted file mode 100644 index 2c5cb0f61d06..000000000000 --- a/media-gfx/meshlab/meshlab-2016.12-r2.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit qmake-utils - -DESCRIPTION="the open source system for processing and editing 3D triangular meshes" -HOMEPAGE="http://www.meshlab.net" -VCG_VERSION="1.0.1" -SRC_URI="https://github.com/cnr-isti-vclab/meshlab/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://github.com/cnr-isti-vclab/vcglib/archive/v${VCG_VERSION}.tar.gz -> vcglib-${VCG_VERSION}.tar.gz -" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="-minimal" -DEPEND="dev-cpp/eigen:3 - dev-cpp/muParser - dev-qt/qtcore:5 - dev-qt/qtopengl:5 - dev-qt/qtscript:5 - dev-qt/qtxmlpatterns:5 - >=media-gfx/jhead-3.00-r2 - media-libs/glew:0 - media-libs/qhull - =media-libs/lib3ds-1* - media-libs/openctm - sci-libs/levmar - sci-libs/mpir" - -RDEPEND="${DEPEND}" - -S="${WORKDIR}/meshlab-${PV}/src" - -PATCHES=( - "${FILESDIR}/${PV}/0001-set-shader-and-texture-paths.patch" - #remove ot working plugins - "${FILESDIR}/${PV}/remove-edit_mutualcorrs.patch" - "${FILESDIR}/${PV}/remove-io_TXT.patch" - #since structure synth doesn't seem to be compiling - "${FILESDIR}/${PV}/0001-disable-filter-ssynth.patch" - #this has been fixed in the tree - "${FILESDIR}/${PV}/0001-disable-edit-quality.patch" - #this causes segfaults - "${FILESDIR}/${PV}/0001-disable-filter-layer.patch" - #for when we use minimal - "${FILESDIR}/${PV}/0001-compile-server.patch" - "${FILESDIR}/${PV}/0001-use-external-lib3ds.patch" - "${FILESDIR}/${PV}/0001-use-external-openctm.patch" - "${FILESDIR}/${PV}/0001-use-external-muParser.patch" - "${FILESDIR}/${PV}/0001-use-external-bzip.patch" - "${FILESDIR}/${PV}/0001-use-external-jhead.patch" - "${FILESDIR}/${PV}/0001-use-external-glew.patch" - #cause gnu stack quickstart related qa - "${FILESDIR}/${PV}/0001-remove-not-sane-plugins.patch" - "${FILESDIR}/${PV}/${P}-fix-plugins-path.patch" - "${FILESDIR}/${PV}/${P}-align1.patch" - "${FILESDIR}/${PV}/${P}-align2.patch" - ) - -src_prepare() { - mv "${WORKDIR}/vcglib-${VCG_VERSION}" "${WORKDIR}/vcglib" || die "vcglib mv failed" - default - #proof of patchset - #remove libs that are being used from the system - rm -r "external/lib3ds-1.3.0" || die "rm failed" - rm -r "external/OpenCTM-1.0.3" || die "rm failed" - rm -r "external/muparser_v132" || die "rm failed" - rm -r "external/muparser_v225" || die "rm failed" - rm -r "external/bzip2-1.0.5" || die "rm failed" - rm -r "external/jhead-2.95" || die "rm failed" - rm -r "external/glew-1.5.1" || die "rm failed" - rm -r "external/glew-1.7.0" || die "rm failed" - #we still depend on lm.h - #rm -r "external" - rm -r "distrib/plugins/U3D_W32" || die - rm -r "distrib/plugins/U3D_OSX" || die - - # Fix bug 638796 - cd "${WORKDIR}" || die - eapply "${FILESDIR}/${PV}/${P}-remove-header.patch" -} - -src_configure() { - use minimal || eqmake5 -r meshlab_full.pro - use minimal && eqmake5 -r meshlab_mini.pro -} - -src_install() { - dobin distrib/{meshlab,meshlabserver} - dolib distrib/libcommon.so.1.0.0 - dosym libcommon.so.1.0.0 /usr/$(get_libdir)/libcommon.so.1 - dosym libcommon.so.1 /usr/$(get_libdir)/libcommon.so - exeinto /usr/$(get_libdir)/meshlab/plugins - doexe distrib/plugins/*.so - insinto /usr/share/meshlab/shaders - doins -r distrib/shaders/* - insinto /usr/share/meshlab/plugins - doins -r distrib/plugins/* - insinto /usr/share/meshlab/textures - doins -r distrib/textures/* - insinto /usr/share/meshlab/sample - doins -r distrib/sample/* - newicon "${S}"/meshlab/images/eye512.png "${PN}".png - make_desktop_entry meshlab "Meshlab" "${PN}" Graphics -} diff --git a/media-gfx/meshlab/meshlab-2016.12-r3.ebuild b/media-gfx/meshlab/meshlab-2016.12-r3.ebuild deleted file mode 100644 index 9cd64b0952cc..000000000000 --- a/media-gfx/meshlab/meshlab-2016.12-r3.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit qmake-utils - -DESCRIPTION="the open source system for processing and editing 3D triangular meshes" -HOMEPAGE="http://www.meshlab.net" -VCG_VERSION="1.0.1" -SRC_URI="https://github.com/cnr-isti-vclab/meshlab/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://github.com/cnr-isti-vclab/vcglib/archive/v${VCG_VERSION}.tar.gz -> vcglib-${VCG_VERSION}.tar.gz -" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="-minimal" -DEPEND="dev-cpp/eigen:3 - dev-cpp/muParser - dev-qt/qtcore:5 - dev-qt/qtopengl:5 - dev-qt/qtscript:5 - dev-qt/qtxmlpatterns:5 - >=media-gfx/jhead-3.00-r2 - media-libs/glew:0 - media-libs/qhull - =media-libs/lib3ds-1* - media-libs/openctm - sci-libs/levmar - sci-libs/mpir" - -RDEPEND="${DEPEND}" - -S="${WORKDIR}/meshlab-${PV}/src" - -PATCHES=( - "${FILESDIR}/${PV}/0001-set-shader-and-texture-paths.patch" - #remove ot working plugins - "${FILESDIR}/${PV}/remove-edit_mutualcorrs.patch" - "${FILESDIR}/${PV}/remove-io_TXT.patch" - #since structure synth doesn't seem to be compiling - "${FILESDIR}/${PV}/0001-disable-filter-ssynth.patch" - #this has been fixed in the tree - "${FILESDIR}/${PV}/0001-disable-edit-quality.patch" - #this causes segfaults - "${FILESDIR}/${PV}/0001-disable-filter-layer.patch" - #for when we use minimal - "${FILESDIR}/${PV}/0001-compile-server.patch" - "${FILESDIR}/${PV}/0001-use-external-lib3ds.patch" - "${FILESDIR}/${PV}/0001-use-external-openctm.patch" - "${FILESDIR}/${PV}/0001-use-external-muParser.patch" - "${FILESDIR}/${PV}/0001-use-external-bzip.patch" - "${FILESDIR}/${PV}/0001-use-external-jhead.patch" - "${FILESDIR}/${PV}/0001-use-external-glew.patch" - #cause gnu stack quickstart related qa - "${FILESDIR}/${PV}/0001-remove-not-sane-plugins.patch" - "${FILESDIR}/${PV}/${P}-fix-plugins-path.patch" - "${FILESDIR}/${PV}/${P}-align1.patch" - "${FILESDIR}/${PV}/${P}-align2.patch" - "${FILESDIR}/${PV}/${P}-asString.patch" - ) - -src_prepare() { - mv "${WORKDIR}/vcglib-${VCG_VERSION}" "${WORKDIR}/vcglib" || die "vcglib mv failed" - default - #proof of patchset - #remove libs that are being used from the system - rm -r "external/lib3ds-1.3.0" || die "rm failed" - rm -r "external/OpenCTM-1.0.3" || die "rm failed" - rm -r "external/muparser_v132" || die "rm failed" - rm -r "external/muparser_v225" || die "rm failed" - rm -r "external/bzip2-1.0.5" || die "rm failed" - rm -r "external/jhead-2.95" || die "rm failed" - rm -r "external/glew-1.5.1" || die "rm failed" - rm -r "external/glew-1.7.0" || die "rm failed" - #we still depend on lm.h - #rm -r "external" - rm -r "distrib/plugins/U3D_W32" || die - rm -r "distrib/plugins/U3D_OSX" || die - - # Fix bug 638796 - cd "${WORKDIR}" || die - eapply "${FILESDIR}/${PV}/${P}-remove-header.patch" -} - -src_configure() { - use minimal || eqmake5 -r meshlab_full.pro - use minimal && eqmake5 -r meshlab_mini.pro -} - -src_install() { - dobin distrib/{meshlab,meshlabserver} - dolib distrib/libcommon.so.1.0.0 - dosym libcommon.so.1.0.0 /usr/$(get_libdir)/libcommon.so.1 - dosym libcommon.so.1 /usr/$(get_libdir)/libcommon.so - exeinto /usr/$(get_libdir)/meshlab/plugins - doexe distrib/plugins/*.so - insinto /usr/share/meshlab/shaders - doins -r distrib/shaders/* - insinto /usr/share/meshlab/plugins - doins -r distrib/plugins/* - insinto /usr/share/meshlab/textures - doins -r distrib/textures/* - insinto /usr/share/meshlab/sample - doins -r distrib/sample/* - newicon "${S}"/meshlab/images/eye512.png "${PN}".png - make_desktop_entry meshlab "Meshlab" "${PN}" Graphics -} diff --git a/media-gfx/scrot/Manifest b/media-gfx/scrot/Manifest index 0aaccb32ac24..ad57bb577088 100644 --- a/media-gfx/scrot/Manifest +++ b/media-gfx/scrot/Manifest @@ -1,5 +1,4 @@ AUX scrot-1.2.bash-completion 1990 BLAKE2B 6c99578185f7d69581854372344088398279af8227fccccff07dcb590ae1a90d6ef9122ba3cf02b0db634fe68554818e63d1cfa54bae0fb1ccb65cf0f84769b4 SHA512 76880911e6799894d68aae78313a114fc18c6bf2f0411a0fdce3f30d33c8ff266290aed9570a546c3a05a71503a130c5cbe2cb6e0f92c240edbc8e9f19362db4 -AUX scrot-9999-Xcursor.patch 594 BLAKE2B 6687cb0cb3640dabf7fa949639c908be2375a191a18872ed300a0524ec00b8a24e049583e367b470615025ba794ea0e1caef2b41e41959cf870211a0b15be1f6 SHA512 afcb6ffef4239c9a21d7e104efaa318261ee2600596c1762472078b41bd713dc1111428904fcb7329fde84f535d99eb334a169a5cd502bf85a7a514d2f291955 AUX scrot.bash-completion 1063 BLAKE2B ab03add49bb68db845d1cb599e62dfd4070a8110b5bbf03584fec395a3b0c60262bf3f4fc0ddc1a35c17996a8986107ae3bad053a8974da7c456bdfe7410b424 SHA512 ce8df63bb5b10dbf19f465f2629ebe7045d84105f3da70a49f2bde6a0a416a8f14a02ba3e7d3a8aeba144a592b45a770929b56f6ae7ac867222213ac8f923a0f DIST scrot-1.2.tar.gz 36839 BLAKE2B 26ca05fb3c8fa9069ad87bdd5cc93791994e44e2f5cd7a4b729a6c9e3035c349049500b9627fd31532c280465f77f839370d095f1b0f2ccc10649b3e6fa01edb SHA512 b89e7a94e6317fdb7bd260190c6d68a2dfefc08691b4574337afdfff84f55b8b9c955a6ac60642ae9749c1deaa16bee7b855fbd15833a95f602536693daf8c37 DIST scrot-1.3.tar.gz 141726 BLAKE2B 1972edfa3b61c95fd786d0b4db13633778293b2c671c395939ea0b77d49714e644abd60cfae5656f03fd1c701185d2c8961c45d62989e882f2cd8f4a824dee57 SHA512 45828824701c7574676d0746d01f3dc8313ea91a272fa169b616765442e8842b67d8aa73f47009a66d34dd6b89a230fd9fb42bc598e88baae70fc45345c13a4c @@ -8,5 +7,5 @@ DIST scrot_0.8.orig.tar.gz 74324 BLAKE2B 56facc81c29f101279ffc6d5d323a0cecd32b1f EBUILD scrot-0.8_p13-r1.ebuild 975 BLAKE2B 4f0920e23cada110c426fcd1ef874379f8ae3d9ed272dc5fd8a8cc4ffa0253066ee1f26428cad4d771bc5875fc205daea8d3e5fa381a204e5d13edcec2bab881 SHA512 b26b4f5aaa5a522a602404197697b17cd04d53d23229c7d1078e851400019c2fc506b96ba72b6aa36c9fe084711c67b9a57f4b75113e0b3ebb64289fd03fbf75 EBUILD scrot-1.2.ebuild 920 BLAKE2B b00fcbdf7665347b42716ce8ab78b8f6965f90b4b1f1a88acd2fffacd2978145208965afd206012c837ab22126ba7e78990b8760c5a58cccef373d2715991918 SHA512 341f2fbb5f4824b38d4c42e18929173cad358faf4b9b475d0c735ddc1a681962019c3a8a35892c5120afc42895ac1ac654c1faeb7a7fee5010725a61251bc7cd EBUILD scrot-1.3-r1.ebuild 971 BLAKE2B f4daabaf37c8e2d6ea724d1b96f12928b4f5ece6301a0fa44dcffbbfdf00d4b213f56b5b066116b64eb45bb78100c9b9fd2fb451e2e8d9da664b9624c7f67c63 SHA512 552252c5ca01774197b34dd862a458399004f5be2f78b5d889176c0ebf072b05b08cfa842953205dc64da4ed3d4d011f81fb964a071992ea5b772c0ae69fcacd -EBUILD scrot-9999.ebuild 948 BLAKE2B 2a136ad3c3791d8d7a189f0becd731cdb87737f0574897813dd12084d8567b71a80a31c07a5d21b178327a6e283c065eac715d4dab0132600649ee0fd095756d SHA512 2bef97380ce7621fca3fc0af655baf3e47df4f4b73674d26000c4636cbc95f090bb0f4dbb655cba6ba88711282f8784100c1738fff9445adfc68217aee955087 +EBUILD scrot-9999.ebuild 896 BLAKE2B 73a81a5b80390880d211ec0b6d4150ac65061c9659b661ec5ddceb330f04fcc9fc5cd510daea33d98d61531352641edef5f2d6af112773913cd170e12dd8d85c SHA512 51e6a4b44b612c5e4f5377a9508cc218856ed761e69342ccd3fd94917f71bfcfea8d36ee65188c1b4f7c9eccd2f1364dee7e8919689aae002fa48ad1c6757946 MISC metadata.xml 211 BLAKE2B 3e8296d37e4cf92be5d17d7f263807fad2fc9685607894f9f269f3123987c3baeff7fce17f80480419fb68f2eac48919541cd7aaa21de659d95dd647e05ade48 SHA512 58d7fc7dd62d18c69c3b30062d76c291bc795b7a53804d1380fc49ed6f6a4389805c327633297b9c56c40cbae9a6e5608e12d8a64c01e370954e551246c4b486 diff --git a/media-gfx/scrot/files/scrot-9999-Xcursor.patch b/media-gfx/scrot/files/scrot-9999-Xcursor.patch deleted file mode 100644 index dbb935219b35..000000000000 --- a/media-gfx/scrot/files/scrot-9999-Xcursor.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -34,4 +34,4 @@ - bin_PROGRAMS = scrot - scrot_SOURCES = main.c getopt.c getopt1.c getopt.h scrot.h \ - options.c options.h debug.h imlib.c structs.h note.c note.h --scrot_LDADD = -lX11 -lXfixes -lXcursor -lXcomposite @GIBLIB_LIBS@ -+scrot_LDADD = -lX11 -lXfixes -lXcomposite @GIBLIB_LIBS@ ---- a/src/scrot.h -+++ b/src/scrot.h -@@ -40,7 +40,6 @@ - #include <X11/cursorfont.h> - #include <X11/extensions/Xfixes.h> - #include <X11/extensions/Xcomposite.h> --#include <X11/Xcursor/Xcursor.h> - - #include <stdio.h> - #include <string.h> diff --git a/media-gfx/scrot/scrot-9999.ebuild b/media-gfx/scrot/scrot-9999.ebuild index 82d865e83c56..3bf57b1445bc 100644 --- a/media-gfx/scrot/scrot-9999.ebuild +++ b/media-gfx/scrot/scrot-9999.ebuild @@ -31,9 +31,6 @@ DEPEND=" DOCS=( AUTHORS ChangeLog CONTRIBUTING.md README.md TODO ) -PATCHES=( - "${FILESDIR}"/${PN}-9999-Xcursor.patch -) src_prepare() { sed -i -e 's#-g -O3##g' src/Makefile.am || die diff --git a/media-gfx/shotwell/Manifest b/media-gfx/shotwell/Manifest index 8f7a3a62d20d..9a03a075dbca 100644 --- a/media-gfx/shotwell/Manifest +++ b/media-gfx/shotwell/Manifest @@ -1,5 +1,5 @@ DIST shotwell-0.30.8.tar.xz 6460512 BLAKE2B aecdfa8d90bcce19c38a55872671f6521d8808fa46decba4e9910392f9f8907dd99aaecc825f4e3f6ae747ab151bf5bfa3a807364d571db0fc2ddcaad9a492f5 SHA512 dccd496a083145283c79250329f88fdfe526a98ce84b6d1c52a9c48c9e52a4749bdf2449f3102474c994ef1e687e06767b9bcda03ea97d1168d3417743a6e866 DIST shotwell-0.30.9.tar.xz 6465508 BLAKE2B 9b302d156b350d5cfa961afaa5d75e71db8b34a65a27de0d3b298841ca9be96d502dc98c85c681ca336965fce72db8034609f3f9c6c04fea1127db6c397e6499 SHA512 a232d717356d7e9f0a6b1ad825f4182dd9f6ee4cca9745717e3bd18ded03cdaba94c32256d055389ce2b0cda0c5828b25d1448c10598a474dc3ea0817fc303ee EBUILD shotwell-0.30.8-r1.ebuild 1783 BLAKE2B ea068d6335d7b5d4af0fef2bb571275f0218d384fb118706a948e79177814d6062cb2990ecb43fcf62352986d9f8fae0d02c0318c3481b1277d24524573f90d6 SHA512 c90464d3bd7749d57b3a36aa6352cea07ac47a487c0e7317d1717fb53cfc183dbcb438a22f0314b73d43a31b9555f08acad4eb27d73046d030ef6f3e041d6be4 -EBUILD shotwell-0.30.9.ebuild 1781 BLAKE2B 32ec5d04a0b5050020cbe21753e780d67ae4ab47bd328d5b22136bd5c7215de6fc37b08e1b3f73508526b81d823ef40b699412048e34be11f7c6f041b00462f9 SHA512 210eeeac54dd43f26b7129f7d6ada56ffa823d526181823cb7729e8ff33101c22385588eb9a99ebb0c0fbb6003d4721683df9bfa8447e37ad7702ecfbe92bac5 +EBUILD shotwell-0.30.9.ebuild 1780 BLAKE2B 0673a1e1f01d8ff263cbe0c2e50b4c820ae0819a5ec1ae7d50f3ea80e278204ef3ebb123bfa810a29ef008d57d3e999882ae14ae08b41dbc18367078a2b55572 SHA512 123bed26e43830c4377bfd644a387a8b749967def9b19344eceeb41d658ddf3585190c42145cd644724d269063a782f9d89371339768dfaa722ff29800410067 MISC metadata.xml 795 BLAKE2B 4b5da2cc205b128a0cb9d10a50c3743b8d12302d266e37d5e0479915824af75af8c22b7b12ffca57146aa0a999e2bff3d7c4969af9e19f317a70b9195b02333f SHA512 d3ceceeed90fd4cadd5e212d047b3d6f7882860d145cb80521a4db8e9baaf461910ff70cb5bb2c1cda991939bf2c8917bb7f252bf68c7487d40271b0419c6322 diff --git a/media-gfx/shotwell/shotwell-0.30.9.ebuild b/media-gfx/shotwell/shotwell-0.30.9.ebuild index e79822b715c4..13b00763e4b1 100644 --- a/media-gfx/shotwell/shotwell-0.30.9.ebuild +++ b/media-gfx/shotwell/shotwell-0.30.9.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86" IUSE="opencv udev" DEPEND=" diff --git a/media-gfx/simple-scan/Manifest b/media-gfx/simple-scan/Manifest index c1651a3bbec7..fdf76ea28d83 100644 --- a/media-gfx/simple-scan/Manifest +++ b/media-gfx/simple-scan/Manifest @@ -2,5 +2,5 @@ AUX 3.26-add-control-optional-deps.patch 2773 BLAKE2B e6c3faa98ecda13c926752defe DIST simple-scan-3.34.4.tar.xz 795228 BLAKE2B b6f185bfbc1954ae2573fd1dcfa54f67e26290654c1019bfd34c229235e27cfc1eb40de0e6d5249f97b73c57745e1133fbd6fd1c3f9bdedb795b61068d5ed25d SHA512 b16b653e0a8ce399ecbdb88c4663d7780793518809eb73681c9c6281b9cde784167090c41720b21c184b9fdece28b07ba61fe8a97f10d792cc7326a458741ba4 DIST simple-scan-3.34.6.tar.xz 801064 BLAKE2B 94c6bc386c2d7701bd13067e384eb294ce145d2e02d66e366e76a2c85fb5e3ac4e9bae0efa37fe13d3fc857b57c1730bf01961f7968d6744a4ea4dc47308cb23 SHA512 7b2d0eab13f08d4110d2143c4572e249297891e3868e6eb178a7a765b2d56960820931fbda538ede318014c578871657aa0e27518d184f861efc18ad4fdd900c EBUILD simple-scan-3.34.4.ebuild 1322 BLAKE2B b6359d130e933254fa3e5350ebb2ac562d4682f5c1af219f07321202e3deab61adf6dc9cd34e1dbbc3a04b0211ed091273e494692fadceca6a52bfebd1383c04 SHA512 16e305af51c31b4f775de7b4afe58cbe7ca51622dfa073c890a3e179b83a5f5853d333042aad26a738fbb19253621cc347e7b8a0984717fa2d04629443a9d219 -EBUILD simple-scan-3.34.6.ebuild 1328 BLAKE2B dc23bc08fb3b54ca3493340fc40a10482f496d23e5311320369c9c5cf69268b0e037190fd6b853beddb5a3edc171b50093da9f14347e0cdc437292bbb9d8618a SHA512 1df4ff44d691a37f51ea67782cdd23594aaaa0aa5bf294c793652817d5ebea3115a15900ff0c5a83ee31011db19aa7a52421119b9a43ebe09c047046d73ba4b8 +EBUILD simple-scan-3.34.6.ebuild 1327 BLAKE2B 9fc4b9c2f9d3536f3bd43c6902576f8241555a98ce6a0789572ec3169f783053e5a30462021221a324547ff5e8e19d51fd0bfe63c31875173b5e612fb3c7d192 SHA512 99364ee3c39e21e47bdb790780f48c74b2132a9f2c658f7a6dd87a2c634981372c0499e72b4f6aee28b90d3ffe2901b3381e8252d6d86413ddeb3079be9b0ee7 MISC metadata.xml 616 BLAKE2B 576d986402f8cc708eae60f661640808751747c764d5fe729dd014f33758e0b484a2b80a214d9a3d1ed4bce7e455e34803a62048240e5de8e203184446cdc0df SHA512 6377cb9c20b1ce2db22ba959d386e4389939b72503d87da956d659144b8a6f8b521abdd19dd4c82ac0cb32e260ce6633b75136a353f63b86593f5e1f12394d47 diff --git a/media-gfx/simple-scan/simple-scan-3.34.6.ebuild b/media-gfx/simple-scan/simple-scan-3.34.6.ebuild index 7735d1a8248f..a519c8b9e1ba 100644 --- a/media-gfx/simple-scan/simple-scan-3.34.6.ebuild +++ b/media-gfx/simple-scan/simple-scan-3.34.6.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/simple-scan" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 x86" +KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86" IUSE="colord webp" DEPEND=" diff --git a/media-gfx/uniconvertor/Manifest b/media-gfx/uniconvertor/Manifest index 34af9e1076ea..43d09d21e94e 100644 --- a/media-gfx/uniconvertor/Manifest +++ b/media-gfx/uniconvertor/Manifest @@ -4,6 +4,5 @@ AUX uniconvertor-2.0_pre379-import.patch 935 BLAKE2B 5c201dbcac46f297cc2bcb243ee AUX uniconvertor-2.0_pre379-libimg.patch 1201 BLAKE2B d25aa6bb28c6328ade007da10207317a6bcfe5c8c38eefa7d440ad6cc473c973fd41e923367d8b125f6d3fbdbac9df54993d398c040942e00b2730dd9c753fc2 SHA512 ff373151caf0c10e9a833ab68cf153d024706293c8000af248cb11a12582216c20f79e0998bdaabce0cc47d3248f786aa55ce9ba8814b1f4bb33e07670dd3136 AUX uniconvertor-2.0_pre379-test.patch 1544 BLAKE2B 16e8b1ddd6d0ca064a2f1be12ac97bf75dccd3d73fffb252253154779d0175ac292a08f4bb38deeb815a5e6cf624a9ff80654627e46d02655c315fd7b2a640ce SHA512 760ea5ced19040d0d29230f9d6fdafafd7f6fcdd727e18261730b7696d0e9a85037cdceab8e20f202a79bd7b8c84edfa7f21619bfde1320bbdc1e1d0c6d298db DIST uniconvertor-2.0_pre379.tar.xz 1844780 BLAKE2B 51698d88941be700dd31e5527a8ffc8b2548d9f1323242e8f31a3ad00f2e4a2c5617be87443b130d664aeceea8b96ff17b72dfe32964854cc8f121351a918ec3 SHA512 3a0dd8e52addb391225ae148a673e3464a04e0d36e5955e496ef78e91597408706e5cbc06113b3e959446c6dd89aefa821f32ef81a5d1837a2a3d405a5a63dea -EBUILD uniconvertor-2.0_pre379-r1.ebuild 1519 BLAKE2B 7b6256848790e4009ee8c63e76d7c859ada926ad5dd465f3a69495eed9dd24e53d80e9807358a656b626116372087eefbad542f8f011ae93ea4a002ead01e719 SHA512 ab5671f8724ed3b1a09d616ac4bf1f58e4cfd29c72717565b4967fc26fac8b5ff2edc0a72efaaa38e2c1a6d13cceb47fa105061093e0702d5db4dfebcce164f1 EBUILD uniconvertor-2.0_pre379-r2.ebuild 1842 BLAKE2B c90a6f269ad8891c05ff22016b2d1d95316fec86c16e06200679597b804745d4fb18b202196ad5444a40e51d8701a98c33626a532ec88263c2580369e6af2db2 SHA512 65198e23b0f6c3dcd047dd9541d700cfab5104e977679249a80a72feb3042ab213b812f5100587df1283d9833e8252a4dc86da925af9c960d02ec622bbac2bf7 MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274 diff --git a/media-gfx/uniconvertor/uniconvertor-2.0_pre379-r1.ebuild b/media-gfx/uniconvertor/uniconvertor-2.0_pre379-r1.ebuild deleted file mode 100644 index 70eb7af38ee0..000000000000 --- a/media-gfx/uniconvertor/uniconvertor-2.0_pre379-r1.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) - -inherit distutils-r1 xdg-utils - -DESCRIPTION="Convert vector graphic file formats like .cdr, .svg, wmf and more." -HOMEPAGE="https://sk1project.net/modules.php?name=Products&product=uniconvertor" -SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz" - -KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris" -SLOT="0" -LICENSE="GPL-2 LGPL-2" -IUSE="" - -RDEPEND=" - dev-python/pycairo[${PYTHON_USEDEP}] - media-gfx/imagemagick:= - media-libs/lcms:2 - dev-python/pillow[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - virtual/pkgconfig - app-text/ghostscript-gpl" - -PATCHES=( - "${FILESDIR}"/${P}-import.patch - "${FILESDIR}"/${P}-libimg.patch - "${FILESDIR}"/${P}-test.patch - ) - -python_prepare_all() { - local wand - wand=$(pkg-config --libs MagickWand | sed -e "s:^ *::g" -e "s: *$::g" -e "s:-l:\':g" -e "s: :',:g" -e "s:$:':g" -e "s:,'$::g") - - distutils-r1_python_prepare_all - - sed \ - -e "/libraries/s:'MagickWand':${wand}:g" \ - -i setup.py || die - - ln -sf \ - "${EPREFIX}"/usr/share/imagemagick/sRGB.icm \ - src/unittests/cms_tests/cms_data/sRGB.icm || die -} - -python_test() { - einfo ${PYTHONPATH} - #distutils_install_for_testing - cd src/unittests || die - ${EPYTHON} all_tests.py || die -} - -pkg_postinst() { - xdg_mimeinfo_database_update - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_mimeinfo_database_update - xdg_desktop_database_update -} diff --git a/media-gfx/valentina/Manifest b/media-gfx/valentina/Manifest index 9068aa1615b2..3d06dd391d3d 100644 --- a/media-gfx/valentina/Manifest +++ b/media-gfx/valentina/Manifest @@ -1,6 +1,6 @@ AUX 5823.patch 1870 BLAKE2B 1a4edc390abd09010fb946035dab6f4ee9223eaa286f9843404db4f95d94e60da73dbf515c99aa857acdcb7d26bca3117fcdfdf2b9514ad45c2e795ab579cc46 SHA512 0cf9d1691816b165ab691cd34807f7c82eea685b5af2d9c483a9427987ae565f44e31bffcec9c3ede6102aa800d3988b054a178ec74f1826be1a88fd9f5ec28c DIST valentina-0.6.1.zip 38326440 BLAKE2B 33d9163058b890254120bb0849972941f36526c71ed0acd8df82867a0116a35be4818c31c3ebb8a7322cf53bca4f9e77b2de10ea0df51c46b764f8f9e7abb8d2 SHA512 6511194c734a1b6cd8a1ed489213c288e90bd653dbd8373c4ee13be78e2ae4fe00a35e19a5ee074e868319ab1a13eb8baea35dedb7242b3888d03aa4b4dc69ce DIST valentina-5858.patch.bz2 4507 BLAKE2B 10bf1e48b9c822b5fecd040edea05a9fa16bc84d6d8a872a50329bd6b61ae250b489fbf71b19f0453ab5caea0bd7dc821d8c6fbe0fc24a6306d57ce5b34350f9 SHA512 037d2a5305d85d7d6be90c181ee6c39110a86c5f5d77c22453a2933e7d6a43c600f6ffb393015e98f9aab55b0d11291dca482352e1fc74f485578b65b3b84720 -EBUILD valentina-0.6.1-r1.ebuild 2136 BLAKE2B b5e29fd5988c8a0187cef2a6df84bb2d82cd59ba6b375bc4e57bcb8dd0ee9f5665a634e845f56320009799326bb0628d27fcf74229f640db5a0ebfdfa7ad3dd1 SHA512 a132e6373561efd9e8c93d59182e8be01c335b5e150203b2eaab806b274e001416a425c1652fd2a768b117e1acbccedd3a54952254178e8d2977cecd642948ac -EBUILD valentina-9999.ebuild 1922 BLAKE2B 57a28e28e6ab7cefccc216d03365bc4b41dadaea31bdcdc3a198b8122aef3848d209e68219dec0f806303e27027675eff522be11b6d4716d822efe70ee5d1e6f SHA512 b89d500a486d5d9109806fd38bc6a38eb02036b6ff4c4e69cba30b0df6f5a7516d9f2a0187bf77d48f5ff0b3a99327b6c65c25b0575b34502a4695c00c111053 +EBUILD valentina-0.6.1-r1.ebuild 2153 BLAKE2B c6c14a02af78cb73c6c36690646ae1da71cd6ef832884009d9fec074813203b9a5ba96feddc63cdc8df0b3bd178b3932f068c6989e57bc7d497afd5d3fc14af6 SHA512 6bc3da7de6f6275eec8f633ac622e8f8d3c84cff59995690035c4c4c9e9f696517b5459eac530a4901d45b66c13f824bfd3cc7de746b1e576927b4e5478942a3 +EBUILD valentina-9999.ebuild 1939 BLAKE2B 416f90138e80d3f60fc429b001501b986e0033b2e31e7b7de12cce26ebd63d25b4a18b78c67d624a7a8831558f35a704d1a971720cf9c153347ddc6d268e47c7 SHA512 f5beb0b8e592ce55dae34ab3f0980e4fd4169879fe12b093d08317247ddb53755399c931858e64be39c8da13b5748665bbc1536446ea408d83f9b71ecf10c636 MISC metadata.xml 334 BLAKE2B 7f146a505a30d4461165308b40383e2b78998411874c8af6113c3040142003868f397872ecd22b9b8f3ec6193c532fa934c8646ee04e8c49157464b58035de09 SHA512 d1264aa0d26ba75466c5572c37ca6fd384d4e6db392aca0e47d4b1d0bd3ef7e035fed51c460af1bb258c500d1cc9211ec2e85db3e3aa158d378fb1389a3ebf03 diff --git a/media-gfx/valentina/valentina-0.6.1-r1.ebuild b/media-gfx/valentina/valentina-0.6.1-r1.ebuild index ef3be1080d91..3649628d9225 100644 --- a/media-gfx/valentina/valentina-0.6.1-r1.ebuild +++ b/media-gfx/valentina/valentina-0.6.1-r1.ebuild @@ -28,6 +28,7 @@ CDEPEND=" dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] + dev-qt/qtopengl dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 diff --git a/media-gfx/valentina/valentina-9999.ebuild b/media-gfx/valentina/valentina-9999.ebuild index bd9274174887..16d93280dd62 100644 --- a/media-gfx/valentina/valentina-9999.ebuild +++ b/media-gfx/valentina/valentina-9999.ebuild @@ -28,6 +28,7 @@ CDEPEND=" dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] + dev-qt/qtopengl dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 |