media-gfx/inkscape: Fix build against glibmm-2.62, bug 715394

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 <dilfridge@gentoo.org>

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 (file)
index 0000000..7a35d8d
--- /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 bc73e6c6f57d29cd4b7aa48479b47d44c3e91ed0..f6599b277d79456b45e554d2309cccfe6b8a0333 100644 (file)
--- 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 912e7bba247daa5455605d6a50f3b071a9e8c800..223078d3cfaaf2070f271bfa98f0c0b74e89d942 100644 (file)
--- 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}"