1 |
commit: 767edb76006523baca227ff79909323ec202583d |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Sep 2 23:52:55 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Sep 3 01:38:44 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=767edb76 |
7 |
|
8 |
media-gfx/inkscape: update Poppler 22.09.0 patch |
9 |
|
10 |
Switch to revision sent upstream. |
11 |
|
12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
13 |
|
14 |
media-gfx/inkscape/files/inkscape-1.2.1-poppler-22.09.0.patch | 2 +- |
15 |
.../inkscape/{inkscape-1.2.1.ebuild => inkscape-1.2.1-r1.ebuild} | 4 ---- |
16 |
.../inkscape/{inkscape-1.2.1.ebuild => inkscape-1.2.1-r2.ebuild} | 0 |
17 |
3 files changed, 1 insertion(+), 5 deletions(-) |
18 |
|
19 |
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 |
20 |
index 87583019d6e3..80d071d51b0b 100644 |
21 |
--- a/media-gfx/inkscape/files/inkscape-1.2.1-poppler-22.09.0.patch |
22 |
+++ b/media-gfx/inkscape/files/inkscape-1.2.1-poppler-22.09.0.patch |
23 |
@@ -43,7 +43,7 @@ Signed-off-by: Sam James <sam@g.o> |
24 |
} |
25 |
} |
26 |
+#if POPPLER_CHECK_VERSION(22, 9, 0) |
27 |
-+ state->setLineDash(std::vector<double> (*dash, length), args[1].getNum()); |
28 |
++ state->setLineDash(std::vector<double> (dash, dash + length), args[1].getNum()); |
29 |
+#else |
30 |
state->setLineDash(dash, length, args[1].getNum()); |
31 |
+#endif |
32 |
|
33 |
diff --git a/media-gfx/inkscape/inkscape-1.2.1.ebuild b/media-gfx/inkscape/inkscape-1.2.1-r1.ebuild |
34 |
similarity index 98% |
35 |
copy from media-gfx/inkscape/inkscape-1.2.1.ebuild |
36 |
copy to media-gfx/inkscape/inkscape-1.2.1-r1.ebuild |
37 |
index a0df591ee0d9..e2183428d93b 100644 |
38 |
--- a/media-gfx/inkscape/inkscape-1.2.1.ebuild |
39 |
+++ b/media-gfx/inkscape/inkscape-1.2.1-r1.ebuild |
40 |
@@ -108,10 +108,6 @@ RESTRICT="!test? ( test )" |
41 |
|
42 |
S="${WORKDIR}/${MY_P}" |
43 |
|
44 |
-PATCHES=( |
45 |
- "${FILESDIR}"/${PN}-1.2.1-poppler-22.09.0.patch |
46 |
-) |
47 |
- |
48 |
pkg_pretend() { |
49 |
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp |
50 |
} |
51 |
|
52 |
diff --git a/media-gfx/inkscape/inkscape-1.2.1.ebuild b/media-gfx/inkscape/inkscape-1.2.1-r2.ebuild |
53 |
similarity index 100% |
54 |
rename from media-gfx/inkscape/inkscape-1.2.1.ebuild |
55 |
rename to media-gfx/inkscape/inkscape-1.2.1-r2.ebuild |