<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[135363] users/devans/GNOME-3/stable/dports/gnome/epiphany</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/135363">135363</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2015-04-23 08:22:11 -0700 (Thu, 23 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>GNOME-3/stable: epiphany, reconfigure using upstream autogen.sh for intltool 0.51 compatibility, remove outdated file.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#usersdevansGNOME3stabledportsgnomeepiphanyPortfile">users/devans/GNOME-3/stable/dports/gnome/epiphany/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomeepiphanyfilespatchconfigureacdiff">users/devans/GNOME-3/stable/dports/gnome/epiphany/files/patch-configure.ac.diff</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#usersdevansGNOME3stabledportsgnomeepiphanyfilesautogensh">users/devans/GNOME-3/stable/dports/gnome/epiphany/files/autogen.sh</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#usersdevansGNOME3stabledportsgnomeepiphanyPortfile3121">users/devans/GNOME-3/stable/dports/gnome/epiphany/Portfile-3.12.1</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#usersdevansGNOME3stabledportsgnomeepiphany">users/devans/GNOME-3/stable/dports/gnome/epiphany/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="usersdevansGNOME3stabledportsgnomeepiphany"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/gnome/epiphany</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx">/trunk/dports/gnome/epiphany:108265-117652
</span><span class="cx">/users/devans/GNOME-3/unstable/dports/gnome/epiphany:114069-118152
</span><span class="cx">/users/rmstonecipher/gnome/epiphany:102363-103172
</span><span class="cx"> + /branches/mld-qt-481/dports/gnome/epiphany:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
</span><span class="cx">/trunk/dports/gnome/epiphany:108265-134429
</span><span class="cx">/users/devans/GNOME-3/unstable/dports/gnome/epiphany:114069-118152
</span><span class="cx">/users/rmstonecipher/gnome/epiphany:102363-103172
</span><a id="usersdevansGNOME3stabledportsgnomeepiphanyPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/epiphany/Portfile (135362 => 135363)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/epiphany/Portfile 2015-04-23 15:22:09 UTC (rev 135362)
+++ users/devans/GNOME-3/stable/dports/gnome/epiphany/Portfile 2015-04-23 15:22:11 UTC (rev 135363)
</span><span class="lines">@@ -27,7 +27,10 @@
</span><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig \
</span><span class="cx"> port:intltool \
</span><del>- port:gnome-common
</del><ins>+ port:gnome-common \
+ port:autoconf \
+ port:automake \
+ port:libtool
</ins><span class="cx">
</span><span class="cx"> depends_lib port:desktop-file-utils \
</span><span class="cx"> port:gnome-icon-theme \
</span><span class="lines">@@ -60,15 +63,13 @@
</span><span class="cx">
</span><span class="cx"> patchfiles patch-configure.ac.diff
</span><span class="cx">
</span><del>-# update m4/intltool.m4 and autoreconf
</del><ins>+# reconfigure using upstream autogen.sh for intltool 0.51 compatibility
</ins><span class="cx">
</span><del>-pre-configure {
- copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
- reinplace "s|--rpath=|-rpath |g" ${worksrcpath}/configure.ac
</del><ins>+post-patch {
+ xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath}
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-use_autoreconf yes
-autoreconf.args -fvi
</del><ins>+configure.cmd ./autogen.sh
</ins><span class="cx">
</span><span class="cx"> configure.cflags-append -Wno-format-nonliteral
</span><span class="cx">
</span></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomeepiphanyPortfile3121"></a>
<div class="delfile"><h4>Deleted: users/devans/GNOME-3/stable/dports/gnome/epiphany/Portfile-3.12.1 (135362 => 135363)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/epiphany/Portfile-3.12.1 2015-04-23 15:22:09 UTC (rev 135362)
+++ users/devans/GNOME-3/stable/dports/gnome/epiphany/Portfile-3.12.1 2015-04-23 15:22:11 UTC (rev 135363)
</span><span class="lines">@@ -1,103 +0,0 @@
</span><del>-# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
-# $Id: Portfile 116271 2014-01-23 17:32:19Z devans@macports.org $
-
-PortSystem 1.0
-
-name epiphany
-version 3.12.1
-license GPL-2+
-set branch [join [lrange [split ${version} .] 0 1] .]
-description A GNOME Web browser.
-long_description \
- A web browser is more than an application, it is a \
- way of thinking, it is a way of seeing the world. \
- Epiphany's principles are simplicity and standards \
- compliance.
-maintainers devans openmaintainer
-categories gnome www
-platforms darwin
-homepage https://wiki.gnome.org/Apps/Web
-master_sites gnome:sources/${name}/${branch}/
-
-use_xz yes
-
-checksums rmd160 6bfd416723c2af05511a5ccc7e889dc2aab55030 \
- sha256 16d9f8f10443328b2f226c2da545e75c8433f50f103af8aeb692b098d5fbbf93
-
-depends_build port:pkgconfig \
- port:intltool \
- port:gnome-common
-
-depends_lib port:desktop-file-utils \
- port:gnome-icon-theme \
- port:gnome-icon-theme-symbolic \
- port:gtk3 \
- path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3 \
- port:gnome-desktop \
- port:libxslt\
- port:libsoup \
- port:libsecret \
- port:port:libnotify \
- port:libwnck3 \
- port:gsettings-desktop-schemas \
- port:nss \
- port:sqlite3 \
- port:gcr \
- port:avahi \
- port:xorg-libX11 \
- port:iso-codes
-
-depends_run port:gnome-settings-daemon
-
-# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
-platform darwin {
- set cxxstdlib {}
-
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
- set cxxstdlib ${configure.cxx_stdlib}
- } elseif {[string match *clang* ${configure.cxx}] &&
- ${os.major} >= 13} {
- set cxxstdlib libc++
- } else {
- set cxxstdlib libstdc++
- }
-
- if {${cxxstdlib} 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
- }
-}
-
-# update m4/intltool.m4 and autoreconf
-
-pre-configure {
- copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
- reinplace "s|--rpath=|-rpath |g" ${worksrcpath}/configure.ac
-}
-
-use_autoreconf yes
-autoreconf.args -fvi
-
-configure.cflags-append -Wno-format-nonliteral
-
-configure.args --with-distributor-name=MacPorts \
- --disable-schemas-compile \
- --disable-tests
-
-post-activate {
- system "${prefix}/bin/update-desktop-database -q ${prefix}/share/applications"
- system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
-}
-
-#
-# nss is not universal
-#
-
-if {[variant_isset universal]} {
- configure.args-append --disable-nss
- depends_lib-delete port:nss
-}
-
-livecheck.type gnome-with-unstable
</del></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomeepiphanyfilesautogenshfromrev134429trunkdportsgnomeepiphanyfilesautogensh"></a>
<div class="copfile"><h4>Copied: users/devans/GNOME-3/stable/dports/gnome/epiphany/files/autogen.sh (from rev 134429, trunk/dports/gnome/epiphany/files/autogen.sh) (0 => 135363)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/epiphany/files/autogen.sh (rev 0)
+++ users/devans/GNOME-3/stable/dports/gnome/epiphany/files/autogen.sh 2015-04-23 15:22:11 UTC (rev 135363)
</span><span class="lines">@@ -0,0 +1,24 @@
</span><ins>+#!/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
</ins></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomeepiphanyfilespatchconfigureacdiff"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/epiphany/files/patch-configure.ac.diff (135362 => 135363)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/epiphany/files/patch-configure.ac.diff 2015-04-23 15:22:09 UTC (rev 135362)
+++ users/devans/GNOME-3/stable/dports/gnome/epiphany/files/patch-configure.ac.diff 2015-04-23 15:22:11 UTC (rev 135363)
</span><span class="lines">@@ -1,5 +1,14 @@
</span><del>---- configure.ac.orig 2013-05-31 03:28:55.000000000 -0700
-+++ configure.ac 2014-02-21 20:21:48.000000000 -0800
</del><ins>+--- 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
</ins><span class="cx"> @@ -90,7 +90,7 @@
</span><span class="cx"> AVAHI_REQUIRED=0.6.22
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>