[49546] trunk/dports/x11/pango

ryandesign at macports.org ryandesign at macports.org
Sat Apr 11 19:59:45 PDT 2009


Revision: 49546
          http://trac.macports.org/changeset/49546
Author:   ryandesign at macports.org
Date:     2009-04-11 19:59:45 -0700 (Sat, 11 Apr 2009)
Log Message:
-----------
pango: Apply upstream patch to fix pango +no_x11 if cairo is installed with x11 support; should fix #18956

Modified Paths:
--------------
    trunk/dports/x11/pango/Portfile

Added Paths:
-----------
    trunk/dports/x11/pango/files/477747bc1ef1078b06c4e1c615a1a912e6ada299.diff

Modified: trunk/dports/x11/pango/Portfile
===================================================================
--- trunk/dports/x11/pango/Portfile	2009-04-12 01:52:58 UTC (rev 49545)
+++ trunk/dports/x11/pango/Portfile	2009-04-12 02:59:45 UTC (rev 49546)
@@ -35,6 +35,7 @@
     path:lib/pkgconfig/cairo.pc:cairo \
 
 patchfiles \
+    477747bc1ef1078b06c4e1c615a1a912e6ada299.diff \
     patch-ltmain.sh.diff
 
 configure.ccache        no

Added: trunk/dports/x11/pango/files/477747bc1ef1078b06c4e1c615a1a912e6ada299.diff
===================================================================
--- trunk/dports/x11/pango/files/477747bc1ef1078b06c4e1c615a1a912e6ada299.diff	                        (rev 0)
+++ trunk/dports/x11/pango/files/477747bc1ef1078b06c4e1c615a1a912e6ada299.diff	2009-04-12 02:59:45 UTC (rev 49546)
@@ -0,0 +1,51 @@
+From 477747bc1ef1078b06c4e1c615a1a912e6ada299 Mon Sep 17 00:00:00 2001
+From: Sebastian Dröge <slomo at circular-chaos.org>
+Date: Mon, 23 Mar 2009 23:16:58 +0000
+Subject: Bug 576298 – Fails to link pango-view if --without-x is specified but cairo has X11 support
+
+---
+--- pango-view/pango-view.c
++++ pango-view/pango-view.c
+@@ -7,7 +7,7 @@ extern const PangoViewer pangoft2_viewer;
+ extern const PangoViewer pangox_viewer;
+ 
+ const PangoViewer *viewers[] = {
+-#ifdef HAVE_CAIRO_XLIB
++#ifdef HAVE_CAIRO
+   &pangocairo_viewer,
+ #endif
+ #ifdef HAVE_XFT
+--- pango-view/viewer-cairo.c
++++ pango-view/viewer-cairo.c
+@@ -30,6 +30,7 @@
+ 
+ 
+ #ifdef HAVE_CAIRO_XLIB
++#ifdef HAVE_X
+ #include "viewer-x.h"
+ #include <cairo-xlib.h>
+ 
+@@ -72,6 +73,7 @@ static CairoViewerIface cairo_x_viewer_iface = {
+   cairo_x_view_iface_create_surface,
+   cairo_x_view_iface_paint_background
+ };
++#endif /* HAVE_X */
+ #endif /* HAVE_CAIRO_XLIB */
+ 
+ 
+@@ -348,11 +350,13 @@ cairo_viewer_iface_create (const CairoViewerIface **iface)
+     return ret;
+ 
+ #ifdef HAVE_CAIRO_XLIB
++#ifdef HAVE_X
+   if (opt_display)
+     {
+       *iface = &cairo_x_viewer_iface;
+       return (*iface)->backend_class->create ((*iface)->backend_class);
+     }
++#endif /* HAVE_X */
+ #endif /* HAVE_CAIRO_XLIB */
+ 
+   *iface = &cairo_image_viewer_iface;
+--
+cgit v0.8.2
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090411/7a60fb32/attachment.html>


More information about the macports-changes mailing list