| 1 |
commit: ef6415751e610f63bdcbc60b133a84376d877785 |
| 2 |
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Apr 25 13:23:21 2020 +0000 |
| 4 |
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Apr 25 13:23:50 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef641575 |
| 7 |
|
| 8 |
media-gfx/inkscape: Fix build against glibmm-2.62, bug 715394 |
| 9 |
|
| 10 |
Patch by Matt Whitlock |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/715394 |
| 13 |
Package-Manager: Portage-2.3.89, Repoman-2.3.20 |
| 14 |
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> |
| 15 |
|
| 16 |
media-gfx/inkscape/files/inkscape-0.92.4-glibmm-2.62.patch | 14 ++++++++++++++ |
| 17 |
media-gfx/inkscape/inkscape-0.92.4-r2.ebuild | 1 + |
| 18 |
media-gfx/inkscape/inkscape-0.92.4-r3.ebuild | 1 + |
| 19 |
3 files changed, 16 insertions(+) |
| 20 |
|
| 21 |
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 |
| 22 |
new file mode 100644 |
| 23 |
index 00000000000..7a35d8d55ad |
| 24 |
--- /dev/null |
| 25 |
+++ b/media-gfx/inkscape/files/inkscape-0.92.4-glibmm-2.62.patch |
| 26 |
@@ -0,0 +1,14 @@ |
| 27 |
+diff -Naur a/configure.ac b/configure.ac |
| 28 |
+--- a/configure.ac 2019-01-15 04:29:27.000000000 +0000 |
| 29 |
++++ b/configure.ac 2020-04-03 18:39:26.372870987 +0000 |
| 30 |
+@@ -879,10 +879,6 @@ |
| 31 |
+ if test "x$enable_strict_build" != "xno"; then |
| 32 |
+ CPPFLAGS="-DGDKMM_DISABLE_DEPRECATED $CPPFLAGS" |
| 33 |
+ |
| 34 |
+- # Ensure that no deprecated glibmm symbols are introduced. |
| 35 |
+- # lp:inkscape builds cleanly with this option at r10957 |
| 36 |
+- CPPFLAGS="-DGLIBMM_DISABLE_DEPRECATED $CPPFLAGS" |
| 37 |
+- |
| 38 |
+ dnl Pango 1.32.4 uses a deprecated Glib symbol: |
| 39 |
+ dnl https://bugzilla.gnome.org/show_bug.cgi?id=689843 |
| 40 |
+ dnl |
| 41 |
|
| 42 |
diff --git a/media-gfx/inkscape/inkscape-0.92.4-r2.ebuild b/media-gfx/inkscape/inkscape-0.92.4-r2.ebuild |
| 43 |
index bc73e6c6f57..f6599b277d7 100644 |
| 44 |
--- a/media-gfx/inkscape/inkscape-0.92.4-r2.ebuild |
| 45 |
+++ b/media-gfx/inkscape/inkscape-0.92.4-r2.ebuild |
| 46 |
@@ -103,6 +103,7 @@ PATCHES=( |
| 47 |
"${FILESDIR}/${PN}-0.92.4-poppler-0.76.0.patch" #684246 |
| 48 |
"${FILESDIR}/${PN}-0.92.4-poppler-0.82.0.patch" |
| 49 |
"${FILESDIR}/${PN}-0.92.4-poppler-0.83.0.patch" |
| 50 |
+ "${FILESDIR}/${PN}-0.92.4-glibmm-2.62.patch" #715394 |
| 51 |
) |
| 52 |
|
| 53 |
S="${WORKDIR}/${MY_P}" |
| 54 |
|
| 55 |
diff --git a/media-gfx/inkscape/inkscape-0.92.4-r3.ebuild b/media-gfx/inkscape/inkscape-0.92.4-r3.ebuild |
| 56 |
index 912e7bba247..223078d3cfa 100644 |
| 57 |
--- a/media-gfx/inkscape/inkscape-0.92.4-r3.ebuild |
| 58 |
+++ b/media-gfx/inkscape/inkscape-0.92.4-r3.ebuild |
| 59 |
@@ -103,6 +103,7 @@ PATCHES=( |
| 60 |
"${FILESDIR}/${PN}-0.92.4-poppler-0.76.0.patch" #684246 |
| 61 |
"${FILESDIR}/${PN}-0.92.4-poppler-0.82.0.patch" |
| 62 |
"${FILESDIR}/${PN}-0.92.4-poppler-0.83.0.patch" |
| 63 |
+ "${FILESDIR}/${PN}-0.92.4-glibmm-2.62.patch" #715394 |
| 64 |
) |
| 65 |
|
| 66 |
S="${WORKDIR}/${MY_P}" |
Archives