[101423] trunk/dports/gnome/gnome-python-desktop

[jeremyhu at macports.org]

Revision: 101423
          https://trac.macports.org/changeset/101423
Author:   jeremyhu at macports.org
Date:     2013-01-10 13:06:31 -0800 (Thu, 10 Jan 2013)
Log Message:
-----------
gnome-python-desktop: Fix build failure (unable to find pycairo.h)

Modified Paths:
--------------
    trunk/dports/gnome/gnome-python-desktop/Portfile

Added Paths:
-----------
    trunk/dports/gnome/gnome-python-desktop/files/automake.patch
    trunk/dports/gnome/gnome-python-desktop/files/pycairo.patch

Removed Paths:
-------------
    trunk/dports/gnome/gnome-python-desktop/files/patch-configure.diff

Modified: trunk/dports/gnome/gnome-python-desktop/Portfile
===================================================================
--- trunk/dports/gnome/gnome-python-desktop/Portfile	2013-01-10 20:48:09 UTC (rev 101422)
+++ trunk/dports/gnome/gnome-python-desktop/Portfile	2013-01-10 21:06:31 UTC (rev 101423)
@@ -34,8 +34,12 @@
                 port:bug-buddy \
                 port:totem-pl-parser
 
-patchfiles      patch-configure.diff
+patchfiles      pycairo.patch \
+                automake.patch
 
+use_autoreconf  yes
+autoreconf.args -fvi
+
 configure.args 	--enable-metacity \
                 --disable-nautilusburn
 

Added: trunk/dports/gnome/gnome-python-desktop/files/automake.patch
===================================================================
--- trunk/dports/gnome/gnome-python-desktop/files/automake.patch	                        (rev 0)
+++ trunk/dports/gnome/gnome-python-desktop/files/automake.patch	2013-01-10 21:06:31 UTC (rev 101423)
@@ -0,0 +1,11 @@
+--- configure.ac.orig	2013-01-10 13:00:57.000000000 -0800
++++ configure.ac	2013-01-10 13:01:12.000000000 -0800
+@@ -36,7 +36,7 @@ m4_define(libebook_required_version,    
+ AC_INIT(gnome-python-desktop, gnome_python_desktop_version,
+         [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-python])
+ dnl AC_CONFIG_SRCDIR([gnome/uimodule.c])
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS([config.h])
+ 
+ AM_INIT_AUTOMAKE
+ 

Deleted: trunk/dports/gnome/gnome-python-desktop/files/patch-configure.diff
===================================================================
--- trunk/dports/gnome/gnome-python-desktop/files/patch-configure.diff	2013-01-10 20:48:09 UTC (rev 101422)
+++ trunk/dports/gnome/gnome-python-desktop/files/patch-configure.diff	2013-01-10 21:06:31 UTC (rev 101423)
@@ -1,14 +0,0 @@
---- configure.orig	2010-09-01 13:41:40.000000000 -0700
-+++ configure	2010-09-01 13:46:08.000000000 -0700
-@@ -12105,9 +12105,9 @@
- 
- 
- 
--  PYTHON_PREFIX='${prefix}'
-+  PYTHON_PREFIX=`$PYTHON -c 'import sys; print sys.prefix;'`
- 
--  PYTHON_EXEC_PREFIX='${exec_prefix}'
-+  PYTHON_EXEC_PREFIX=`$PYTHON -c 'import sys; print sys.exec_prefix;'`
- 
- 
- 

Added: trunk/dports/gnome/gnome-python-desktop/files/pycairo.patch
===================================================================
--- trunk/dports/gnome/gnome-python-desktop/files/pycairo.patch	                        (rev 0)
+++ trunk/dports/gnome/gnome-python-desktop/files/pycairo.patch	2013-01-10 21:06:31 UTC (rev 101423)
@@ -0,0 +1,36 @@
+diff -Naurp evince.orig/evince.override evince/evince.override
+--- evince.orig/evince.override	2010-06-11 05:04:37.000000000 -0700
++++ evince/evince.override	2013-01-10 12:52:54.000000000 -0800
+@@ -8,7 +8,7 @@ headers
+ 
+ #include <pygobject.h>
+ #include <pygtk/pygtk.h>
+-#include <pycairo/pycairo.h>
++#include <pycairo.h>
+ 
+ #include <evince-document.h>
+ #include <evince-view.h>
+diff -Naurp evince.orig/evincemodule.c evince/evincemodule.c
+--- evince.orig/evincemodule.c	2010-06-11 05:04:37.000000000 -0700
++++ evince/evincemodule.c	2013-01-10 12:52:54.000000000 -0800
+@@ -7,7 +7,7 @@
+ #include <pygtk/pygtk.h>
+ 
+ #include <evince-document.h>
+-#include <pycairo/pycairo.h>
++#include <pycairo.h>
+ 
+ Pycairo_CAPI_t *Pycairo_CAPI;
+ 
+diff -Naurp configura.ac.orig configure.ac
+--- configure.ac.orig	2013-01-10 12:53:52.000000000 -0800
++++ configure.ac	2013-01-10 12:56:06.000000000 -0800
+@@ -434,7 +434,7 @@ AM_CONDITIONAL(BUILD_EVOLUTION_ECAL, $bu
+ dnl should we build the evince module
+ AC_ARG_BINDING([evince],[YES])
+ if $build_evince; then
+-    PKG_CHECK_MODULES(EVINCE, [evince-document-2.30 evince-view-2.30],
++    PKG_CHECK_MODULES(EVINCE, [evince-document-2.30 evince-view-2.30 pycairo],
+       build_evince=true,
+       build_evince=false)
+     if test -n "$export_dynamic"; then
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130110/85b54c7d/attachment.html>