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)

8 files changed, 32 insertions, 328 deletions

diff --git a/app-office/dia/ChangeLog b/app-office/dia/ChangeLog
index ae7532f6d70f..24f326824527 100644
--- a/app-office/dia/ChangeLog
+++ b/app-office/dia/ChangeLog
@@ -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 <pacho@gentoo.org>
+  +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 <pacho@gentoo.org> dia-0.97.3_pre20140417.ebuild:
   Add bug references (thanks to Gilles for finding them)
diff --git a/app-office/dia/dia-0.97.2-r2.ebuild b/app-office/dia/dia-0.97.2-r2.ebuild
deleted file mode 100644
index 151ee1c4d166..000000000000
--- a/app-office/dia/dia-0.97.2-r2.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# 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.2-r2.ebuild,v 1.8 2014/03/11 11:22:46 polynomial-c Exp $
-
-EAPI=5
-GCONF_DEBUG=yes
-GNOME2_LA_PUNT=yes
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit autotools eutils gnome2 python-single-r1 multilib
-
-DESCRIPTION="Diagram/flowchart creation program"
-HOMEPAGE="http://live.gnome.org/Dia"
-
-LICENSE="GPL-2"
-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"
-
-RDEPEND="
-	>=dev-libs/glib-2:2
-	dev-libs/libxml2
-	dev-libs/libxslt
-	dev-libs/popt
-	>=media-libs/freetype-2
-	>=media-libs/libart_lgpl-2
-	media-libs/libpng:0
-	sys-libs/zlib
-	x11-libs/gtk+:2
-	x11-libs/pango
-	cairo? ( x11-libs/cairo )
-	doc? (
-		app-text/docbook-xml-dtd:4.5
-		app-text/docbook-xsl-stylesheets )
-	python? (
-		>=dev-python/pygtk-2
-		${PYTHON_DEPS} )
-"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-apps/sed
-	virtual/pkgconfig
-	doc? ( dev-libs/libxslt )"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	DOCS="AUTHORS ChangeLog KNOWN_BUGS MAINTAINERS NEWS README RELEASE-PROCESS THANKS TODO"
-
-	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
-	epatch "${FILESDIR}"/${PN}-0.97.2-implicit-declaration.patch #468166
-	epatch "${FILESDIR}"/${PN}-0.97.2-glib2.36.patch #469040
-	epatch "${FILESDIR}"/${PN}-0.97.2-freetype251.patch #493604
-
-	if use python; then
-		python_fix_shebang .
-		sed -i -e "s/\.so/$(get_libname)/" acinclude.m4 || die #298232
-	fi
-
-	if ! use doc; then
-		# Skip man generation
-		sed -i -e '/if HAVE_DB2MAN/,/endif/d' doc/*/Makefile.am || die
-	fi
-
-	# Fix naming conflict on Darwin/OSX
-	sed -i -e 's/isspecial/char_isspecial/' objects/GRAFCET/boolequation.c || die
-
-	sed -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.in || die
-
-	sed -i -e "/localedir/d" configure.in || die
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# --exec-prefix makes Python look for modules in the Prefix
-	# --enable-gnome only adds support for deprecated stuff, bug #442294
-	# https://bugzilla.redhat.com/show_bug.cgi?id=996759
-	gnome2_src_configure \
-		--exec-prefix="${EPREFIX}/usr" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--disable-gnome \
-		--disable-libemf \
-		$(use_enable doc db2html) \
-		$(use_with cairo) \
-		$(use_with python) \
-		--without-swig \
-		--without-hardbooks
-}
-
-src_install() {
-	gnome2_src_install
-
-	# Install second desktop file for integrated mode (bug #415495)
-	sed -e 's|^Exec=dia|Exec=dia --integrated|' \
-			-e '/^Name/ s|$| (integrated mode)|' \
-			"${ED}"/usr/share/applications/dia.desktop \
-			> "${ED}"/usr/share/applications/dia-integrated.desktop || die
-}
diff --git a/app-office/dia/dia-0.97.3_pre20140417.ebuild b/app-office/dia/dia-0.97.3_pre20140417.ebuild
index 0500a6950f96..352df092376a 100644
--- a/app-office/dia/dia-0.97.3_pre20140417.ebuild
+++ b/app-office/dia/dia-0.97.3_pre20140417.ebuild
@@ -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 @@ LICENSE="GPL-2"
 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 @@ src_prepare() {
 
 	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 .
diff --git a/app-office/dia/files/dia-0.97.2-disable-cairo.patch b/app-office/dia/files/dia-0.97.2-disable-cairo.patch
new file mode 100644
index 000000000000..da07337825e9
--- /dev/null
+++ b/app-office/dia/files/dia-0.97.2-disable-cairo.patch
@@ -0,0 +1,19 @@
+--- plug-ins/cairo/Makefile.am.orig	2014-05-06 14:09:36.080876942 -0400
++++ plug-ins/cairo/Makefile.am	2014-05-06 14:11:21.043041750 -0400
+@@ -1,11 +1,14 @@
+-
++if WITH_CAIRO
+ plugin_sources = \
+ 	diacairo.c \
+ 	diacairo.h \
+ 	diacairo-interactive.c \
+ 	diacairo-renderer.c \
+ 	diacairo-print.c \
+-	diacairo-print.h 
++	diacairo-print.h
++else
++plugin_sources = 
++endif
+ 
+ pkglib_LTLIBRARIES = libcairo_filter.la
+ 
diff --git a/app-office/dia/files/dia-0.97.2-freetype251.patch b/app-office/dia/files/dia-0.97.2-freetype251.patch
deleted file mode 100644
index a5c500344d11..000000000000
--- a/app-office/dia/files/dia-0.97.2-freetype251.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 922db161c4cae5ac39203a1b24b194e209231055 Mon Sep 17 00:00:00 2001
-From: Dominique Leuenberger <dimstar@opensuse.org>
-Date: Mon, 16 Dec 2013 22:30:40 +0000
-Subject: plugin: Use the Freetype developer's proposed way if #include'ing their headers.
-
-Allows us to build against Freetype 2.5.1 (without breaking older
-versions).
-
-https://bugzilla.gnome.org/show_bug.cgi?id=720573
-
-Signed-off-by: Hans Breuer <hans@breuer.org>
-(cherry picked from commit 0b863adcad031c70601e375d72dae64fdd967752)
----
-diff --git a/plug-ins/postscript/diapsft2renderer.c b/plug-ins/postscript/diapsft2renderer.c
-index 06675f8..09f6edb 100644
---- a/plug-ins/postscript/diapsft2renderer.c
-+++ b/plug-ins/postscript/diapsft2renderer.c
-@@ -29,8 +29,9 @@
- #include <pango/pangoft2.h>
- #include <pango/pango-engine.h>
- /* I'd really rather avoid this */
--#include <freetype/ftglyph.h>
--#include <freetype/ftoutln.h>
-+#include <ft2build.h>
-+#include FT_GLYPH_H
-+#include FT_OUTLINE_H
- 
- #define DPI 300
- 
---
-cgit v0.9.2
diff --git a/app-office/dia/files/dia-0.97.2-glib-2.31.patch b/app-office/dia/files/dia-0.97.2-glib-2.31.patch
deleted file mode 100644
index 7429cd217793..000000000000
--- a/app-office/dia/files/dia-0.97.2-glib-2.31.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From e3d41e6dd3488a29d23f53c57526871a9b79e9bf Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Sat, 7 Apr 2012 20:43:27 -0400
-Subject: [PATCH] Do not include glib subheaders directly
-
-Otherwise, dia cannot build against >=glib-2.31
-
-https://bugzilla.gnome.org/show_bug.cgi?id=673712
----
- objects/custom/shape_typeinfo.c |    2 +-
- tests/test-boundingbox.c        |    3 ---
- tests/test-objects.c            |    4 ----
- 3 files changed, 1 insertions(+), 8 deletions(-)
-
-diff --git a/objects/custom/shape_typeinfo.c b/objects/custom/shape_typeinfo.c
-index c6133b1..3fb3d73 100644
---- a/objects/custom/shape_typeinfo.c
-+++ b/objects/custom/shape_typeinfo.c
-@@ -27,7 +27,7 @@
- #include "custom_util.h"
- #include <string.h>
- #include <stdarg.h>
--#include <glib/gstrfuncs.h>
-+#include <glib.h>
- #include <glib/gstdio.h>
- #include <libxml/parser.h>
- 
-diff --git a/tests/test-boundingbox.c b/tests/test-boundingbox.c
-index 7adaab5..a13d018 100644
---- a/tests/test-boundingbox.c
-+++ b/tests/test-boundingbox.c
-@@ -28,9 +28,6 @@
- #include <glib.h>
- #include <glib-object.h>
- 
--#if GLIB_CHECK_VERSION(2,16,0)
--#include <glib/gtestutils.h>
--#endif
- #include "dialib.h"
- 
- /*
-diff --git a/tests/test-objects.c b/tests/test-objects.c
-index 57d5675..c5980a5 100644
---- a/tests/test-objects.c
-+++ b/tests/test-objects.c
-@@ -28,10 +28,6 @@
- #include <glib.h>
- #include <glib-object.h>
- 
--#if GLIB_CHECK_VERSION(2,16,0)
--#include <glib/gtestutils.h>
--#endif
--
- #include "object.h"
- #include "plug-ins.h"
- #include "dialib.h"
--- 
-1.7.8.5
-
diff --git a/app-office/dia/files/dia-0.97.2-glib2.36.patch b/app-office/dia/files/dia-0.97.2-glib2.36.patch
deleted file mode 100644
index eab83b8801d0..000000000000
--- a/app-office/dia/files/dia-0.97.2-glib2.36.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From 7ac3e9ffac09f99a1aa2fe97a4dc0a688c9746b0 Mon Sep 17 00:00:00 2001
-From: Hans Breuer <hans@breuer.org>
-Date: Sat, 16 Mar 2013 16:56:58 +0000
-Subject: Bug 694025 - GLib drop support for adding interfaces after class_init
-
-Without this Dia crashes at startup with new GLib version and the
-DiaGdkRenderer being default. Make a new DiaGdkInteractiveRenderer which
-follows the pattern also used for DiaCairoInteraciveRenderer. This should
-be functional equivalent to what was there before and should work for all
-current GLib versions.
-
-(cherry picked from commit 213bdfe956bf8fe57c86316f68a09408fef1647e)
----
-diff --git a/app/render_gdk.c b/app/render_gdk.c
-index 60ccb7a..b1e7ba4 100644
---- a/app/render_gdk.c
-+++ b/app/render_gdk.c
-@@ -50,7 +50,21 @@ static void copy_to_window (DiaRenderer *renderer,
-                 gpointer window,
-                 int x, int y, int width, int height);
- 
--static void dia_gdk_renderer_iface_init (DiaInteractiveRendererInterface* iface)
-+typedef struct _DiaGdkInteractiveRenderer DiaGdkInteractiveRenderer;
-+struct _DiaGdkInteractiveRenderer
-+{
-+  DiaGdkRenderer parent_instance; /*!< inheritance in object oriented C */
-+};
-+typedef struct _DiaGdkInteractiveRendererClass DiaGdkInteractiveRendererClass;
-+struct _DiaGdkInteractiveRendererClass
-+{
-+  DiaGdkRendererClass parent_class; /*!< the base class */
-+};
-+#define DIA_TYPE_GDK_INTERACTIVE_RENDERER           (dia_gdk_interactive_renderer_get_type ())
-+#define DIA_GDK_INTERACTIVE_RENDERER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DIA_TYPE_GDK_INTERACTIVE_RENDERER, DiaGdkInteractiveRenderer))
-+
-+static void
-+dia_gdk_renderer_iface_init (DiaInteractiveRendererInterface* iface)
- {
-   iface->clip_region_clear = clip_region_clear;
-   iface->clip_region_add_rect = clip_region_add_rect;
-@@ -61,35 +75,35 @@ static void dia_gdk_renderer_iface_init (DiaInteractiveRendererInterface* iface)
-   iface->set_size = set_size;
- }
- 
-+G_DEFINE_TYPE_WITH_CODE (DiaGdkInteractiveRenderer, dia_gdk_interactive_renderer, DIA_TYPE_GDK_RENDERER,
-+			 G_IMPLEMENT_INTERFACE (DIA_TYPE_INTERACTIVE_RENDERER_INTERFACE, dia_gdk_renderer_iface_init));
-+
-+static void
-+dia_gdk_interactive_renderer_class_init(DiaGdkInteractiveRendererClass *klass)
-+{
-+}
-+static void
-+dia_gdk_interactive_renderer_init(DiaGdkInteractiveRenderer *object)
-+{
-+  DiaGdkInteractiveRenderer *ia_renderer = DIA_GDK_INTERACTIVE_RENDERER (object);
-+  DiaGdkRenderer *renderer = DIA_GDK_RENDERER(object);
-+  DiaRenderer *dia_renderer = DIA_RENDERER(object);
-+  
-+  dia_renderer->is_interactive = 1;
-+
-+  renderer->gc = NULL;
-+  renderer->pixmap = NULL;
-+  renderer->clip_region = NULL;
-+}
-+
- DiaRenderer *
- new_gdk_renderer(DDisplay *ddisp)
- {
-   DiaGdkRenderer *renderer;
-   GType renderer_type = 0;
- 
--  renderer = g_object_new (DIA_TYPE_GDK_RENDERER, NULL);
-+  renderer = g_object_new (DIA_TYPE_GDK_INTERACTIVE_RENDERER, NULL);
-   renderer->transform = dia_transform_new (&ddisp->visible, &ddisp->zoom_factor);
--  if (!DIA_GET_INTERACTIVE_RENDERER_INTERFACE (renderer))
--    {
--      static const GInterfaceInfo irenderer_iface_info = 
--      {
--        (GInterfaceInitFunc) dia_gdk_renderer_iface_init,
--        NULL,           /* iface_finalize */
--        NULL            /* iface_data     */
--      };
--
--      renderer_type = DIA_TYPE_GDK_RENDERER;
--      /* register the interactive renderer interface */
--      g_type_add_interface_static (renderer_type,
--                                   DIA_TYPE_INTERACTIVE_RENDERER_INTERFACE,
--                                   &irenderer_iface_info);
--
--    }
--  renderer->parent_instance.is_interactive = 1;
--  renderer->gc = NULL;
--
--  renderer->pixmap = NULL;
--  renderer->clip_region = NULL;
- 
-   return DIA_RENDERER(renderer);
- }
---
-cgit v0.9.2
diff --git a/app-office/dia/files/dia-0.97.2-implicit-declaration.patch b/app-office/dia/files/dia-0.97.2-implicit-declaration.patch
deleted file mode 100644
index e37138a80bc7..000000000000
--- a/app-office/dia/files/dia-0.97.2-implicit-declaration.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 8f363f6dd82f9fbf502fceaf1d73a258c17593db Mon Sep 17 00:00:00 2001
-From: Hans Breuer <hans@breuer.org>
-Date: Sat, 06 Jun 2009 18:01:38 +0000
-Subject: Bug #585004 - implicit declaration of function 'finite' (2nd iteration)
-
-To get the definition either _BSD_SOURCE or _SVID_SOURCE needs to
-be defined before inclusion of <math.h>.
-Removed HAVE_CONFIG_H and chanegd inclusion order
----
-diff --git a/objects/standard/arc.c b/objects/standard/arc.c
-index 28302a6..3a50838 100644
---- a/objects/standard/arc.c
-+++ b/objects/standard/arc.c
-@@ -16,13 +16,11 @@
-  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-  */
- 
--#ifdef HAVE_CONFIG_H
- #include <config.h>
--#endif
- 
--#include <assert.h>
- #define _BSD_SOURCE 1 /* to get finite */
- #include <math.h>
-+#include <assert.h>
- 
- #include "intl.h"
- #include "object.h"
---
-cgit v0.9.2