From ef6415751e610f63bdcbc60b133a84376d877785 Mon Sep 17 00:00:00 2001 From: "Andreas K. Hüttel" Date: Sat, 25 Apr 2020 16:23:21 +0300 Subject: media-gfx/inkscape: Fix build against glibmm-2.62, bug 715394 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Patch by Matt Whitlock Closes: https://bugs.gentoo.org/715394 Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Andreas K. Hüttel --- media-gfx/inkscape/files/inkscape-0.92.4-glibmm-2.62.patch | 14 ++++++++++++++ media-gfx/inkscape/inkscape-0.92.4-r2.ebuild | 1 + media-gfx/inkscape/inkscape-0.92.4-r3.ebuild | 1 + 3 files changed, 16 insertions(+) create mode 100644 media-gfx/inkscape/files/inkscape-0.92.4-glibmm-2.62.patch (limited to 'media-gfx/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 new file mode 100644 index 000000000000..7a35d8d55ada --- /dev/null +++ b/media-gfx/inkscape/files/inkscape-0.92.4-glibmm-2.62.patch @@ -0,0 +1,14 @@ +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/inkscape-0.92.4-r2.ebuild b/media-gfx/inkscape/inkscape-0.92.4-r2.ebuild index bc73e6c6f57d..f6599b277d79 100644 --- a/media-gfx/inkscape/inkscape-0.92.4-r2.ebuild +++ b/media-gfx/inkscape/inkscape-0.92.4-r2.ebuild @@ -103,6 +103,7 @@ PATCHES=( "${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}" diff --git a/media-gfx/inkscape/inkscape-0.92.4-r3.ebuild b/media-gfx/inkscape/inkscape-0.92.4-r3.ebuild index 912e7bba247d..223078d3cfaa 100644 --- a/media-gfx/inkscape/inkscape-0.92.4-r3.ebuild +++ b/media-gfx/inkscape/inkscape-0.92.4-r3.ebuild @@ -103,6 +103,7 @@ PATCHES=( "${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}" -- cgit v1.2.3-65-gdbad