diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2012-07-07 15:49:06 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2012-07-07 15:49:06 +0000 |
| commit | 989afd56a1946c0038ab40c9d287cd700e16988b (patch) | |
| tree | 1c1583ad43d205c24d2a7ba26bb23f6ac4f0208a /app-office/dia | |
| parent | Clean out older unstable versions (diff) | |
| download | gentoo-2-989afd56a1946c0038ab40c9d287cd700e16988b.tar.gz gentoo-2-989afd56a1946c0038ab40c9d287cd700e16988b.tar.bz2 gentoo-2-989afd56a1946c0038ab40c9d287cd700e16988b.zip | |
Fix underlinking (bug #420685). Also remove intltoolize call which is redundant with newer eautoreconf.
(Portage version: 2.2.0_alpha114/cvs/Linux x86_64)
Diffstat (limited to 'app-office/dia')
| -rw-r--r-- | app-office/dia/ChangeLog | 7 | ||||
| -rw-r--r-- | app-office/dia/dia-0.97.2-r1.ebuild | 4 | ||||
| -rw-r--r-- | app-office/dia/files/dia-0.97.2-underlinking.patch | 27 |
3 files changed, 35 insertions, 3 deletions
diff --git a/app-office/dia/ChangeLog b/app-office/dia/ChangeLog index 0bb8a7a595b5..a102cb268fda 100644 --- a/app-office/dia/ChangeLog +++ b/app-office/dia/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-office/dia # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/dia/ChangeLog,v 1.145 2012/06/09 16:02:59 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/dia/ChangeLog,v 1.146 2012/07/07 15:49:05 mgorny Exp $ + + 07 Jul 2012; Michał Górny <mgorny@gentoo.org> + +files/dia-0.97.2-underlinking.patch, dia-0.97.2-r1.ebuild: + Fix underlinking (bug #420685). Also remove intltoolize call which is + redundant with newer eautoreconf. 09 Jun 2012; Justin Lecher <jlec@gentoo.org> dia-0.97.2-r1.ebuild: Prefix fix diff --git a/app-office/dia/dia-0.97.2-r1.ebuild b/app-office/dia/dia-0.97.2-r1.ebuild index 44f6992f6d22..c535e876902a 100644 --- a/app-office/dia/dia-0.97.2-r1.ebuild +++ b/app-office/dia/dia-0.97.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/dia/dia-0.97.2-r1.ebuild,v 1.3 2012/06/09 16:02:59 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/dia/dia-0.97.2-r1.ebuild,v 1.4 2012/07/07 15:49:05 mgorny Exp $ EAPI=4 @@ -69,6 +69,7 @@ pkg_setup() { src_prepare() { epatch "${FILESDIR}"/${PN}-0.97.0-gnome-doc.patch #159831 epatch "${FILESDIR}"/${PN}-0.97.2-glib-2.31.patch #401331 + epatch "${FILESDIR}"/${PN}-0.97.2-underlinking.patch #420685 if use python; then python_convert_shebangs -r 2 . @@ -83,7 +84,6 @@ src_prepare() { # Fix naming conflict on Darwin/OSX sed -i -e 's/isspecial/char_isspecial/' objects/GRAFCET/boolequation.c || die - intltoolize --force --copy --automake || die eautoreconf gnome2_src_prepare diff --git a/app-office/dia/files/dia-0.97.2-underlinking.patch b/app-office/dia/files/dia-0.97.2-underlinking.patch new file mode 100644 index 000000000000..903e077f23f4 --- /dev/null +++ b/app-office/dia/files/dia-0.97.2-underlinking.patch @@ -0,0 +1,27 @@ +From 2f853bab67b087605a10f544a7df780ac98b8583 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <gentoo@mgorny.alt.pl> +Date: Sat, 7 Jul 2012 17:28:59 +0200 +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 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/dia-0.97.2/configure.in b/dia-0.97.2/configure.in +index 72830de..6b7394a 100644 +--- a/dia-0.97.2/configure.in ++++ b/dia-0.97.2/configure.in +@@ -55,7 +55,7 @@ AC_SUBST(GMODULE_CFLAGS) + AC_SUBST(GMODULE_LIBS) + AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal) + +-GTK_MODULES="gtk+-2.0 >= 2.6.0 glib-2.0 >= 2.6.0 libxml-2.0 gdk-pixbuf-2.0 gthread-2.0" ++GTK_MODULES="gtk+-2.0 >= 2.6.0 glib-2.0 >= 2.6.0 libxml-2.0 gdk-pixbuf-2.0 gthread-2.0 gmodule-2.0" + PKG_CHECK_MODULES(PANGOVERSION, pango >= 1.8.0, , + AC_MSG_ERROR([Need Pango version 1.8.0 or higher])) + +-- +1.7.11.1 + |