commit: 767edb76006523baca227ff79909323ec202583d
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 2 23:52:55 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Sep 3 01:38:44 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=767edb76
media-gfx/inkscape: update Poppler 22.09.0 patch
Switch to revision sent upstream.
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-gfx/inkscape/files/inkscape-1.2.1-poppler-22.09.0.patch | 2 +-
.../inkscape/{inkscape-1.2.1.ebuild => inkscape-1.2.1-r1.ebuild} | 4 ----
.../inkscape/{inkscape-1.2.1.ebuild => inkscape-1.2.1-r2.ebuild} | 0
3 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/media-gfx/inkscape/files/inkscape-1.2.1-poppler-22.09.0.patch
b/media-gfx/inkscape/files/inkscape-1.2.1-poppler-22.09.0.patch
index 87583019d6e3..80d071d51b0b 100644
--- a/media-gfx/inkscape/files/inkscape-1.2.1-poppler-22.09.0.patch
+++ b/media-gfx/inkscape/files/inkscape-1.2.1-poppler-22.09.0.patch
@@ -43,7 +43,7 @@ Signed-off-by: Sam James <s...@gentoo.org>
}
}
+#if POPPLER_CHECK_VERSION(22, 9, 0)
-+ state->setLineDash(std::vector<double> (*dash, length), args[1].getNum());
++ state->setLineDash(std::vector<double> (dash, dash + length),
args[1].getNum());
+#else
state->setLineDash(dash, length, args[1].getNum());
+#endif
diff --git a/media-gfx/inkscape/inkscape-1.2.1.ebuild
b/media-gfx/inkscape/inkscape-1.2.1-r1.ebuild
similarity index 98%
copy from media-gfx/inkscape/inkscape-1.2.1.ebuild
copy to media-gfx/inkscape/inkscape-1.2.1-r1.ebuild
index a0df591ee0d9..e2183428d93b 100644
--- a/media-gfx/inkscape/inkscape-1.2.1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.2.1-r1.ebuild
@@ -108,10 +108,6 @@ RESTRICT="!test? ( test )"
S="${WORKDIR}/${MY_P}"
-PATCHES=(
- "${FILESDIR}"/${PN}-1.2.1-poppler-22.09.0.patch
-)
-
pkg_pretend() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
}
diff --git a/media-gfx/inkscape/inkscape-1.2.1.ebuild
b/media-gfx/inkscape/inkscape-1.2.1-r2.ebuild
similarity index 100%
rename from media-gfx/inkscape/inkscape-1.2.1.ebuild
rename to media-gfx/inkscape/inkscape-1.2.1-r2.ebuild
