[144674] users/devans/GNOME-3/stable/dports/gnome/epiphany

devans at macports.org devans at macports.org
Thu Jan 14 19:38:16 PST 2016


Revision: 144674
          https://trac.macports.org/changeset/144674
Author:   devans at macports.org
Date:     2016-01-14 19:38:15 -0800 (Thu, 14 Jan 2016)
Log Message:
-----------
GNOME-3/stable: epiphany, update to version 3.18.2 using webkit2-gtk, disable silent rules, build fails due to symbols missing from libwebkit2gtk-4.0.

Modified Paths:
--------------
    users/devans/GNOME-3/stable/dports/gnome/epiphany/Portfile

Added Paths:
-----------
    users/devans/GNOME-3/stable/dports/gnome/epiphany/files/autogen.sh
    users/devans/GNOME-3/stable/dports/gnome/epiphany/files/autogen.sh-3.8.2

Removed Paths:
-------------
    users/devans/GNOME-3/stable/dports/gnome/epiphany/files/autogen.sh

Modified: users/devans/GNOME-3/stable/dports/gnome/epiphany/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/epiphany/Portfile	2016-01-15 03:24:20 UTC (rev 144673)
+++ users/devans/GNOME-3/stable/dports/gnome/epiphany/Portfile	2016-01-15 03:38:15 UTC (rev 144674)
@@ -4,8 +4,7 @@
 PortSystem      1.0
 
 name            epiphany
-version         3.8.2
-revision        7
+version         3.18.2
 license         GPL-2+
 set branch      [join [lrange [split ${version} .] 0 1] .]
 description     A GNOME Web browser.
@@ -22,8 +21,8 @@
 
 use_xz          yes
 
-checksums       rmd160  2aacd8b02f456e345b9f23ff6114d341bbf0013a \
-                sha256  ae89d6902ed243304d2cbf2fa361f6dd0cb3401fdaf726e6fdd4acc09197d50a
+checksums       rmd160  68c71672660a55275f83461cc0863fe0c79a14b2 \
+                sha256  8436170731966bb40b7d8e29dbedfa5d5ddbf78572cf5fd51fce1ac6da5da6c2
 
 depends_build   port:pkgconfig \
                 port:intltool \
@@ -34,7 +33,6 @@
 
 depends_lib     port:desktop-file-utils \
                 port:gtk3 \
-                path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3 \
                 port:gnome-desktop \
                 port:libxslt\
                 port:libsoup \
@@ -54,17 +52,31 @@
 
 platform darwin {
     if {${configure.cxx_stdlib} eq "libstdc++"} {
-       depends_lib-delete path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3
-       depends_lib-append path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3-2.0
-    }
-}
+        version         3.8.2
+        revision        7
+        checksums       rmd160  2aacd8b02f456e345b9f23ff6114d341bbf0013a \
+                        sha256  ae89d6902ed243304d2cbf2fa361f6dd0cb3401fdaf726e6fdd4acc09197d50a
+        depends_lib-append path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3-2.0
 
-patchfiles      patch-configure.ac.diff
+        patchfiles      patch-configure.ac.diff
 
-# reconfigure using upstream autogen.sh for intltool 0.51 compatibility
+        # reconfigure using upstream autogen.sh for intltool 0.51 compatibility
 
-post-patch {
-    xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath}
+        post-patch {
+            xinstall -m 755 ${filespath}/autogen.sh-3.8.2 ${worksrcpath}/autogen.sh
+        }
+    } else {
+        depends_build-append    port:appstream-glib \
+                                port:itstool \
+                                port:yelp-tools
+        depends_lib-append      path:lib/pkgconfig/webkit2gtk-4.0.pc:webkit2-gtk
+
+        # reconfigure using upstream autogen.sh for intltool 0.51 compatibility
+
+        post-patch {
+            xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath}
+        }
+    }
 }
 
 configure.cmd       ./autogen.sh
@@ -72,6 +84,7 @@
 configure.cflags-append -Wno-format-nonliteral
 
 configure.args  --with-distributor-name=MacPorts \
+                --disable-silent-rules \
                 --disable-schemas-compile \
                 --disable-tests
 

Deleted: users/devans/GNOME-3/stable/dports/gnome/epiphany/files/autogen.sh
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/epiphany/files/autogen.sh	2016-01-15 03:24:20 UTC (rev 144673)
+++ users/devans/GNOME-3/stable/dports/gnome/epiphany/files/autogen.sh	2016-01-15 03:38:15 UTC (rev 144674)
@@ -1,24 +0,0 @@
-#!/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

Added: users/devans/GNOME-3/stable/dports/gnome/epiphany/files/autogen.sh
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/epiphany/files/autogen.sh	                        (rev 0)
+++ users/devans/GNOME-3/stable/dports/gnome/epiphany/files/autogen.sh	2016-01-15 03:38:15 UTC (rev 144674)
@@ -0,0 +1,38 @@
+#!/bin/sh
+# Run this to generate all the initial makefiles, etc.
+test -n "$srcdir" || srcdir=`dirname "$0"`
+test -n "$srcdir" || srcdir=.
+
+olddir=`pwd`
+
+cd $srcdir
+
+(test -f configure.ac) || {
+        echo "*** ERROR: Directory "\`$srcdir\'" does not look like the top-level project directory ***"
+        exit 1
+}
+
+PKG_NAME=`autoconf --trace 'AC_INIT:$1' configure.ac`
+
+if [ "$#" = 0 -a "x$NOCONFIGURE" = "x" ]; then
+        echo "*** WARNING: I am going to run \`configure' with no arguments." >&2
+        echo "*** If you wish to pass any to it, please specify them on the" >&2
+        echo "*** \`$0\' command line." >&2
+        echo "" >&2
+fi
+
+aclocal --install || exit 1
+intltoolize --force --copy --automake || exit 1
+autoreconf --verbose --force --install -Wno-portability || exit 1
+
+cd $olddir
+
+if [ "$NOCONFIGURE" = "" ]; then
+        $srcdir/configure "$@" || exit 1
+
+        if [ "$1" = "--help" ]; then exit 0 else
+                echo "Now type \`make\' to compile $PKG_NAME" || exit 1
+        fi
+else
+        echo "Skipping configure process."
+fi

Copied: users/devans/GNOME-3/stable/dports/gnome/epiphany/files/autogen.sh-3.8.2 (from rev 144673, users/devans/GNOME-3/stable/dports/gnome/epiphany/files/autogen.sh)
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/epiphany/files/autogen.sh-3.8.2	                        (rev 0)
+++ users/devans/GNOME-3/stable/dports/gnome/epiphany/files/autogen.sh-3.8.2	2016-01-15 03:38:15 UTC (rev 144674)
@@ -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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160114/259ba0a1/attachment-0001.html>


More information about the macports-changes mailing list