commit: 345a48ea7c81b50f16cd224d34efbda35211c92a
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 20 10:50:15 2021 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Jan 20 10:50:15 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=345a48ea
app-office/dia: Fixed build with sys-devel/slibtool
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
app-office/dia/dia-0.97.3-r1.ebuild | 4 ++--
app-office/dia/files/dia-0.97.3-slibtool.patch | 13 +++++++++++++
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/app-office/dia/dia-0.97.3-r1.ebuild
b/app-office/dia/dia-0.97.3-r1.ebuild
index fc0207a5f05..156200bf149 100644
--- a/app-office/dia/dia-0.97.3-r1.ebuild
+++ b/app-office/dia/dia-0.97.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -45,6 +45,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-0.97.0-gnome-doc.patch #159381 , upstream #470812
#558690
"${FILESDIR}"/${PN}-0.97.2-underlinking.patch #420685, upstream #678761
"${FILESDIR}"/${PN}-0.97.3-freetype_pkgconfig.patch #654814, upstream
https://gitlab.gnome.org/GNOME/dia/merge_requests/1
+ "${FILESDIR}"/${PN}-0.97.3-slibtool.patch
)
src_prepare() {
@@ -62,7 +63,6 @@ src_prepare() {
# Upstream bug #737255
sed -i -e "/localedir/d" configure.in || die
- eautoreconf
gnome2_src_prepare
}
diff --git a/app-office/dia/files/dia-0.97.3-slibtool.patch
b/app-office/dia/files/dia-0.97.3-slibtool.patch
new file mode 100644
index 00000000000..1efdbc1490b
--- /dev/null
+++ b/app-office/dia/files/dia-0.97.3-slibtool.patch
@@ -0,0 +1,13 @@
+This fixes build with sys-devel/slibtool
+
+--- a/lib/Makefile.am
++++ b/lib/Makefile.am
+@@ -178,7 +178,7 @@ libdia_la_SOURCES = \
+ # render.h \
+ # render.c
+
+-libdia_la_LDFLAGS = -avoid-version --export-dynamic
++libdia_la_LDFLAGS = -avoid-version -export-dynamic
+ libdia_la_LIBADD = $(GTK_LIBS)
+
+ AM_CPPFLAGS = \
