[118361] trunk/dports/gnome/gnome-games

31 Mar 2014

Revision: 118361
          https://trac.macports.org/changeset/118361
Author:   devans@macports.org
Date:     2014-03-31 15:35:05 -0700 (Mon, 31 Mar 2014)
Log Message:
-----------
gnome-games: update m4/intltool.m4 and autoreconf to fix intltool configuration, add build fix, update patchfiles, build deps.

Modified Paths:
--------------
    trunk/dports/gnome/gnome-games/Portfile

Added Paths:
-----------
    trunk/dports/gnome/gnome-games/files/patch-configure.ac.diff

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

Modified: trunk/dports/gnome/gnome-games/Portfile
===================================================================

--- trunk/dports/gnome/gnome-games/Portfile	2014-03-31 22:33:16 UTC (rev 118360)
+++ trunk/dports/gnome/gnome-games/Portfile	2014-03-31 22:35:05 UTC (rev 118361)
@@ -23,6 +23,8 @@
 
 depends_build   port:pkgconfig \
                 port:intltool \
+                port:gnome-common \
+                port:yelp-tools \
                 port:itstool \
                 port:libxml2
 
@@ -35,12 +37,24 @@
 depends_run     port:gnome-settings-daemon \
                 port:yelp
 
-patchfiles      patch-configure.diff
+patchfiles      patch-configure.ac.diff
 
+# update m4/intltool.m4 and autoreconf
+
+pre-configure {
+    copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
+}
+
+use_autoreconf  yes
+autoreconf.args -fvi
+
 configure.args  --enable-games="gnect,gnomine,gtali,gnotravex,gnotski,glines,iagno,gnobots2" \
                 --disable-schemas-compile \
                 --disable-silent-rules \
 
+configure.cflags-append \
+                -Wno-error=format-nonliteral
+
 variant python26 conflicts python27 description {Use python 2.6} {
     configure.python          ${prefix}/bin/python2.6
     depends_lib-append        port:py26-pygtk

Added: trunk/dports/gnome/gnome-games/files/patch-configure.ac.diff
===================================================================
--- trunk/dports/gnome/gnome-games/files/patch-configure.ac.diff	                        (rev 0)
+++ trunk/dports/gnome/gnome-games/files/patch-configure.ac.diff	2014-03-31 22:35:05 UTC (rev 118361)
@@ -0,0 +1,10 @@
+--- configure.ac.orig	2014-03-31 11:50:39.000000000 -0700
++++ configure.ac	2014-03-31 11:52:48.000000000 -0700
+@@ -114,6 +114,7 @@
+ need_python=no
+ need_clutter=no
+ need_gmenu=no
++need_cxx=yes
+ 
+ for game in $gamelist; do
+   case $game in

Deleted: trunk/dports/gnome/gnome-games/files/patch-configure.diff
===================================================================
--- trunk/dports/gnome/gnome-games/files/patch-configure.diff	2014-03-31 22:33:16 UTC (rev 118360)
+++ trunk/dports/gnome/gnome-games/files/patch-configure.diff	2014-03-31 22:35:05 UTC (rev 118361)
@@ -1,23 +0,0 @@
---- configure.orig	2012-10-16 06:56:24.000000000 -0700
-+++ configure	2013-09-19 19:10:22.000000000 -0700
-@@ -3285,6 +3285,8 @@
- need_clutter=no
- need_gmenu=no
- 
-+need_cxx=yes
-+
- for game in $gamelist; do
-   case $game in
-     glchess|gnomine|gnotravex|iagno|lightsoff|gnome-mahjongg|quadrapassel|swell-foop) need_vala=yes ;;
-@@ -12723,9 +12725,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;'`
- 
- 
-

    

devans＠macports.org

tags

participants (1)