| 1 |
commit: 947065b2b4c6b929a53337e10d3278740a311a3f |
| 2 |
Author: Thomas Bettler <thomas.bettler <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun Dec 26 14:30:56 2021 +0000 |
| 4 |
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jan 22 00:37:14 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=947065b2 |
| 7 |
|
| 8 |
media-gfx/inkscape: bump to 1.1.1 |
| 9 |
|
| 10 |
add python 3.10 to 1.1.1 and live |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/830007 |
| 13 |
Closes: https://github.com/gentoo/gentoo/pull/23529 |
| 14 |
Signed-off-by: Thomas Bettler <thomas.bettler <AT> gmail.com> |
| 15 |
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> |
| 16 |
|
| 17 |
media-gfx/inkscape/Manifest | 1 + |
| 18 |
...{inkscape-9999.ebuild => inkscape-1.1.1.ebuild} | 29 +++++++++------------- |
| 19 |
media-gfx/inkscape/inkscape-9999.ebuild | 2 +- |
| 20 |
3 files changed, 14 insertions(+), 18 deletions(-) |
| 21 |
|
| 22 |
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest |
| 23 |
index 56c86013d34f..40c08b757d57 100644 |
| 24 |
--- a/media-gfx/inkscape/Manifest |
| 25 |
+++ b/media-gfx/inkscape/Manifest |
| 26 |
@@ -1,2 +1,3 @@ |
| 27 |
DIST inkscape-1.1-musl.txz 10820 BLAKE2B 3e7d346161d8c58436cae01227ce0eafc122276ba4b0483271cbb2e74447c7a89b2033bf709adb521abe2aebca79fffece183786071478b29aedbf3c742c4616 SHA512 8900863fb2d12cb6aea39b2e2ac8d32b512086aa3a26f3598d3117abd0b44f95b6001ea21ac02ce2368dd66dee0faefdef049c433f62380904770b7680680668 |
| 28 |
DIST inkscape-1.1.tar.xz 34203156 BLAKE2B 38896509dcdcf1ef18523c790855035ef16dfae75e27c2d69f782270f52a579557edcb790bef30f3210b9f797a619369d7d16dd23f098debdd8e5b6abf9b30aa SHA512 54b75f8794d748ef59d5b719ea04e3debadc1a5cf3f62f14254502567973bbd634850edd0a3bc082be878dacf041e9bd10982c4846bf154f89aa5319eda4ee80 |
| 29 |
+DIST inkscape-1.1.1.tar.xz 34221284 BLAKE2B e628ead14f76fa3de929cfe14a6f085c5e9cd4304d2ee0a4b2046380284aacb8a32ff311c2e104f39f6abd0d080594ec4f9783fcaff183588107eedb49863c82 SHA512 22b1b584a344c4f4ebd0b6e84a4af44e472ef47b3971cb97cbb026a4bf7cb5bea49a7de0c2af2a9e439c7c794f775081c8d1904f33eadb49a5389ea01bc0896c |
| 30 |
|
| 31 |
diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-1.1.1.ebuild |
| 32 |
similarity index 88% |
| 33 |
copy from media-gfx/inkscape/inkscape-9999.ebuild |
| 34 |
copy to media-gfx/inkscape/inkscape-1.1.1.ebuild |
| 35 |
index c77a2bc64410..d9c335c12041 100644 |
| 36 |
--- a/media-gfx/inkscape/inkscape-9999.ebuild |
| 37 |
+++ b/media-gfx/inkscape/inkscape-1.1.1.ebuild |
| 38 |
@@ -3,20 +3,20 @@ |
| 39 |
|
| 40 |
EAPI=7 |
| 41 |
|
| 42 |
-PYTHON_COMPAT=( python3_{8,9} ) |
| 43 |
+PYTHON_COMPAT=( python3_{8..10} ) |
| 44 |
PYTHON_REQ_USE="xml" |
| 45 |
-MY_P="${P/_/}" |
| 46 |
-inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1 git-r3 |
| 47 |
+ |
| 48 |
+inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1 |
| 49 |
|
| 50 |
DESCRIPTION="SVG based generic vector-drawing program" |
| 51 |
HOMEPAGE="https://inkscape.org/" |
| 52 |
-EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git" |
| 53 |
+SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz" |
| 54 |
|
| 55 |
LICENSE="GPL-2 LGPL-2.1" |
| 56 |
SLOT="0" |
| 57 |
-KEYWORDS="" |
| 58 |
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" |
| 59 |
IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg |
| 60 |
-openmp postscript readline spell static-libs svg2 test visio wpg" |
| 61 |
+openmp postscript readline spell static-libs svg2 visio wpg" |
| 62 |
|
| 63 |
REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
| 64 |
|
| 65 |
@@ -91,13 +91,11 @@ RDEPEND="${COMMON_DEPEND} |
| 66 |
dia? ( app-office/dia ) |
| 67 |
postscript? ( app-text/ghostscript-gpl ) |
| 68 |
" |
| 69 |
-DEPEND="${COMMON_DEPEND} |
| 70 |
- test? ( dev-cpp/gtest ) |
| 71 |
-" |
| 72 |
+DEPEND="${COMMON_DEPEND}" |
| 73 |
|
| 74 |
-RESTRICT="!test? ( test )" |
| 75 |
+RESTRICT="test" |
| 76 |
|
| 77 |
-S="${WORKDIR}/${MY_P}" |
| 78 |
+S="${WORKDIR}/${P}_2021-09-20_3bf5ae0d25" |
| 79 |
|
| 80 |
pkg_pretend() { |
| 81 |
if [[ ${MERGE_TYPE} != binary ]] && use openmp; then |
| 82 |
@@ -106,6 +104,8 @@ pkg_pretend() { |
| 83 |
} |
| 84 |
|
| 85 |
src_prepare() { |
| 86 |
+ eapply "${FILESDIR}"/${PN}-1.1-poppler-21.11.0.patch |
| 87 |
+ |
| 88 |
cmake_src_prepare |
| 89 |
sed -i "/install.*COPYING/d" CMakeScripts/ConfigCPack.cmake || die |
| 90 |
} |
| 91 |
@@ -120,7 +120,7 @@ src_configure() { |
| 92 |
-DENABLE_POPPLER=ON |
| 93 |
-DENABLE_POPPLER_CAIRO=ON |
| 94 |
-DWITH_PROFILING=OFF |
| 95 |
- -DBUILD_TESTING=$(usex test) |
| 96 |
+ -DBUILD_TESTING=OFF |
| 97 |
-DWITH_LIBCDR=$(usex cdr) |
| 98 |
-DWITH_DBUS=$(usex dbus) |
| 99 |
-DWITH_IMAGE_MAGICK=$(usex imagemagick $(usex !graphicsmagick)) # requires ImageMagick 6, only IM must be enabled |
| 100 |
@@ -139,10 +139,6 @@ src_configure() { |
| 101 |
cmake_src_configure |
| 102 |
} |
| 103 |
|
| 104 |
-src_test() { |
| 105 |
- cmake_build -j1 check |
| 106 |
-} |
| 107 |
- |
| 108 |
src_install() { |
| 109 |
cmake_src_install |
| 110 |
|
| 111 |
@@ -152,7 +148,6 @@ src_install() { |
| 112 |
|
| 113 |
find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.gz' -exec gzip -d {} \; || die |
| 114 |
|
| 115 |
- # No extensions are present in beta1 |
| 116 |
local extdir="${ED}"/usr/share/${PN}/extensions |
| 117 |
|
| 118 |
if [[ -e "${extdir}" ]] && [[ -n $(find "${extdir}" -mindepth 1) ]]; then |
| 119 |
|
| 120 |
diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild |
| 121 |
index c77a2bc64410..62a44f8decb6 100644 |
| 122 |
--- a/media-gfx/inkscape/inkscape-9999.ebuild |
| 123 |
+++ b/media-gfx/inkscape/inkscape-9999.ebuild |
| 124 |
@@ -3,7 +3,7 @@ |
| 125 |
|
| 126 |
EAPI=7 |
| 127 |
|
| 128 |
-PYTHON_COMPAT=( python3_{8,9} ) |
| 129 |
+PYTHON_COMPAT=( python3_{8..10} ) |
| 130 |
PYTHON_REQ_USE="xml" |
| 131 |
MY_P="${P/_/}" |
| 132 |
inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1 git-r3 |
Archives