From: "Lars Wendler" <polynomial-c@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/dia/files/, app-office/dia/
Date: Wed, 20 Jan 2021 10:50:28 +0000 (UTC) [thread overview]
Message-ID: <1611139815.345a48ea7c81b50f16cd224d34efbda35211c92a.polynomial-c@gentoo> (raw)
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 = \
next reply other threads:[~2021-01-20 10:50 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-20 10:50 Lars Wendler [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-10-04 1:23 [gentoo-commits] repo/gentoo:master commit in: app-office/dia/files/, app-office/dia/ Sam James
2025-10-04 1:23 Sam James
2020-04-30 15:10 Andreas Sturmlechner
2018-07-02 9:48 Lars Wendler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1611139815.345a48ea7c81b50f16cd224d34efbda35211c92a.polynomial-c@gentoo \
--to=polynomial-c@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox