[134429] trunk/dports/gnome/epiphany

devans at macports.org devans at macports.org
Wed Mar 25 08:26:48 PDT 2015


Revision: 134429
          https://trac.macports.org/changeset/134429
Author:   devans at macports.org
Date:     2015-03-25 08:26:48 -0700 (Wed, 25 Mar 2015)
Log Message:
-----------
epiphany: reconfigure using autogen.sh for intltool 0.51 compatibility, remove GTK_DISABLE_DEPRECATED from DEPRECATION_FLAGS to fix build.

Modified Paths:
--------------
    trunk/dports/gnome/epiphany/Portfile
    trunk/dports/gnome/epiphany/files/patch-configure.ac.diff

Added Paths:
-----------
    trunk/dports/gnome/epiphany/files/autogen.sh

Modified: trunk/dports/gnome/epiphany/Portfile
===================================================================
--- trunk/dports/gnome/epiphany/Portfile	2015-03-25 14:56:57 UTC (rev 134428)
+++ trunk/dports/gnome/epiphany/Portfile	2015-03-25 15:26:48 UTC (rev 134429)
@@ -27,7 +27,10 @@
 
 depends_build   port:pkgconfig \
                 port:intltool \
-                port:gnome-common
+                port:gnome-common \
+                port:autoconf \
+                port:automake \
+                port:libtool
 
 depends_lib     port:desktop-file-utils \
                 port:gnome-icon-theme \
@@ -60,15 +63,13 @@
 
 patchfiles      patch-configure.ac.diff
 
-# update m4/intltool.m4 and autoreconf
+# reconfigure using autogen.sh for intltool 0.51 compatibility
 
-pre-configure {
-    copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
-    reinplace "s|--rpath=|-rpath |g" ${worksrcpath}/configure.ac
+post-patch {
+    xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath}
 }
 
-use_autoreconf      yes
-autoreconf.args     -fvi
+configure.cmd       ./autogen.sh
 
 configure.cflags-append -Wno-format-nonliteral
 

Added: trunk/dports/gnome/epiphany/files/autogen.sh
===================================================================
--- trunk/dports/gnome/epiphany/files/autogen.sh	                        (rev 0)
+++ trunk/dports/gnome/epiphany/files/autogen.sh	2015-03-25 15:26:48 UTC (rev 134429)
@@ -0,0 +1,24 @@
+#!/bin/sh
+# Run this to generate all the initial makefiles, etc.
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+PKG_NAME="epiphany"
+
+(test -f $srcdir/src/ephy-window.c) || {
+    echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
+    echo " top-level $PKG_NAME directory"
+    exit 1
+}
+
+which gnome-autogen.sh || {
+    echo "You need to install gnome-common from GNOME git and make"
+    echo "sure the gnome-autogen.sh script is in your \$PATH."
+    exit 1
+}
+
+REQUIRED_AUTOMAKE_VERSION=1.11
+REQUIRED_LIBTOOL_VERSION=2.2
+REQUIRED_INTLTOOL_VERSION=0.40.4
+. gnome-autogen.sh

Modified: trunk/dports/gnome/epiphany/files/patch-configure.ac.diff
===================================================================
--- trunk/dports/gnome/epiphany/files/patch-configure.ac.diff	2015-03-25 14:56:57 UTC (rev 134428)
+++ trunk/dports/gnome/epiphany/files/patch-configure.ac.diff	2015-03-25 15:26:48 UTC (rev 134429)
@@ -1,5 +1,14 @@
---- configure.ac.orig	2013-05-31 03:28:55.000000000 -0700
-+++ configure.ac	2014-02-21 20:21:48.000000000 -0800
+--- configure.ac.orig	2015-03-25 08:15:37.000000000 -0700
++++ configure.ac	2015-03-25 08:16:05.000000000 -0700
+@@ -73,7 +73,7 @@
+ if test "$enable_maintainer_mode" = "yes"; then
+ 	AC_DEFINE([MAINTAINER_MODE],[1],[Define to enable 'maintainer-only' behaviour])
+ 	enable_debug=yes
+-	DEPRECATION_FLAGS="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGSEAL_ENABLE"
++	DEPRECATION_FLAGS="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DGSEAL_ENABLE"
+ fi
+ 
+ GLIB_REQUIRED=2.35.6
 @@ -90,7 +90,7 @@
  AVAHI_REQUIRED=0.6.22
  
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150325/622fbaca/attachment-0001.html>


More information about the macports-changes mailing list