pacho       14/06/12 18:00:38

  Modified:             dia-0.97.3_pre20140417.ebuild ChangeLog
  Removed:              dia-0.97.2-r2.ebuild
  Log:
  Fix build without cairo (#509636 by Marcel Pennewib and gokturk), drop old.
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 
A188FBD4)

Revision  Changes    Path
1.6                  app-office/dia/dia-0.97.3_pre20140417.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/dia/dia-0.97.3_pre20140417.ebuild?rev=1.6&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/dia/dia-0.97.3_pre20140417.ebuild?rev=1.6&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/dia/dia-0.97.3_pre20140417.ebuild?r1=1.5&r2=1.6

Index: dia-0.97.3_pre20140417.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/dia/dia-0.97.3_pre20140417.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dia-0.97.3_pre20140417.ebuild       7 May 2014 05:42:23 -0000       1.5
+++ dia-0.97.3_pre20140417.ebuild       12 Jun 2014 18:00:38 -0000      1.6
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: 
/var/cvsroot/gentoo-x86/app-office/dia/dia-0.97.3_pre20140417.ebuild,v 1.5 
2014/05/07 05:42:23 pacho Exp $
+# $Header: 
/var/cvsroot/gentoo-x86/app-office/dia/dia-0.97.3_pre20140417.ebuild,v 1.6 
2014/06/12 18:00:38 pacho Exp $
 
 EAPI=5
 GCONF_DEBUG=yes
@@ -19,7 +19,9 @@
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd 
~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
 # the doc USE flag doesn't seem to do anything without docbook2html
-IUSE="cairo doc python"
+# cairo support is preferred as explained by upstream at:
+# https://bugzilla.gnome.org/show_bug.cgi?id=729668#c6
+IUSE="+cairo doc python"
 
 RDEPEND="
        >=dev-libs/glib-2:2
@@ -55,6 +57,7 @@
 
        epatch "${FILESDIR}"/${PN}-0.97.0-gnome-doc.patch #159381 , upstream 
#470812 #558690
        epatch "${FILESDIR}"/${PN}-0.97.2-underlinking.patch #420685
+       epatch "${FILESDIR}"/${PN}-0.97.2-disable-cairo.patch #509636
 
        if use python; then
                python_fix_shebang .



1.169                app-office/dia/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/dia/ChangeLog?rev=1.169&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/dia/ChangeLog?rev=1.169&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/dia/ChangeLog?r1=1.168&r2=1.169

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/dia/ChangeLog,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- ChangeLog   7 May 2014 05:42:23 -0000       1.168
+++ ChangeLog   12 Jun 2014 18:00:38 -0000      1.169
@@ -1,6 +1,13 @@
 # ChangeLog for app-office/dia
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/dia/ChangeLog,v 1.168 2014/05/07 
05:42:23 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/dia/ChangeLog,v 1.169 2014/06/12 
18:00:38 pacho Exp $
+
+  12 Jun 2014; Pacho Ramos <[email protected]>
+  +files/dia-0.97.2-disable-cairo.patch, -dia-0.97.2-r2.ebuild,
+  -files/dia-0.97.2-freetype251.patch, -files/dia-0.97.2-glib-2.31.patch,
+  -files/dia-0.97.2-glib2.36.patch,
+  -files/dia-0.97.2-implicit-declaration.patch, dia-0.97.3_pre20140417.ebuild:
+  Fix build without cairo (#509636 by Marcel Pennewib and gokturk), drop old.
 
   07 May 2014; Pacho Ramos <[email protected]> dia-0.97.3_pre20140417.ebuild:
   Add bug references (thanks to Gilles for finding them)




Reply via email to