* [gentoo-commits] repo/gentoo:master commit in: app-office/dia/files/, app-office/dia/
@ 2018-07-02 9:48 Lars Wendler
0 siblings, 0 replies; 3+ messages in thread
From: Lars Wendler @ 2018-07-02 9:48 UTC (permalink / raw
To: gentoo-commits
commit: b743707ba1ffaaaadfbf44f1bd9ad0accd61334a
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 2 09:48:12 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Jul 2 09:48:12 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b743707b
app-office/dia: Use pkg-config instead of freetype-config
Commit permission kindly granted by leio.
Closes: https://bugs.gentoo.org/654814
Package-Manager: Portage-2.3.41, Repoman-2.3.9
app-office/dia/dia-0.97.3.ebuild | 3 +-
.../dia/files/dia-0.97.3-freetype_pkgconfig.patch | 66 ++++++++++++++++++++++
2 files changed, 68 insertions(+), 1 deletion(-)
diff --git a/app-office/dia/dia-0.97.3.ebuild b/app-office/dia/dia-0.97.3.ebuild
index 844a72f7b20..a8a9ae6b6c0 100644
--- a/app-office/dia/dia-0.97.3.ebuild
+++ b/app-office/dia/dia-0.97.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -54,6 +54,7 @@ src_prepare() {
epatch "${FILESDIR}"/${PN}-0.97.0-gnome-doc.patch #159381 , upstream #470812 #558690
epatch "${FILESDIR}"/${PN}-0.97.2-underlinking.patch #420685, upstream #678761
+ epatch "${FILESDIR}"/${PN}-0.97.3-freetype_pkgconfig.patch #654814, upstream https://gitlab.gnome.org/GNOME/dia/merge_requests/1
if use python; then
python_fix_shebang .
diff --git a/app-office/dia/files/dia-0.97.3-freetype_pkgconfig.patch b/app-office/dia/files/dia-0.97.3-freetype_pkgconfig.patch
new file mode 100644
index 00000000000..c48b5ba66fb
--- /dev/null
+++ b/app-office/dia/files/dia-0.97.3-freetype_pkgconfig.patch
@@ -0,0 +1,66 @@
+--- dia-0.97.3/configure.in
++++ dia-0.97.3/configure.in
+@@ -62,43 +62,26 @@
+
+ AC_ARG_WITH(freetype,
+ [ --without-freetype compile without FreeType support],,with_freetype=yes)
+-if test "x$with_freetype" = "xyes"; then
+-PKG_CHECK_MODULES(PANGOFT2,pangoft2,have_pangoft2=true,have_pangoft2=false)
+-if test "$have_pangoft2" = "true"; then
+- dnl On Solaris with Forte C, at least, need to link app/dia with -lfreetype.
+- dnl It's not enough that -lpangoft2 implicitly pulls it in.
+- have_freetype=false
+- AC_CHECK_LIB(freetype,FT_Init_FreeType,have_freetype=true,have_freetype=false,`freetype-config --libs`)
+- if test "$have_freetype" = "true"; then
+- dnl Need 2.0.9, as a bug was fixed for us there.
+- dnl However, freetype-config doesn't give a meaningful version, so we must
+- dnl do it like this.
+- AC_MSG_CHECKING([if FreeType version is 2.0.9 or higher])
+- old_CPPFLAGS="$CPPFLAGS"
+- CPPFLAGS="$CPPFLAGS `freetype-config --cflags`"
+- AC_TRY_CPP([#include <ft2build.h>
+-#include FT_FREETYPE_H
+-#if (FREETYPE_MAJOR*1000+FREETYPE_MINOR)*1000+FREETYPE_PATCH < 2000009
+-#error Freetype version too low.
+-#endif
+-],
+- [AC_MSG_RESULT(yes)
+- FREETYPE_LIBS=`freetype-config --libs`
+- AC_SUBST(FREETYPE_LIBS)
+- FREETYPE_CFLAGS=`freetype-config --cflags`
+- AC_SUBST(FREETYPE_CFLAGS)
+- GTK_MODULES="$GTK_MODULES pangoft2"
+- AC_DEFINE(HAVE_FREETYPE,1,[Define if you have the FreeType2 library])]
+- ,
+- [AC_MSG_ERROR([Need FreeType library version 2.0.9 or higher])])
+- CPPFLAGS="$old_CPPFLAGS"
+- else
+- AC_MSG_ERROR(Can't find FreeType library)
+- fi
+-else
+- AC_MSG_ERROR(Can't find PangoFT2 library)
+-fi
+-fi
++AS_IF([test "x$with_freetype" = "xyes"],[
++ dnl freetype2.pc uses the libtool specific version number and not the
++ dnl package version. See
++ dnl https://git.savannah.gnu.org/cgit/freetype/freetype2.git/tree/docs/VERSIONS.TXT
++ dnl Let's raise minimum dependency to freetype-2.4.0 because that's the
++ dnl lowest freetype libtool version I could find.
++ dnl freetype-2.4.0 is from July 2010 and should be reasonably old
++ dnl enough.
++ PKG_CHECK_MODULES(FREETYPE, freetype2 >= 11.0.5,
++ [
++ CPPFLAGS="$CPPFLAGS $FREETYPE_CFLAGS"
++ AC_DEFINE(HAVE_FREETYPE,1,[Define if you have the FreeType2 library])
++ ],
++ AC_MSG_ERROR([Need FreeType library version 2.4.0 or higher])
++ )
++ PKG_CHECK_MODULES(PANGOFT2,pangoft2,
++ GTK_MODULES="$GTK_MODULES pangoft2",
++ AC_MSG_ERROR(Can't find PangoFT2 library)
++ )
++])
+ AM_CONDITIONAL(WITH_FREETYPE, test "x$with_freetype" != "xno")
+
+ CFLAGS="$FREETYPE_CFLAGS $CFLAGS"
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/dia/files/, app-office/dia/
@ 2020-04-30 15:10 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2020-04-30 15:10 UTC (permalink / raw
To: gentoo-commits
commit: 5363d5bb44ed7a015c8c06d2dcf7a61d9d82f133
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 30 12:39:19 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Apr 30 15:10:07 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5363d5bb
app-office/dia: EAPI-6 bump
Acked-by: Mart Raudsepp <leio <AT> gentoo.org>
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/dia/dia-0.97.3-r1.ebuild | 19 ++++++++++---------
app-office/dia/files/dia-0.97.2-underlinking.patch | 8 ++++----
2 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/app-office/dia/dia-0.97.3-r1.ebuild b/app-office/dia/dia-0.97.3-r1.ebuild
index f697cd004ba..fc0207a5f05 100644
--- a/app-office/dia/dia-0.97.3-r1.ebuild
+++ b/app-office/dia/dia-0.97.3-r1.ebuild
@@ -1,11 +1,10 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-GCONF_DEBUG=yes
-GNOME2_LA_PUNT=yes
+EAPI=6
-inherit autotools eutils gnome2 multilib
+GNOME2_EAUTORECONF="yes"
+inherit gnome2
DESCRIPTION="Diagram/flowchart creation program"
HOMEPAGE="https://wiki.gnome.org/Apps/Dia"
@@ -40,13 +39,15 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
doc? ( dev-libs/libxslt )"
-src_prepare() {
- DOCS="AUTHORS ChangeLog KNOWN_BUGS MAINTAINERS NEWS README RELEASE-PROCESS THANKS TODO"
+DOCS=( AUTHORS ChangeLog KNOWN_BUGS MAINTAINERS NEWS README RELEASE-PROCESS THANKS TODO )
- epatch "${FILESDIR}"/${PN}-0.97.0-gnome-doc.patch #159381 , upstream #470812 #558690
- epatch "${FILESDIR}"/${PN}-0.97.2-underlinking.patch #420685, upstream #678761
- epatch "${FILESDIR}"/${PN}-0.97.3-freetype_pkgconfig.patch #654814, upstream https://gitlab.gnome.org/GNOME/dia/merge_requests/1
+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
+)
+src_prepare() {
if ! use doc; then
# Skip man generation
sed -i -e '/if HAVE_DB2MAN/,/endif/d' doc/*/Makefile.am || die
diff --git a/app-office/dia/files/dia-0.97.2-underlinking.patch b/app-office/dia/files/dia-0.97.2-underlinking.patch
index 903e077f23f..297888cc9b6 100644
--- a/app-office/dia/files/dia-0.97.2-underlinking.patch
+++ b/app-office/dia/files/dia-0.97.2-underlinking.patch
@@ -6,13 +6,13 @@ Subject: [PATCH] Fix missing linkage with gmodule-2.0.
Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=678761
Fixes: https://bugs.gentoo.org/show_bug.cgi?id=420685
---
- dia-0.97.2/configure.in | 2 +-
+ configure.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/dia-0.97.2/configure.in b/dia-0.97.2/configure.in
+diff --git a/configure.in b/configure.in
index 72830de..6b7394a 100644
---- a/dia-0.97.2/configure.in
-+++ b/dia-0.97.2/configure.in
+--- a/configure.in
++++ b/configure.in
@@ -55,7 +55,7 @@ AC_SUBST(GMODULE_CFLAGS)
AC_SUBST(GMODULE_LIBS)
AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/dia/files/, app-office/dia/
@ 2021-01-20 10:50 Lars Wendler
0 siblings, 0 replies; 3+ messages in thread
From: Lars Wendler @ 2021-01-20 10:50 UTC (permalink / raw
To: gentoo-commits
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 = \
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-01-20 10:50 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-04-30 15:10 [gentoo-commits] repo/gentoo:master commit in: app-office/dia/files/, app-office/dia/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2021-01-20 10:50 Lars Wendler
2018-07-02 9:48 Lars Wendler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox